Skip to content

keep element references : when unload study #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
souissimai wants to merge 1 commit into from
Closed

keep element references : when unload study #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/gridsuite/study/server/service/SupervisionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ public void deleteAllStashedElements(UUID studyId) {
List<UUID> notStashedModificationGroupUuids = networkModificationNodeInfos.stream()
.map(NetworkModificationNodeInfoEntity::getModificationGroupUuid)
.toList();
networkModificationService.deleteStashedModificationsFromGroups(notStashedModificationGroupUuids, SUPERVISION_USER);
// the links of the remaining reference modifications to their shared modifications are kept
networkModificationService.deleteStashedModificationsFromGroups(notStashedModificationGroupUuids, false, SUPERVISION_USER);

// remove stashed nodes and their modifications
studyService.deleteNodes(studyId, stashedNodes.stream().map(NodeEntity::getIdNode).toList(), true, SUPERVISION_USER, false);
Expand Down
11 changes: 9 additions & 2 deletions ...rg/gridsuite/study/server/service/networkmodification/NetworkModificationRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,10 @@ private String toJson(Object object) {
}

public void deleteStashedModificationsFromGroups(List<UUID> groupUuids, String userId) {
deleteStashedModificationsFromGroups(groupUuids, true, userId);
}

public void deleteStashedModificationsFromGroups(List<UUID> groupUuids, boolean removeElementReferences, String userId) {
Objects.requireNonNull(groupUuids);
if (groupUuids.isEmpty()) {
return;
Expand All @@ -659,8 +663,11 @@ public void deleteStashedModificationsFromGroups(List<UUID> groupUuids, String u
headers.setContentType(MediaType.APPLICATION_JSON);
headers.set(HEADER_USER_ID, userId);
HttpEntity<String> httpEntity = new HttpEntity<>(toJson(groupUuids), headers);
var path = UriComponentsBuilder.fromPath(GROUPS + "/stashed-modifications")
.toUriString();
var uriBuilder = UriComponentsBuilder.fromPath(GROUPS + "/stashed-modifications");
if (!removeElementReferences) {
uriBuilder.queryParam("removeElementReferences", false);
}
var path = uriBuilder.toUriString();

restTemplate.exchange(getNetworkModificationServerURI(false) + path,
HttpMethod.DELETE,
Expand Down
13 changes: 13 additions & 0 deletions ...rg/gridsuite/study/server/service/networkmodification/NetworkModificationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,19 @@ void testDeleteStashedModificationsGroups() {
verify(restTemplate).exchange(expectedUrl, HttpMethod.DELETE, httpEntity, new ParameterizedTypeReference<Map<UUID, UUID>>() { });
}

@Test
void testDeleteStashedModificationsGroupsKeepingElementReferences() {
UUID groupUuid = UUID.randomUUID();
String expectedUrl = NETWORK_MODIFICATION_SERVER_URI + "/v1/groups/stashed-modifications?removeElementReferences=false";

HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.set(HEADER_USER_ID, USER_ID);
networkModificationService.deleteStashedModificationsFromGroups(List.of(groupUuid), false, USER_ID);
HttpEntity<String> httpEntity = new HttpEntity<>("[\"" + groupUuid + "\"]", headers);
verify(restTemplate).exchange(expectedUrl, HttpMethod.DELETE, httpEntity, new ParameterizedTypeReference<Map<UUID, UUID>>() { });
}

@Test
void testGetReferences() {
UUID firstUuid = UUID.randomUUID();
Expand Down
Loading