Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@
</dependency>

<!-- Compilation dependencies -->
<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-filter</artifactId>
<!-- TODO : remove version when lib is released -->
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -214,5 +220,10 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,54 @@ public ResponseEntity<Void> modifyIdentifierContingencyList(
}
}

@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,
@RequestBody FilterBasedContingencyList filterBasedContingencyList) {
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_JSON)
.body(service.createFilterBasedContingencyList(id, filterBasedContingencyList));
}

@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> modifyFilterBasedContingencyList(
@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();
}
}
Comment on lines +162 to +175
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PUT insert new lines in filter_metadata but not clean old lines, to verify annotation orphanRemoval option of OneToMany.
However, I see lines in relation table are removed


@PostMapping(value = "/filters-contingency-lists", params = "duplicateFrom")
@Operation(summary = "Create a filter based contingency list from existing one")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter based contingency list have been duplicated successfully"),
@ApiResponse(responseCode = "404", description = "Source filter based contingency list not found")})
public ResponseEntity<UUID> duplicateFilterBasedContingencyList(@RequestParam("duplicateFrom") UUID contingencyListsId) {
return service.duplicateFilterBasedContingencyList(contingencyListsId).map(contingencyList -> ResponseEntity.ok()
.contentType(MediaType.APPLICATION_JSON)
.body(contingencyList))
.orElse(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")})
public ResponseEntity<FilterBasedContingencyList> getFilterBasedContingencyList(@PathVariable("id") UUID id,
@RequestHeader("userId") String userId) {
return service.getFilterBasedContingencyList(id, userId).map(contingencyList -> ResponseEntity.ok()
.contentType(MediaType.APPLICATION_JSON)
.body(contingencyList))
.orElse(ResponseEntity.notFound().build());
}

@PostMapping(value = "/form-contingency-lists", params = "duplicateFrom")
@Operation(summary = "Create a form contingency list from another existing one")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The form contingency list have been duplicated successfully"),
Expand Down
Loading
Loading