refactor stash / restore api

gridsuite · Sep 29, 2023 · a40111d · a40111d
1 parent d807f4c
commit a40111d
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/NetworkModificationController.java b/src/main/java/org/gridsuite/modification/server/NetworkModificationController.java
@@ -145,12 +145,20 @@ public ResponseEntity<ModificationInfos> getNetworkModification(
     }
 
     @DeleteMapping(value = "/network-modifications", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Operation(summary = "Delete network modifications")
+    @Operation(summary = "Delete stash or restore network modifications")
     @ApiResponse(responseCode = "200", description = "The network modifications were deleted")
     public ResponseEntity<Void> deleteNetworkModifications(
             @Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List<UUID> networkModificationUuids,
-            @Parameter(description = "Group UUID") @RequestParam("groupUuid") UUID groupUuid) {
-        networkModificationService.deleteNetworkModifications(groupUuid, networkModificationUuids);
+            @Parameter(description = "Group UUID") @RequestParam("groupUuid") UUID groupUuid,
+            @Parameter(description = "Whether to stash the modifications") @RequestParam(value = "stash") Boolean stash) {
+        if (stash == null) {
+            networkModificationService.deleteNetworkModifications(groupUuid, networkModificationUuids);
+        } else if (Boolean.TRUE.equals(stash)) {
+            networkModificationService.stashNetworkModifications(networkModificationUuids);
+        } else if (Boolean.FALSE.equals(stash)) {
+            networkModificationService.restoreNetworkModifications(networkModificationUuids);
+        }
+
         return ResponseEntity.ok().build();
     }
 
@@ -202,25 +210,6 @@ public ResponseEntity<UUID> createModificationInGroup(@RequestBody ModificationI
         return ResponseEntity.ok().body(networkModificationService.createModificationInGroup(modificationsInfos));
     }
 
-    @PostMapping(value = "/network-modifications/stash", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Operation(summary = "stash network modifications")
-    @ApiResponse(responseCode = "200", description = "The network modifications were stashed")
-    public ResponseEntity<Void> stashNetworkModifications(
-            @Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List<UUID> networkModificationUuids,
-            @Parameter(description = "Group UUID") @RequestParam("groupUuid") UUID groupUuid) {
-        networkModificationService.stashNetworkModifications(networkModificationUuids);
-        return ResponseEntity.ok().build();
-    }
-
-    @PostMapping(value = "/network-modifications/restore", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Operation(summary = "restore network modifications")
-    @ApiResponse(responseCode = "200", description = "The network modifications were restored")
-    public ResponseEntity<Void> restoreNetworkModifications(
-            @Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List<UUID> networkModificationUuids,
-            @Parameter(description = "Group UUID") @RequestParam("groupUuid") UUID groupUuid) {
-        networkModificationService.restoreNetworkModifications(networkModificationUuids);
-        return ResponseEntity.ok().build();
-    }
 
     @PutMapping(value = "/groups/{groupUuid}/duplications", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Duplicate all modifications in a group and append them at the end of another modifications group")