remove stash data when un loading study

src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java

@@ -44,7 +44,8 @@ public class NetworkModificationService {
 
     private static final String DELIMITER = "/";
     private static final String COMPOSITE_PATH = "network-composite-modifications" + DELIMITER;
-    private static final String GROUP_PATH = "groups" + DELIMITER + "{groupUuid}";
+    private static final String GROUPS = "groups";
+    private static final String GROUP_PATH = GROUPS + DELIMITER + "{groupUuid}";
     private static final String CONTAINER_PATH = "containers" + DELIMITER + "{containerId}";
     private static final String NETWORK_MODIFICATIONS_PATH = "network-modifications";
     private static final String NETWORK_MODIFICATIONS_COUNT_PATH = "network-modifications-count";
@@ -178,6 +179,24 @@ public void deleteModifications(UUID groupUUid) {
         restTemplate.delete(getNetworkModificationServerURI(false) + path);
     }
 
+    public void deleteModificationsGroups(List<UUID> groupUuids) {
+        Objects.requireNonNull(groupUuids);
+        if (groupUuids.isEmpty()) {
+            return;
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> httpEntity = new HttpEntity<>(toJson(groupUuids), headers);
+        var path = UriComponentsBuilder.fromPath(GROUPS)
+                .queryParam(QUERY_PARAM_ERROR_ON_GROUP_NOT_FOUND, false)
+                .toUriString();
+
+        restTemplate.exchange(getNetworkModificationServerURI(false) + path,
+                HttpMethod.DELETE,
+                httpEntity,
+                new ParameterizedTypeReference<Map<UUID, UUID>>() { });
+    }
+
     public void deleteModifications(UUID groupUuid, List<UUID> modificationsUuids) {
         Objects.requireNonNull(groupUuid);
         var path = UriComponentsBuilder
@@ -487,6 +506,24 @@ private String toJson(Object object) {
         return json;
     }
 
+    public void deleteStashedModificationsGroups(List<UUID> groupUuids) {
+        Objects.requireNonNull(groupUuids);
+        if (groupUuids.isEmpty()) {
+            return;
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> httpEntity = new HttpEntity<>(toJson(groupUuids), headers);
+        var path = UriComponentsBuilder.fromPath(GROUPS + "/stashed-modifications")
+                .queryParam(QUERY_PARAM_ERROR_ON_GROUP_NOT_FOUND, false)
+                .toUriString();
+
+        restTemplate.exchange(getNetworkModificationServerURI(false) + path,
+                HttpMethod.DELETE,
+                httpEntity,
+                new ParameterizedTypeReference<Map<UUID, UUID>>() { });
+    }
+
     public void deleteStashedModifications(UUID groupUUid) {
         Objects.requireNonNull(groupUUid);
         var path = UriComponentsBuilder.fromPath(GROUP_PATH + "/stashed-modifications")

src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java

@@ -445,6 +445,41 @@ public void doDeleteTree(UUID studyId) {
         }
     }
 
+    @Transactional
+    public void deleteAllStashedElements(UUID studyId) {
+        List<NodeEntity> nodes = nodesRepository.findAllByStudyId(studyId);
+        List<NodeEntity> stashedNodes = new ArrayList<>();
+        List<NodeEntity> notStashedNodes = new ArrayList<>();
+        for (NodeEntity nodeEntity : nodes) {
+            if (nodeEntity.isStashed()) {
+                stashedNodes.add(nodeEntity);
+            } else {
+                notStashedNodes.add(nodeEntity);
+            }
+        }
+
+        // remove stashed modification on not stashed nodes
+        List<NetworkModificationNode> networkModificationNodeInfos = networkModificationNodeInfoRepository
+                .findAllById(notStashedNodes.stream().map(NodeEntity::getIdNode).toList())
+                .stream().map(NetworkModificationNodeInfoEntity::toDto).toList();
+        List<UUID> stashedModificationGroupUuids = networkModificationNodeInfos.stream()
+                .map(NetworkModificationNode::getModificationGroupUuid)
+                .toList();
+        networkModificationService.deleteStashedModificationsGroups(stashedModificationGroupUuids);
+
+        // remove modification on stashed nodes
+        List<NetworkModificationNode> networkModificationNodeInfosToDelete = networkModificationNodeInfoRepository
+                .findAllById(stashedNodes.stream().map(NodeEntity::getIdNode).toList())
+                .stream().map(NetworkModificationNodeInfoEntity::toDto).toList();
+        List<UUID> modificationGroupUuidsToDelete = networkModificationNodeInfosToDelete.stream()
+                .map(NetworkModificationNode::getModificationGroupUuid)
+                .toList();
+        networkModificationService.deleteModificationsGroups(modificationGroupUuidsToDelete);
+        // remove stashed nodes
+        networkModificationNodeInfoRepository.deleteAllById(stashedNodes.stream().map(NodeEntity::getIdNode).toList());
+        nodesRepository.deleteAll(stashedNodes);
+    }
+
     @Transactional
     public NodeEntity createRoot(StudyEntity study) {
         NodeEntity node = nodesRepository.save(new NodeEntity(null, null, NodeType.ROOT, study, false, null, new ArrayList<>()));

src/main/java/org/gridsuite/study/server/service/SupervisionService.java

@@ -380,6 +380,8 @@ public void invalidateStudy(UUID studyUuid) {
         AtomicReference<Long> startTime = new AtomicReference<>();
         startTime.set(System.nanoTime());
         try {
+            // remove all stashed nodes and network modifications
+            networkModificationTreeService.deleteAllStashedElements(studyUuid);
             rootNetworkService.getStudyRootNetworkIds(studyUuid).forEach(rnId ->
                     studyService.invalidateStudyRootNetwork(studyUuid, rnId, SUPERVISION_USER)
             );

src/test/java/org/gridsuite/study/server/service/NetworkModificationServiceTest.java

@@ -13,11 +13,15 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -122,4 +126,30 @@ void testUpdateNetworkModificationsMetadata() {
 
         verify(restTemplate).exchange(eq(expectedUrl), eq(HttpMethod.PUT), org.mockito.ArgumentMatchers.<HttpEntity<String>>any(), eq(Void.class));
     }
+
+    @Test
+    void testDeleteModificationsGroups() {
+        UUID firstUuid = UUID.randomUUID();
+        UUID secondUuid = UUID.randomUUID();
+        String expectedUrl = NETWORK_MODIFICATION_SERVER_URI + "/v1/groups?errorOnGroupNotFound=false";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        networkModificationService.deleteModificationsGroups(List.of(firstUuid, secondUuid));
+        HttpEntity<String> httpEntity = new HttpEntity<>("[\"" + firstUuid + "\",\"" + secondUuid + "\"]", headers);
+        verify(restTemplate).exchange(expectedUrl, HttpMethod.DELETE, httpEntity, new ParameterizedTypeReference<Map<UUID, UUID>>() { });
+    }
+
+    @Test
+    void testDeleteStashedModificationsGroups() {
+        UUID firstUuid = UUID.randomUUID();
+        UUID secondUuid = UUID.randomUUID();
+        String expectedUrl = NETWORK_MODIFICATION_SERVER_URI + "/v1/groups/stashed-modifications?errorOnGroupNotFound=false";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        networkModificationService.deleteStashedModificationsGroups(List.of(firstUuid, secondUuid));
+        HttpEntity<String> httpEntity = new HttpEntity<>("[\"" + firstUuid + "\",\"" + secondUuid + "\"]", headers);
+        verify(restTemplate).exchange(expectedUrl, HttpMethod.DELETE, httpEntity, new ParameterizedTypeReference<Map<UUID, UUID>>() { });
+    }
 }