Skip to content

Remove unused provider endpoints and refactor default parameters handling #42

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
ayolab merged 3 commits into from
Mar 4, 2026
Merged

Remove unused provider endpoints and refactor default parameters handling #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2331aeb
Remove unused provider endpoints and refactor default parameters hand…
ayolab Feb 25, 2026
75ade89
Merge branch 'main' into ayolab/remove-unused-provider-endpoints-and-…
thangqp Feb 26, 2026
bdfce9c
Merge branch 'main' into ayolab/remove-unused-provider-endpoints-and-…
ayolab Mar 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
8 changes: 0 additions & 8 deletions ...ridsuite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import static org.gridsuite.computation.service.NotificationService.*;
import static org.gridsuite.dynamicsecurityanalysis.server.DynamicSecurityAnalysisApi.API_VERSION;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;

/**
* @author Thang PHAM <quyet-thang.pham at rte-france.com>
Expand Down Expand Up @@ -135,13 +134,6 @@ public ResponseEntity<List<String>> getProviders() {
.body(dynamicSecurityAnalysisService.getProviders());
}

@GetMapping(value = "/default-provider", produces = TEXT_PLAIN_VALUE)
@Operation(summary = "Get dynamic security analysis default provider")
@ApiResponses(@ApiResponse(responseCode = "200", description = "The dynamic security analysis default provider has been found"))
public ResponseEntity<String> getDefaultProvider() {
return ResponseEntity.ok().body(dynamicSecurityAnalysisService.getDefaultProvider());
}

@GetMapping(value = "/results/{resultUuid}/download-debug-file", produces = "application/json")
@Operation(summary = "Download a dynamic security analysis debug file")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Dynamic security analysis debug file"),
Expand Down
10 changes: 0 additions & 10 deletions ...ynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,6 @@ public ResponseEntity<String> getProvider(
return ResponseEntity.of(Optional.of(parametersService.getParameters(parametersUuid).getProvider()));
}

@PutMapping(value = "/{uuid}/provider")
@Operation(summary = "Update provider")
@ApiResponse(responseCode = "200", description = "provider was updated")
public ResponseEntity<Void> updateProvider(
@Parameter(description = "parameters UUID") @PathVariable("uuid") UUID parametersUuid,
@RequestBody(required = false) String provider) {
parametersService.updateProvider(parametersUuid, provider);
return ResponseEntity.ok().build();
}

@GetMapping(value = "/{uuid}/values", produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Get parameters values")
@ApiResponse(responseCode = "200", description = "parameters were returned")
Expand Down
17 changes: 5 additions & 12 deletions src/main/java/org/gridsuite/dynamicsecurityanalysis/server/service/ParametersService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,14 @@ private UUID doCreateParameters(DynamicSecurityAnalysisParametersInfos parameter

@Transactional
public UUID createDefaultParameters() {
DynamicSecurityAnalysisParametersInfos defaultParametersInfos = getDefaultParametersValues(defaultProvider);
DynamicSecurityAnalysisParametersInfos defaultParametersInfos = getDefaultParametersValues();
return doCreateParameters(defaultParametersInfos);
}

public DynamicSecurityAnalysisParametersInfos getDefaultParametersValues(String provider) {
public DynamicSecurityAnalysisParametersInfos getDefaultParametersValues() {
DynamicSecurityAnalysisParameters defaultConfigParameters = DynamicSecurityAnalysisParameters.load();
return DynamicSecurityAnalysisParametersInfos.builder()
.provider(provider)
.provider(defaultProvider)
.scenarioDuration(5.0)
.contingenciesStartTime(defaultConfigParameters.getDynamicContingenciesParameters().getContingenciesStartTime())
.contingencyListIds(null)
Expand Down Expand Up @@ -204,8 +204,8 @@ public void updateParameters(UUID parametersUuid, DynamicSecurityAnalysisParamet
DynamicSecurityAnalysisParametersEntity entity = dynamicSecurityAnalysisParametersRepository.findById(parametersUuid)
.orElseThrow(() -> new ComputationException(PARAMETERS_NOT_FOUND, MSG_PARAMETERS_UUID_NOT_FOUND + parametersUuid));
if (parametersInfos == null) {
//if the parameters is null it means it's a reset to defaultValues, but we need to keep the provider because it's updated separately
entity.update(getDefaultParametersValues(Optional.ofNullable(entity.getProvider()).orElse(defaultProvider)));
//if the parameters is null it means it's a reset to defaultValues
entity.update(getDefaultParametersValues());
} else {
entity.update(parametersInfos);
}
Expand All @@ -216,13 +216,6 @@ public void deleteParameters(UUID parametersUuid) {
dynamicSecurityAnalysisParametersRepository.deleteById(parametersUuid);
}

@Transactional
public void updateProvider(UUID parametersUuid, String provider) {
DynamicSecurityAnalysisParametersEntity entity = dynamicSecurityAnalysisParametersRepository.findById(parametersUuid)
.orElseThrow(() -> new ComputationException(PARAMETERS_NOT_FOUND, MSG_PARAMETERS_UUID_NOT_FOUND + parametersUuid));
entity.setProvider(provider != null ? provider : defaultProvider);
}

// --- Dynamic security analysis evaluated parameters related methods --- //

public List<Contingency> getContingencies(List<UUID> contingencyListIds, UUID networkUuid, String variantId) {
Expand Down
2 changes: 1 addition & 1 deletion ...ynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerIEEE14Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected void initActionsClientMock() {

@Override
protected void initDynamicSecurityAnalysisParametersRepositoryMock() {
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo");
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues();
defaultParams.setScenarioDuration(50.0);
defaultParams.setContingenciesStartTime(5.0);
defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID));
Expand Down
2 changes: 1 addition & 1 deletion ...uite/dynamicsecurityanalysis/server/controller/DynamicSecurityAnalysisControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ protected void initActionsClientMock() {

@Override
protected void initDynamicSecurityAnalysisParametersRepositoryMock() {
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo");
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues();
defaultParams.setScenarioDuration(50.0);
defaultParams.setContingenciesStartTime(5.0);
defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID));
Expand Down
21 changes: 1 addition & 20 deletions ...icsecurityanalysis/server/controller/DynamicSecurityAnalysisParametersControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void tearDown() {
}

private DynamicSecurityAnalysisParametersInfos getParametersInfos() {
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues("Dynawo");
DynamicSecurityAnalysisParametersInfos defaultParams = parametersService.getDefaultParametersValues();
defaultParams.setScenarioDuration(50.0);
defaultParams.setContingenciesStartTime(5.0);
defaultParams.setContingencyListIds(List.of(CONTINGENCY_UUID));
Expand Down Expand Up @@ -233,25 +233,6 @@ void testGetProvider() throws Exception {
assertThat(provider).isEqualTo(parametersInfos.getProvider());
}

@Test
void testUpdateProvider() throws Exception {
DynamicSecurityAnalysisParametersInfos parametersInfos = getParametersInfos();
DynamicSecurityAnalysisParametersEntity parametersEntity = new DynamicSecurityAnalysisParametersEntity(parametersInfos);
UUID parametersUuid = parametersRepository.save(parametersEntity).getId();

String newProvider = "Dynawo2";

mockMvc.perform(put("/v1/parameters/" + parametersUuid + "/provider")
.content(newProvider))
.andExpect(status().isOk());

Optional<DynamicSecurityAnalysisParametersEntity> updatedParametersEntityOpt = parametersRepository.findById(parametersUuid);
assertThat(updatedParametersEntityOpt).isPresent();

// check provider
assertThat(updatedParametersEntityOpt.get().getProvider()).isEqualTo(newProvider);
}

@Test
void testGetParametersValues() throws Exception {
// --- Setup --- //
Expand Down