clean script filter/ contingency list (#154)

souissimai · web-flow · commit 5e152c31fd49 · 2025-09-17T16:23:18.000+02:00
Signed-off-by: SOUISSI Maissa (Externe) &lt;souissimai@gm0winl878.bureau.si.interne&gt;
diff --git a/src/main/java/org/gridsuite/explore/server/ExploreController.java b/src/main/java/org/gridsuite/explore/server/ExploreController.java
@@ -108,19 +108,6 @@ public ResponseEntity<Void> duplicateCase(
         return ResponseEntity.ok().build();
     }
 
-    @PostMapping(value = "/explore/script-contingency-lists/{listName}")
-    @Operation(summary = "create a script contingency list")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Script contingency list has been created")})
-    @PreAuthorize("@authorizationService.isAuthorized(#userId, #parentDirectoryUuid, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)")
-    public ResponseEntity<Void> createScriptContingencyList(@PathVariable("listName") String listName,
-                                                            @RequestBody(required = false) String content,
-                                                            @RequestParam("description") String description,
-                                                            @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid,
-                                                            @RequestHeader(QUERY_PARAM_USER_ID) String userId) {
-        exploreService.createScriptContingencyList(listName, content, description, userId, parentDirectoryUuid);
-        return ResponseEntity.ok().build();
-    }
-
     @PostMapping(value = "/explore/contingency-lists", params = "duplicateFrom")
     @Operation(summary = "Duplicate a contingency list")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Contingency list has been created")})
@@ -147,28 +134,6 @@ public ResponseEntity<Void> createFormContingencyList(@PathVariable("listName")
         return ResponseEntity.ok().build();
     }
 
-    @PostMapping(value = "/explore/form-contingency-lists/{id}/new-script/{scriptName}")
-    @Operation(summary = "Create a new script contingency list from a form contingency list")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The script contingency list have been created successfully")})
-    @PreAuthorize("@authorizationService.isAuthorized(#userId, #parentDirectoryUuid, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)")
-    public ResponseEntity<Void> newScriptFromFormContingencyList(@PathVariable("id") UUID id,
-                                                                 @PathVariable("scriptName") String scriptName,
-                                                                 @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid,
-                                                                 @RequestHeader(QUERY_PARAM_USER_ID) String userId) {
-        exploreService.newScriptFromFormContingencyList(id, scriptName, userId, parentDirectoryUuid);
-        return ResponseEntity.ok().build();
-    }
-
-    @PostMapping(value = "/explore/form-contingency-lists/{id}/replace-with-script")
-    @Operation(summary = "Replace a form contingency list with a script contingency list")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The form contingency list has been replaced successfully")})
-    @PreAuthorize("@authorizationService.isAuthorized(#userId, #id, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)")
-    public ResponseEntity<Void> replaceFilterContingencyListWithScript(@PathVariable("id") UUID id,
-                                                                       @RequestHeader(QUERY_PARAM_USER_ID) String userId) {
-        exploreService.replaceFormContingencyListWithScript(id, userId);
-        return ResponseEntity.ok().build();
-    }
-
     @PostMapping(value = "/explore/identifier-contingency-lists/{listName}")
     @Operation(summary = "create an identifier contingency list")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Identifier contingency list has been created")})
@@ -207,28 +172,6 @@ public ResponseEntity<Void> duplicateFilter(
         return ResponseEntity.ok().build();
     }
 
-    @PostMapping(value = "/explore/filters/{id}/new-script/{scriptName}")
-    @Operation(summary = "Create a new script from a filter")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The script has been created successfully")})
-    @PreAuthorize("@authorizationService.isAuthorized(#userId, #parentDirectoryUuid, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)")
-    public ResponseEntity<Void> newScriptFromFilter(@PathVariable("id") UUID filterId,
-                                                    @PathVariable("scriptName") String scriptName,
-                                                    @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid,
-                                                    @RequestHeader(QUERY_PARAM_USER_ID) String userId) {
-        exploreService.newScriptFromFilter(filterId, scriptName, userId, parentDirectoryUuid);
-        return ResponseEntity.ok().build();
-    }
-
-    @PostMapping(value = "/explore/filters/{id}/replace-with-script")
-    @Operation(summary = "Replace a filter with a script")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter has been replaced successfully")})
-    @PreAuthorize("@authorizationService.isAuthorized(#userId, #id, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)")
-    public ResponseEntity<Void> replaceFilterWithScript(@PathVariable("id") UUID id,
-                                                        @RequestHeader(QUERY_PARAM_USER_ID) String userId) {
-        exploreService.replaceFilterWithScript(id, userId);
-        return ResponseEntity.ok().build();
-    }
-
     @DeleteMapping(value = "/explore/elements/{elementUuid}")
     @Operation(summary = "Remove directory/element")
     @ApiResponses(value = {
diff --git a/src/main/java/org/gridsuite/explore/server/services/ContingencyListService.java b/src/main/java/org/gridsuite/explore/server/services/ContingencyListService.java
@@ -51,25 +51,6 @@ public void delete(UUID id, String userId) {
         restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.DELETE, new HttpEntity<>(headers), Void.class);
     }
 
-    public void insertScriptContingencyList(UUID id, String content) {
-        String path = UriComponentsBuilder
-                .fromPath(DELIMITER + ACTIONS_API_VERSION + "/script-contingency-lists?id={id}")
-                .buildAndExpand(id)
-                .toUriString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<String> httpEntity = new HttpEntity<>(content, headers);
-        restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.POST, httpEntity, Void.class);
-    }
-
-    public UUID duplicateScriptContingencyList(UUID scriptContingencyListsId) {
-        String path = UriComponentsBuilder.fromPath(DELIMITER + ACTIONS_API_VERSION + "/script-contingency-lists")
-                .queryParam(HEADER_DUPLICATE_FROM, scriptContingencyListsId)
-                .buildAndExpand()
-                .toUriString();
-        return restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.POST, null, UUID.class).getBody();
-    }
-
     public void insertFormContingencyList(UUID id, String content) {
         String path = UriComponentsBuilder.fromPath(DELIMITER + ACTIONS_API_VERSION + "/form-contingency-lists?id={id}")
                 .buildAndExpand(id)
@@ -106,24 +87,6 @@ public UUID duplicateIdentifierContingencyList(UUID identifierContingencyListsId
         return restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.POST, null, UUID.class).getBody();
     }
 
