delete stashed modifications when stash node or subtree

Signed-off-by: walid-sahnoun <[email protected]>
gridsuite · Sep 19, 2023 · 7563f5e · 7563f5e
1 parent 9e0daaa
commit 7563f5e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
@@ -244,7 +244,9 @@ public void deleteStashedModificationGroup(UUID groupUuid, boolean errorOnGroupN
         try {
             ModificationGroupEntity groupEntity = getModificationGroup(groupUuid);
             if (!groupEntity.getModifications().isEmpty()) {
-                modificationRepository.deleteAll(groupEntity.getModifications().stream().filter(modificationEntity -> modificationEntity.getStashed().equals(true)).collect(Collectors.toList()));
+                List<UUID> stashedModifications = groupEntity.getModifications().stream()
+                    .filter(modificationEntity -> modificationEntity.getStashed()).map(modification -> modification.getId()).collect(Collectors.toList());
+                deleteModifications(groupUuid, stashedModifications);
             }
         } catch (NetworkModificationException e) {
             if (e.getType() == MODIFICATION_GROUP_NOT_FOUND && !errorOnGroupNotFound) {