-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migration of the parameters from study-server (#59)
The parameters are now stored directly in this service. Only the UUID for each study is stored in study-server. Signed-off-by: Florent MILLOT <millotflo@gmail.com>
- Loading branch information
Showing
33 changed files
with
1,461 additions
and
214 deletions.
There are no files selected for viewing
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
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
96 changes: 96 additions & 0 deletions
96
...ava/org/gridsuite/sensitivityanalysis/server/SensitivityAnalysisParametersController.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /** | ||
| * Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
|
|
||
| package org.gridsuite.sensitivityanalysis.server; | ||
|
|
||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.Parameter; | ||
| import io.swagger.v3.oas.annotations.responses.ApiResponse; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import org.gridsuite.sensitivityanalysis.server.dto.parameters.SensitivityAnalysisParametersInfos; | ||
| import org.gridsuite.sensitivityanalysis.server.service.SensitivityAnalysisParametersService; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author Florent MILLOT <florent.millot at rte-france.com> | ||
| */ | ||
|
|
||
| @RestController | ||
| @RequestMapping(value = "/" + SensitivityAnalysisApi.API_VERSION + "/parameters") | ||
| @Tag(name = "Sensitivity analysis parameters") | ||
| public class SensitivityAnalysisParametersController { | ||
|
|
||
| private final SensitivityAnalysisParametersService parametersService; | ||
|
|
||
| public SensitivityAnalysisParametersController(SensitivityAnalysisParametersService parametersService) { | ||
| this.parametersService = parametersService; | ||
| } | ||
|
|
||
| @PostMapping(value = "/default", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Create default parameters") | ||
| @ApiResponse(responseCode = "200", description = "Default parameters were created") | ||
| public ResponseEntity<UUID> createDefaultParameters() { | ||
| return ResponseEntity.ok(parametersService.createDefaultParameters()); | ||
| } | ||
|
|
||
| @PostMapping(value = "", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Create parameters") | ||
| @ApiResponse(responseCode = "200", description = "parameters were created") | ||
| public ResponseEntity<UUID> createParameters( | ||
| @RequestBody SensitivityAnalysisParametersInfos parametersInfos) { | ||
| return ResponseEntity.ok(parametersService.createParameters(parametersInfos)); | ||
| } | ||
|
|
||
| @PostMapping(value = "/{sourceParametersUuid}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Duplicate parameters") | ||
| @ApiResponse(responseCode = "200", description = "parameters were duplicated") | ||
| @ApiResponse(responseCode = "404", description = "source parameters were not found") | ||
| public ResponseEntity<UUID> duplicateParameters( | ||
| @Parameter(description = "source parameters UUID") @PathVariable("sourceParametersUuid") UUID sourceParametersUuid) { | ||
| return ResponseEntity.of(parametersService.duplicateParameters(sourceParametersUuid)); | ||
| } | ||
|
|
||
| @GetMapping(value = "/{uuid}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Get parameters") | ||
| @ApiResponse(responseCode = "200", description = "parameters were returned") | ||
| @ApiResponse(responseCode = "404", description = "parameters were not found") | ||
| public ResponseEntity<SensitivityAnalysisParametersInfos> getParameters( | ||
| @Parameter(description = "parameters UUID") @PathVariable("uuid") UUID parametersUuid) { | ||
| return ResponseEntity.of(parametersService.getParameters(parametersUuid)); | ||
| } | ||
|
|
||
| @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Get all parameters") | ||
| @ApiResponse(responseCode = "200", description = "the list of all parameters was returned") | ||
| public ResponseEntity<List<SensitivityAnalysisParametersInfos>> getAllParameters() { | ||
| return ResponseEntity.ok(parametersService.getAllParameters()); | ||
| } | ||
|
|
||
| @PutMapping(value = "/{uuid}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Update parameters") | ||
| @ApiResponse(responseCode = "200", description = "parameters were updated") | ||
| public ResponseEntity<Void> updateParameters( | ||
| @Parameter(description = "parameters UUID") @PathVariable("uuid") UUID parametersUuid, | ||
| @RequestBody SensitivityAnalysisParametersInfos parametersInfos) { | ||
| parametersService.updateParameters(parametersUuid, parametersInfos); | ||
| return ResponseEntity.ok().build(); | ||
| } | ||
|
|
||
| @DeleteMapping(value = "/{uuid}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @Operation(summary = "Delete parameters") | ||
| @ApiResponse(responseCode = "200", description = "parameters were deleted") | ||
| public ResponseEntity<Void> deleteParameters( | ||
| @Parameter(description = "parameters UUID") @PathVariable("uuid") UUID parametersUuid) { | ||
| parametersService.deleteParameters(parametersUuid); | ||
| return ResponseEntity.ok().build(); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/main/java/org/gridsuite/sensitivityanalysis/server/dto/ReportInfos.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /** | ||
| * Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
|
|
||
| package org.gridsuite.sensitivityanalysis.server.dto; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * @author Florent MILLOT <florent.millot at rte-france.com> | ||
| */ | ||
| public record ReportInfos( | ||
| UUID reportUuid, | ||
| String reporterId, | ||
| String reportType | ||
| ) { | ||
| } |
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
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
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
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
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
22 changes: 22 additions & 0 deletions
22
...ava/org/gridsuite/sensitivityanalysis/server/dto/parameters/LoadFlowParametersValues.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /** | ||
| Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| This Source Code Form is subject to the terms of the Mozilla Public | ||
| License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
|
|
||
| package org.gridsuite.sensitivityanalysis.server.dto.parameters; | ||
|
|
||
| import com.powsybl.loadflow.LoadFlowParameters; | ||
| import lombok.Builder; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * @author David Braquart <david.braquart at rte-france.com> | ||
| */ | ||
| @Builder | ||
| public record LoadFlowParametersValues( | ||
| LoadFlowParameters commonParameters, | ||
| Map<String, String> specificParameters) { | ||
| } |
Oops, something went wrong.