editing contingency list ok

Signed-off-by: basseche <[email protected]>

Author: basseche

src/main/java/org/gridsuite/actions/server/ContingencyListController.java

@@ -149,7 +149,7 @@ public ResponseEntity<Void> modifyIdentifierContingencyList(
         }
     }
 
-    @PostMapping(value = "/filter-based-contingency-lists", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/filters-contingency-lists", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Create an filter base contingency list")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter based contingency list has been created successfully")})
     public ResponseEntity<PersistentContingencyList> createFilterBasedContingencyList(@RequestParam(required = false, value = "id") UUID id,
@@ -159,7 +159,22 @@ public ResponseEntity<PersistentContingencyList> createFilterBasedContingencyLis
             .body(service.createFilterBasedContingencyList(id, filterBasedContingencyList));
     }
 
-    @GetMapping(value = "/filter-based-contingency-lists/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+    @PutMapping(value = "/filters-contingency-lists/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "Modify a filter based contingency list")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter based contingency list have been modified successfully")})
+    public ResponseEntity<Void> modifyFormContingencyList(
+        @PathVariable UUID id,
+        @RequestBody FilterBasedContingencyList contingencyList,
+        @RequestHeader("userId") String userId) {
+        try {
+            service.modifyFilterBasedContingencyList(id, contingencyList, userId);
+            return ResponseEntity.ok().build();
+        } catch (EntityNotFoundException ignored) {
+            return ResponseEntity.notFound().build();
+        }
+    }
+
+    @GetMapping(value = "/filters-contingency-lists/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Get filter based contingency list by id")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter based contingency list"),
         @ApiResponse(responseCode = "404", description = "The filter based contingency list does not exists")})

src/main/java/org/gridsuite/actions/server/ContingencyListService.java

@@ -305,6 +305,13 @@ public void modifyIdBasedContingencyList(UUID id, IdBasedContingencyList idBased
         notificationService.emitElementUpdated(id, userId);
     }
 
+    @Transactional
+    public void modifyFilterBasedContingencyList(UUID id, FilterBasedContingencyList contingencyList, String userId) {
+        // throw if not found
+        filterBasedContingencyListRepository.save(filterBasedContingencyListRepository.getReferenceById(id).update(contingencyList));
+        notificationService.emitElementUpdated(id, userId);
+    }
+
     @Transactional
     public void deleteContingencyList(UUID id) throws EmptyResultDataAccessException {
         Objects.requireNonNull(id);

src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java

@@ -24,12 +24,12 @@
 @Schema(description = "filter based contingency list")
 public class FilterBasedContingencyList extends AbstractContingencyList {
 
-    @Schema(description = "filter list")
-    private List<FilterMetaData> filterList;
+    @Schema(description = "filters list")
+    private List<FilterMetaData> filters;
 
     public FilterBasedContingencyList(UUID uuid, Instant date, List<FilterMetaData> filterList) {
         super(new ContingencyListMetadataImpl(uuid, ContingencyListType.FILTERS, date));
-        this.filterList = filterList;
+        this.filters = filterList;
     }
 
     @Override

src/main/java/org/gridsuite/actions/server/entities/FilterBasedContingencyListEntity.java

@@ -32,13 +32,23 @@ public class FilterBasedContingencyListEntity extends AbstractContingencyEntity
 
     public FilterBasedContingencyListEntity(FilterBasedContingencyList contingencyList) {
         super();
-        if (CollectionUtils.isEmpty(contingencyList.getFilterList())) {
+        if (CollectionUtils.isEmpty(contingencyList.getFilters())) {
             return;
         }
+
+        init(contingencyList);
+    }
+
+    private void init(FilterBasedContingencyList contingencyList) {
         filtersListEntities = new ArrayList<>();
-        contingencyList.getFilterList().forEach(f ->
+        contingencyList.getFilters().forEach(f ->
             filtersListEntities.add(
                 new FilterMetaDataEntity(UUID.randomUUID(), f.getId(), f.getName(), f.getEquipmentType()))
         );
     }
+
+    public FilterBasedContingencyListEntity update(FilterBasedContingencyList contingencyList) {
+        init(contingencyList);
+        return this;
+    }
 }