save changes

Signed-off-by: walid-sahnoun <[email protected]>
gridsuite · Sep 19, 2023 · 9e0daaa · 9e0daaa
1 parent 68f6a21
commit 9e0daaa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/NetworkModificationController.java b/src/main/java/org/gridsuite/modification/server/NetworkModificationController.java
@@ -233,4 +233,13 @@ public ResponseEntity<Optional<NetworkModificationResult>> duplicateModification
                                                                                              @Parameter(description = "origin group UUID, from where modifications are copied") @RequestParam(value = "duplicateFrom") UUID originGroupUuid) {
         return ResponseEntity.ok().body(networkModificationService.duplicateModificationsInGroup(targetGroupUuid, networkUuid, variantId, new ReportInfos(reportUuid, reporterId.toString()), originGroupUuid));
     }
+
+    @DeleteMapping(value = "/groups/{groupUuid}/stashed-modifications")
+    @Operation(summary = "Delete the stashed modifications group")
+    @ApiResponse(responseCode = "200", description = "Stashed modifications group deleted")
+    public ResponseEntity<Void> deleteStashedModificationGroup(@Parameter(description = "Group UUID") @PathVariable("groupUuid") UUID groupUuid,
+                                                        @Parameter(description = "Return 404 if group is not found") @RequestParam(name = "errorOnGroupNotFound", required = false, defaultValue = "true") Boolean errorOnGroupNotFound) {
+        networkModificationService.deleteStashedModificationGroup(groupUuid, errorOnGroupNotFound);
+        return ResponseEntity.ok().build();
+    }
 }
diff --git a/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
@@ -238,4 +238,19 @@ public void updateModification(@NonNull UUID modificationUuid, @NonNull Modifica
             .orElseThrow(() -> new NetworkModificationException(MODIFICATION_NOT_FOUND, String.format(MODIFICATION_NOT_FOUND_MESSAGE, modificationUuid)))
             .update(modificationInfos);
     }
+
+    @Transactional
+    public void deleteStashedModificationGroup(UUID groupUuid, boolean errorOnGroupNotFound) {
+        try {
+            ModificationGroupEntity groupEntity = getModificationGroup(groupUuid);
+            if (!groupEntity.getModifications().isEmpty()) {
+                modificationRepository.deleteAll(groupEntity.getModifications().stream().filter(modificationEntity -> modificationEntity.getStashed().equals(true)).collect(Collectors.toList()));
+            }
+        } catch (NetworkModificationException e) {
+            if (e.getType() == MODIFICATION_GROUP_NOT_FOUND && !errorOnGroupNotFound) {
+                return;
+            }
+            throw e;
+        }
+    }
 }
diff --git a/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java
@@ -289,4 +289,8 @@ public Optional<NetworkModificationResult> duplicateModificationsInGroup(UUID ta
         List<ModificationEntity> duplicatedModificationsEntities = networkModificationRepository.copyModificationsEntities(originGroupUuid);
         return saveAndApplyModifications(targetGroupUuid, networkUuid, variantId, reportInfos, duplicatedModificationsEntities);
     }
+
+    public void deleteStashedModificationGroup(UUID groupUuid, boolean errorOnGroupNotFound) {
+        networkModificationRepository.deleteStashedModificationGroup(groupUuid, errorOnGroupNotFound);
+    }
 }