-    public void newScriptFromFormContingencyList(UUID id, UUID newId) {
-        String path = UriComponentsBuilder
-                .fromPath(DELIMITER + ACTIONS_API_VERSION + "/form-contingency-lists/{id}/new-script?newId={newId}")
-                .buildAndExpand(id, newId)
-                .toUriString();
-        restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.POST, null, Void.class);
-    }
-
-    public void replaceFormContingencyListWithScript(UUID id, String userId) {
-        String path = UriComponentsBuilder
-                .fromPath(DELIMITER + ACTIONS_API_VERSION + "/form-contingency-lists/{id}/replace-with-script")
-                .buildAndExpand(id)
-                .toUriString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.set(HEADER_USER_ID, userId);
-        restTemplate.exchange(actionsServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(headers), Void.class);
-    }
-
     @Override
     public List<Map<String, Object>> getMetadata(List<UUID> contingencyListsUuids) {
         var ids = contingencyListsUuids.stream().map(UUID::toString).collect(Collectors.joining(","));
diff --git a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java
@@ -112,15 +112,8 @@ public void duplicateCase(UUID sourceCaseUuid, UUID targetDirectoryId, String us
         directoryService.duplicateElement(sourceCaseUuid, newCaseId, targetDirectoryId, userId);
     }
 
-    public void createScriptContingencyList(String listName, String content, String description, String userId, UUID parentDirectoryUuid) {
-        ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST, userId, 0L, description);
-        contingencyListService.insertScriptContingencyList(elementAttributes.getElementUuid(), content);
-        directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
-    }
-
     public void duplicateContingencyList(UUID contingencyListsId, UUID targetDirectoryId, String userId, ContingencyListType contingencyListType) {
         UUID newId = switch (contingencyListType) {
-            case SCRIPT -> contingencyListService.duplicateScriptContingencyList(contingencyListsId);
             case FORM -> contingencyListService.duplicateFormContingencyList(contingencyListsId);
             case IDENTIFIERS -> contingencyListService.duplicateIdentifierContingencyList(contingencyListsId);
         };
@@ -133,26 +126,6 @@ public void createFormContingencyList(String listName, String content, String de
         directoryService.createElement(elementAttributes, parentDirectoryUuid, userId);
     }
 
-    public void newScriptFromFormContingencyList(UUID id, String scriptName, String userId, UUID parentDirectoryUuid) {
-        ElementAttributes elementAttribute = directoryService.getElementInfos(id).orElseThrow(() -> new ExploreException(NOT_FOUND));
-        if (!elementAttribute.getType().equals(CONTINGENCY_LIST)) {
-            throw new ExploreException(NOT_ALLOWED);
-        }
-        ElementAttributes newElementAttributes = new ElementAttributes(UUID.randomUUID(), scriptName,
-                CONTINGENCY_LIST, userId, 0L, null);
-        contingencyListService.newScriptFromFormContingencyList(id, newElementAttributes.getElementUuid());
-        directoryService.createElement(newElementAttributes, parentDirectoryUuid, userId);
-    }
-
-    public void replaceFormContingencyListWithScript(UUID id, String userId) {
-        ElementAttributes elementAttribute = directoryService.getElementInfos(id).orElseThrow(() -> new ExploreException(NOT_FOUND));
-        if (!elementAttribute.getType().equals(CONTINGENCY_LIST)) {
-            throw new ExploreException(NOT_ALLOWED);
-        }
-        contingencyListService.replaceFormContingencyListWithScript(id, userId);
-        directoryService.notifyDirectoryChanged(id, userId);
-    }
-
     public void createIdentifierContingencyList(String listName, String content, String description, String userId, UUID parentDirectoryUuid) {
         ElementAttributes elementAttributes = new ElementAttributes(UUID.randomUUID(), listName, CONTINGENCY_LIST, userId, 0L, description);
         contingencyListService.insertIdentifierContingencyList(elementAttributes.getElementUuid(), content);
@@ -170,29 +143,6 @@ public void duplicateFilter(UUID sourceFilterId, UUID targetDirectoryId, String
         directoryService.duplicateElement(sourceFilterId, newFilterId, targetDirectoryId, userId);
     }
 
-    public void newScriptFromFilter(UUID filterId, String scriptName, String userId, UUID parentDirectoryUuid) {
-        ElementAttributes elementAttribute = directoryService.getElementInfos(filterId).orElseThrow(() -> new ExploreException(NOT_FOUND));
-        if (!elementAttribute.getType().equals(FILTER)) {
-            throw new ExploreException(NOT_ALLOWED);
-        }
-        ElementAttributes newElementAttributes = new ElementAttributes(UUID.randomUUID(), scriptName,
-                FILTER, userId, 0, null);
-        filterService.insertNewScriptFromFilter(filterId, newElementAttributes.getElementUuid());
-        directoryService.createElement(newElementAttributes, parentDirectoryUuid, userId);
-    }
-
-    public void replaceFilterWithScript(UUID id, String userId) {
-        ElementAttributes elementAttribute = directoryService.getElementInfos(id).orElseThrow(() -> new ExploreException(NOT_FOUND));
-        if (!userId.equals(elementAttribute.getOwner())) {
-            throw new ExploreException(NOT_ALLOWED);
-        }
-        if (!elementAttribute.getType().equals(FILTER)) {
-            throw new ExploreException(NOT_ALLOWED);
-        }
-        filterService.replaceFilterWithScript(id, userId);
-        directoryService.notifyDirectoryChanged(id, userId);
-    }
-
     public void deleteElement(UUID id, String userId) {
         try {
             directoryService.deleteElement(id, userId);
@@ -260,7 +210,6 @@ private void updateElementNameAndDescription(UUID id, String name, String descri
 
     private String getProperPath(ContingencyListType contingencyListType) {
         return switch (contingencyListType) {
-            case SCRIPT -> "/script-contingency-lists/{id}";
             case FORM -> "/form-contingency-lists/{id}";
             case IDENTIFIERS -> "/identifier-contingency-lists/{id}";
         };
diff --git a/src/main/java/org/gridsuite/explore/server/services/FilterService.java b/src/main/java/org/gridsuite/explore/server/services/FilterService.java
@@ -43,24 +43,6 @@ public void setFilterServerBaseUri(String filterServerBaseUri) {
         this.filterServerBaseUri = filterServerBaseUri;
     }
 
-    public void replaceFilterWithScript(UUID id, String userId) {
-        String path = UriComponentsBuilder
-                .fromPath(DELIMITER + FILTER_SERVER_API_VERSION + "/filters/{id}/replace-with-script")
-                .buildAndExpand(id)
-                .toUriString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.set(HEADER_USER_ID, userId);
-        restTemplate.exchange(filterServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(headers), Void.class);
-    }
-
-    public void insertNewScriptFromFilter(UUID id, UUID newId) {
-        String path = UriComponentsBuilder
-                .fromPath(DELIMITER + FILTER_SERVER_API_VERSION + "/filters/{id}/new-script?newId={newId}")
-                .buildAndExpand(id, newId)
-                .toUriString();
-        restTemplate.exchange(filterServerBaseUri + path, HttpMethod.POST, null, Void.class);
-    }
-
     @Override
     public void delete(UUID id, String userId) {
         String path = UriComponentsBuilder.fromPath(DELIMITER + FILTER_SERVER_API_VERSION + "/filters/{id}")
diff --git a/src/main/java/org/gridsuite/explore/server/utils/ContingencyListType.java b/src/main/java/org/gridsuite/explore/server/utils/ContingencyListType.java
@@ -10,8 +10,6 @@
  * @author AJELLAL Ali <ali.ajellal@rte-france.com>
  */
 public enum ContingencyListType {
-
-    SCRIPT,
     FORM,
     IDENTIFIERS
 }
diff --git a/src/test/java/org/gridsuite/explore/server/ExploreTest.java b/src/test/java/org/gridsuite/explore/server/ExploreTest.java

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`* @author AJELLAL Ali <[email protected]>`
`11`	`11`	`*/`
`12`	`12`	`public enum ContingencyListType {`
`13`		`-`
`14`		`- SCRIPT,`
`15`	`13`	`FORM,`
`16`	`14`	`IDENTIFIERS`
`17`	`15`	`}`