Skip to content

Commit 65a6fd5

Browse files
authored
Delete multiple calculation result. (#97)
Signed-off-by: AAJELLAL <[email protected]>
1 parent a9b55f1 commit 65a6fd5

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/main/java/org/gridsuite/voltageinit/server/VoltageInitController.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,11 @@ public ResponseEntity<VoltageInitResult> getResult(@Parameter(description = "Res
6666
: ResponseEntity.notFound().build();
6767
}
6868

69-
@DeleteMapping(value = "/results/{resultUuid}", produces = APPLICATION_JSON_VALUE)
70-
@Operation(summary = "Delete a voltage init result from the database")
71-
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The voltage init result has been deleted")})
72-
public ResponseEntity<Void> deleteResult(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
73-
voltageInitService.deleteResult(resultUuid);
74-
return ResponseEntity.ok().build();
75-
}
76-
7769
@DeleteMapping(value = "/results", produces = APPLICATION_JSON_VALUE)
78-
@Operation(summary = "Delete all voltage init results from the database")
70+
@Operation(summary = "Delete voltage init results from the database")
7971
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "All voltage init results have been deleted")})
80-
public ResponseEntity<Void> deleteResults() {
81-
voltageInitService.deleteResults();
72+
public ResponseEntity<Void> deleteResults(@Parameter(description = "Results UUID") @RequestParam(value = "resultsUuids", required = false) List<UUID> resultsUuids) {
73+
voltageInitService.deleteResults(resultsUuids);
8274
return ResponseEntity.ok().build();
8375
}
8476

src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ void runTest() throws Exception {
355355
mockMvc.perform(get("/" + VERSION + "/results/{resultUuid}", OTHER_RESULT_UUID))
356356
.andExpect(status().isNotFound());
357357
// test one result deletion
358-
mockMvc.perform(delete("/" + VERSION + "/results/{resultUuid}", RESULT_UUID))
358+
mockMvc.perform(delete("/" + VERSION + "/results").queryParam("resultsUuids", RESULT_UUID.toString()))
359359
.andExpect(status().isOk());
360360
mockMvc.perform(get("/" + VERSION + "/results/{resultUuid}", RESULT_UUID))
361361
.andExpect(status().isNotFound());

0 commit comments

Comments
 (0)