Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update filter request updates also element description. #114

Merged
merged 5 commits into from
Jan 9, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -261,8 +261,9 @@ public ResponseEntity<List<Object>> getCompositeModificationContent(@PathVariabl
@PutMapping(value = "/explore/filters/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Modify a filter")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The filter has been successfully modified")})
public ResponseEntity<Void> changeFilter(@PathVariable UUID id, @RequestBody String filter, @RequestHeader(QUERY_PARAM_USER_ID) String userId, @RequestParam("name") String name) {
exploreService.updateFilter(id, filter, userId, name);
public ResponseEntity<Void> changeFilter(@PathVariable UUID id, @RequestBody String filter, @RequestHeader(QUERY_PARAM_USER_ID) String userId,
@RequestParam("name") String name, @RequestParam("description") String description) {
exploreService.updateFilter(id, filter, userId, name, description);
return ResponseEntity.ok().build();
}

Original file line number Diff line number Diff line change
@@ -215,9 +215,15 @@ public void deleteElementsFromDirectory(List<UUID> uuids, UUID parentDirectoryUu
}
}

public void updateFilter(UUID id, String filter, String userId, String name) {
public void updateFilter(UUID id, String filter, String userId, String name, String description) {
filterService.updateFilter(id, filter, userId);
updateElementName(id, name, userId);

ElementAttributes elementAttributes = new ElementAttributes();
elementAttributes.setDescription(description);
if (StringUtils.isNotBlank(name)) {
elementAttributes.setElementName(name);
}
directoryService.updateElement(id, elementAttributes, userId);
}

public void updateContingencyList(UUID id, String content, String userId, String name, ContingencyListType contingencyListType) {
2 changes: 2 additions & 0 deletions src/test/java/org/gridsuite/explore/server/ExploreTest.java
Original file line number Diff line number Diff line change
@@ -689,11 +689,13 @@ void testCaseCreationErrorWithBadExtension() throws Exception {
void testChangeFilter(final MockWebServer server) throws Exception {
final String filter = "{\"type\":\"CRITERIA\",\"equipmentFilterForm\":{\"equipmentType\":\"BATTERY\",\"name\":\"test bbs\",\"countries\":[\"BS\"],\"nominalVoltage\":{\"type\":\"LESS_THAN\",\"value1\":545430,\"value2\":null},\"freeProperties\":{\"region\":[\"north\"],\"totallyFree\":[\"6555\"],\"tso\":[\"ceps\"]}}}";
final String name = "filter name";
final String description = "new filter description";
mockMvc.perform(put("/v1/explore/filters/{id}",
FILTER_UUID)
.contentType(APPLICATION_JSON)
.content(filter)
.param("name", name)
.param("description", description)
.header("userId", USER1)
).andExpect(status().isOk());