Skip to content

Commit 973e198

Browse files
authored
Add upstream option to filter export functionality (#818)
Signed-off-by: achour94 <[email protected]>
1 parent 0781368 commit 973e198

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/gridsuite/study/server/controller/StudyController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,8 +2354,9 @@ public ResponseEntity<String> exportFilters(
23542354
@Parameter(description = "Study uuid") @PathVariable("studyUuid") UUID studyUuid,
23552355
@Parameter(description = "Root network uuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
23562356
@Parameter(description = "nodeUuid") @PathVariable("nodeUuid") UUID nodeUuid,
2357-
@Parameter(description = "Filters uuid to be resolved") @RequestParam("filtersUuid") List<UUID> filtersUuid) {
2358-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.exportFilters(rootNetworkUuid, filtersUuid, nodeUuid));
2357+
@Parameter(description = "Filters uuid to be resolved") @RequestParam("filtersUuid") List<UUID> filtersUuid,
2358+
@Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
2359+
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.exportFilters(rootNetworkUuid, filtersUuid, nodeUuid, inUpstreamBuiltParentNode));
23592360
}
23602361

23612362
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/state-estimation/run")

src/main/java/org/gridsuite/study/server/service/StudyService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3223,8 +3223,9 @@ public String exportFilterFromFirstRootNetwork(UUID studyUuid, UUID filterUuid)
32233223
}
32243224

32253225
@Transactional(readOnly = true)
3226-
public String exportFilters(UUID rootNetworkUuid, List<UUID> filtersUuid, UUID nodeUuid) {
3227-
String variantId = networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid);
3226+
public String exportFilters(UUID rootNetworkUuid, List<UUID> filtersUuid, UUID nodeUuid, boolean inUpstreamBuiltParentNode) {
3227+
UUID nodeUuidToSearchIn = getNodeUuidToSearchIn(nodeUuid, rootNetworkUuid, inUpstreamBuiltParentNode);
3228+
String variantId = networkModificationTreeService.getVariantId(nodeUuidToSearchIn, rootNetworkUuid);
32283229
return filterService.exportFilters(rootNetworkService.getNetworkUuid(rootNetworkUuid), filtersUuid, variantId);
32293230
}
32303231

0 commit comments

Comments
 (0)