handle the get count filters ids #54
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FranckLecuyer
requested changes
Dec 12, 2023
| @@ -97,6 +98,16 @@ public ResponseEntity<UUID> runAndSave(@Parameter(description = "Network UUID") | |||
| return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(resultUuid); | |||
| } | |||
|
|
|||
| @PostMapping(value = "/networks/{networkUuid}/computation-count", produces = APPLICATION_JSON_VALUE) | |||
There was a problem hiding this comment.
/networks/{networkUuid}/parameters/complexity ?
There was a problem hiding this comment.
It's a proposal from Slimane
| @Operation(summary = "Get computation count of the total of identifiables for a list of filters") | ||
| @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The sensitivity analysis identifiables count"), | ||
| @ApiResponse(responseCode = "404", description = "Sensitivity analysis identifiables count result has not been found")}) | ||
| public ResponseEntity<Integer> getComputationCount(@Parameter(description = "Result UUID") @PathVariable("networkUuid") UUID networkUuid, |
There was a problem hiding this comment.
description = "Network UUID"
| @@ -113,6 +114,18 @@ private List<IdentifiableAttributes> goGetIdentifiables(EquipmentsContainer filt | |||
| } | |||
| } | |||
|
|
|||
| private Integer getComputationCount(Map<String, List<UUID>> ids, UUID networkUuid, Integer containersAttributesCount) { | |||
| Map<String, List<Integer>> map = filterService.getIdentifiablesCount(ids, networkUuid, null); | |||
There was a problem hiding this comment.
for contingency list ids, you should request the actions-server and not the filter-server, to get all the contingencies ...
| @@ -465,7 +469,7 @@ public void setUp() { | |||
| given(filterService.getIdentifiablesFromFilter(EQUIPMENTS_IN_VOLTAGE_REGULATION_FILTERS_UUID, NETWORK_UUID, VARIANT_2_ID)).willReturn(EQUIPMENTS_IN_VOLTAGE_REGULATION); | |||
| given(filterService.getIdentifiablesFromFilter(EQUIPMENTS_IN_VOLTAGE_REGULATION_FILTERS_UUID, NETWORK_UUID, null)).willReturn(EQUIPMENTS_IN_VOLTAGE_REGULATION); | |||
| given(filterService.getIdentifiablesFromFilter(EQUIPMENTS_IN_VOLTAGE_REGULATION_FILTERS_UUID, NETWORK_STOP_UUID, VARIANT_2_ID)).willReturn(EQUIPMENTS_IN_VOLTAGE_REGULATION); | |||
|
|
|||
| given(filterService.getIdentifiablesCount(IDS, NETWORK_UUID, null)).willReturn(Map.of("0", List.of(6), "1", List.of(6), "2", List.of(6))); | |||
There was a problem hiding this comment.
See remark above for contingencies ...
SlimaneAmar
approved these changes
Dec 13, 2023
|
|
||
| HttpEntity<Map<String, List<UUID>>> httpEntity = new HttpEntity<>(ids, headers); | ||
|
|
||
| return restTemplate.exchange(filterServerBaseUri + path, HttpMethod.POST, httpEntity, |
| ids.remove(INJECTIONS); | ||
| } | ||
| containersAttributesCount = getComputationCount(ids, networkUuid, variantId, containersAttributesCount); | ||
| return containersAttributesCount; |
There was a problem hiding this comment.
return getComputationCount(ids, networkUuid, variantId, containersAttributesCount) ?
| @@ -133,6 +133,14 @@ public class SensitivityAnalysisControllerTest { | |||
| private static final UUID MONITORED_VOLTAGE_LEVELS_FILTERS_NODES_UUID = UUID.randomUUID(); | |||
| private static final UUID EQUIPMENTS_IN_VOLTAGE_REGULATION_FILTERS_UUID = UUID.randomUUID(); | |||
| private static final UUID CONTINGENCIES_NODES_UUID = UUID.randomUUID(); | |||
| private static final List<UUID> MONITORED_BRANCHES_FILTERS_UUID = List.of(UUID.randomUUID()); | |||
There was a problem hiding this comment.
Really need these constants ?
FranckLecuyer
approved these changes
Dec 14, 2023
|
SlimaneAmar
approved these changes
Dec 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.