Skip to content

Get all modifications to apply with only one rest call to the network-modification-server #31

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.

Sign up for GitHub

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

Merged
FranckLecuyer merged 8 commits into from
Feb 4, 2026
Merged

Get all modifications to apply with only one rest call to the network-modification-server #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
744639e
Get all modifications to apply with only one rest call to the network…
FranckLecuyer Jan 28, 2026
27a8297
Merge branch 'main' into get_all_modifications_in_only_one_rest_call
FranckLecuyer Jan 28, 2026
6094362
Small change passing list of uuids to get the modifications
FranckLecuyer Jan 28, 2026
d23b166
Small fix after review
FranckLecuyer Jan 28, 2026
3fd3de8
Fix coverage
FranckLecuyer Jan 28, 2026
5653f3f
Merge branch 'main' into get_all_modifications_in_only_one_rest_call
FranckLecuyer Feb 2, 2026
61b7b54
Merge branch 'main' into get_all_modifications_in_only_one_rest_call
thangqp Feb 4, 2026
bd160d8
Merge branch 'main' into get_all_modifications_in_only_one_rest_call
FranckLecuyer Feb 4, 2026
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
27 changes: 12 additions & 15 deletions ...ain/java/org/gridsuite/monitor/worker/server/services/NetworkModificationRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

package org.gridsuite.monitor.worker.server.services;

import org.apache.commons.collections4.CollectionUtils;
import org.gridsuite.modification.dto.ModificationInfos;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
Expand All @@ -37,20 +37,17 @@ public NetworkModificationRestService(@Value("${gridsuite.services.network-modif
}

public List<ModificationInfos> getModifications(List<UUID> modificationsUuids) {
List<ModificationInfos> modifications = new ArrayList<>();

UriComponentsBuilder uriBuilder = UriComponentsBuilder
.fromUriString(DELIMITER + NETWORK_MODIFICATION_SERVER_API_VERSION + DELIMITER +
"network-composite-modification" + DELIMITER + "{uuid}" + DELIMITER + "network-modifications?onlyMetadata=false");

modificationsUuids.forEach(uuid -> {
String path = this.networkModificationServerBaseUri + uriBuilder.buildAndExpand(uuid).toUriString();
if (CollectionUtils.isNotEmpty(modificationsUuids)) {
String path = this.networkModificationServerBaseUri + UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_SERVER_API_VERSION + DELIMITER +
"network-composite-modifications" + DELIMITER + "network-modifications")
.queryParam("uuids", modificationsUuids.toArray())
.queryParam("onlyMetadata", "false")
.buildAndExpand()
.toUriString();
ModificationInfos[] modificationInfos = networkModificationServerRest.getForObject(path, ModificationInfos[].class);
if (modificationInfos != null) {
modifications.addAll(Arrays.asList(modificationInfos));
}
});

return modifications;
return modificationInfos != null ? Arrays.asList(modificationInfos) : List.of();
} else {
return List.of();
}
}
}
37 changes: 19 additions & 18 deletions ...java/org/gridsuite/monitor/worker/server/services/NetworkModificationRestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.springframework.test.web.client.response.MockRestResponseCreators;
import org.springframework.web.client.HttpServerErrorException;

import java.util.Arrays;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -55,37 +54,39 @@ void tearDown() {

@Test
void getModifications() {
UUID[] modificationUuids = {MODIFICATION_1_UUID, MODIFICATION_2_UUID};

ModificationInfos modificationInfos1 = LoadModificationInfos.builder().equipmentId("load1").q0(new AttributeModification<>(300., OperationType.SET)).build();
ModificationInfos modificationInfos2 = LoadModificationInfos.builder().equipmentId("load2").q0(new AttributeModification<>(null, OperationType.UNSET)).build();

ModificationInfos[] modificationInfos = {modificationInfos1, modificationInfos2};
List<ModificationInfos> modificationInfos = List.of(modificationInfos1, modificationInfos2);
ModificationInfos[] modificationsArray = modificationInfos.toArray(ModificationInfos[]::new);

for (int i = 0; i < modificationUuids.length; i++) {
ModificationInfos[] modificationsArray = {modificationInfos[i]};
try {
server.expect(MockRestRequestMatchers.method(HttpMethod.GET))
.andExpect(MockRestRequestMatchers.requestTo("http://network-modification-server/v1/network-composite-modification/" + modificationUuids[i] + "/network-modifications?onlyMetadata=false"))
.andRespond(MockRestResponseCreators.withSuccess()
.contentType(MediaType.APPLICATION_JSON)
.body(objectMapper.writeValueAsString(modificationsArray)));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
try {
server.expect(MockRestRequestMatchers.method(HttpMethod.GET))
.andExpect(MockRestRequestMatchers.requestTo("http://network-modification-server/v1/network-composite-modifications/network-modifications?uuids=" + MODIFICATION_1_UUID + "&uuids=" + MODIFICATION_2_UUID + "&onlyMetadata=false"))
.andRespond(MockRestResponseCreators.withSuccess()
.contentType(MediaType.APPLICATION_JSON)
.body(objectMapper.writeValueAsString(modificationsArray)));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}

List<ModificationInfos> resultListModifications = networkModificationRestService.getModifications(Arrays.asList(modificationUuids));
assertThat(resultListModifications).usingRecursiveComparison().isEqualTo(Arrays.asList(modificationInfos));
List<ModificationInfos> resultListModifications = networkModificationRestService.getModifications(List.of(MODIFICATION_1_UUID, MODIFICATION_2_UUID));
assertThat(resultListModifications).usingRecursiveComparison().isEqualTo(modificationInfos);
}

@Test
void getModificationsNotFound() {
server.expect(MockRestRequestMatchers.method(HttpMethod.GET))
.andExpect(MockRestRequestMatchers.requestTo("http://network-modification-server/v1/network-composite-modification/" + MODIFICATION_ERROR_UUID + "/network-modifications?onlyMetadata=false"))
.andExpect(MockRestRequestMatchers.requestTo("http://network-modification-server/v1/network-composite-modifications/network-modifications?uuids=" + MODIFICATION_ERROR_UUID + "&onlyMetadata=false"))
.andRespond(MockRestResponseCreators.withServerError());

List<UUID> modificationsUuids = List.of(MODIFICATION_ERROR_UUID);
assertThatThrownBy(() -> networkModificationRestService.getModifications(modificationsUuids)).isInstanceOf(HttpServerErrorException.InternalServerError.class);
}

@Test
void getEmptyModifications() {
List<ModificationInfos> resultListModifications = networkModificationRestService.getModifications(List.of());
assertThat(resultListModifications).isEmpty();
}
}