move parameters creation

Author: Tristan-WorkGH

src/main/java/org/gridsuite/shortcircuit/server/ShortCircuitController.java

@@ -19,6 +19,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -157,4 +158,10 @@ public ResponseEntity<List<LimitViolationType>> getLimitTypes() {
         return ResponseEntity.ok().body(List.of(LimitViolationType.LOW_SHORT_CIRCUIT_CURRENT, LimitViolationType.HIGH_SHORT_CIRCUIT_CURRENT));
     }
 
+    @PutMapping(value = "/parameters", consumes = APPLICATION_JSON_VALUE)
+    @Operation(summary = "Create a entry for parameters")
+    @ApiResponse(responseCode = "201", description = "A new entry has been created")
+    public ResponseEntity<UUID> createParameters(@Parameter(description = "The parameters to save. It no body or empty string/json, then default parameters will be used instead.", allowEmptyValue = true) @RequestBody(required = false) @Nullable final ShortCircuitParametersInfos parameters) {
+        return ResponseEntity.ok(shortCircuitService.createParameters(parameters));
+    }
 }

src/main/java/org/gridsuite/shortcircuit/server/repositories/ShortCircuitParametersRepository.java

@@ -9,7 +9,6 @@
 import com.powsybl.shortcircuit.InitialVoltageProfileMode;
 import com.powsybl.shortcircuit.ShortCircuitParameters;
 import com.powsybl.shortcircuit.StudyType;
-import lombok.NonNull;
 import org.gridsuite.shortcircuit.server.dto.ShortCircuitPredefinedConfiguration;
 import org.gridsuite.shortcircuit.server.entities.ShortCircuitParametersEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -20,17 +19,17 @@
 @Repository
 public interface ShortCircuitParametersRepository extends JpaRepository<ShortCircuitParametersEntity, UUID> {
     default ShortCircuitParametersEntity getByIdOrDefault(final UUID id) {
-        return findById(id).orElseGet(() -> this.save(convert(getDefaultShortCircuitParameters(), ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP)));
+        return findById(id).orElseGet(() -> this.save(getDefaultEntity()));
     }
 
-    private static ShortCircuitParameters getDefaultShortCircuitParameters() {
+    static ShortCircuitParameters getDefaultShortCircuitParameters() {
         return new ShortCircuitParameters()
-                .setStudyType(StudyType.TRANSIENT)
-                .setMinVoltageDropProportionalThreshold(20)
-                .setWithFeederResult(true)
                 .setWithLimitViolations(true)
                 .setWithVoltageResult(false)
                 .setWithFortescueResult(false)
+                .setWithFeederResult(true)
+                .setStudyType(StudyType.TRANSIENT)
+                .setMinVoltageDropProportionalThreshold(20.0)
                 .setWithLoads(false)
                 .setWithShuntCompensators(false)
                 .setWithVSCConverterStations(true)
@@ -40,18 +39,19 @@ private static ShortCircuitParameters getDefaultShortCircuitParameters() {
                 .setVoltageRanges(null);
     }
 
-    private static ShortCircuitParametersEntity convert(@NonNull final ShortCircuitParameters parameters, final ShortCircuitPredefinedConfiguration shortCircuitPredefinedConfiguration) {
-        return new ShortCircuitParametersEntity(parameters.isWithLimitViolations(),
-                parameters.isWithVoltageResult(),
-                parameters.isWithFortescueResult(),
-                parameters.isWithFeederResult(),
-                parameters.getStudyType(),
-                parameters.getMinVoltageDropProportionalThreshold(),
-                parameters.isWithLoads(),
-                parameters.isWithShuntCompensators(),
-                parameters.isWithVSCConverterStations(),
-                parameters.isWithNeutralPosition(),
-                parameters.getInitialVoltageProfileMode(),
-                shortCircuitPredefinedConfiguration);
+    static ShortCircuitParametersEntity getDefaultEntity() {
+        return new ShortCircuitParametersEntity(
+                true,
+                false,
+                false,
+                true,
+                StudyType.TRANSIENT,
+                20.0,
+                false,
+                false,
+                true,
+                true,
+                InitialVoltageProfileMode.NOMINAL,
+                ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP);
     }
 }

src/main/java/org/gridsuite/shortcircuit/server/service/EntityDtoUtils.java

@@ -98,4 +98,23 @@ static ShortCircuitParameters convert(@NonNull final ShortCircuitParametersEntit
     static ShortCircuitParametersInfos convertInfos(final @NonNull ShortCircuitParametersEntity entity) {
         return new ShortCircuitParametersInfos(entity.getPredefinedParameters(), convert(entity), CEI909_VOLTAGE_PROFILE);
     }
+
+    static ShortCircuitParametersEntity convert(@NonNull final ShortCircuitParametersInfos parameters) {
+        return convert(parameters.parameters(), parameters.predefinedParameters());
+    }
+
+    static ShortCircuitParametersEntity convert(@NonNull final ShortCircuitParameters parameters, final ShortCircuitPredefinedConfiguration shortCircuitPredefinedConfiguration) {
+        return new ShortCircuitParametersEntity(parameters.isWithLimitViolations(),
+                parameters.isWithVoltageResult(),
+                parameters.isWithFortescueResult(),
+                parameters.isWithFeederResult(),
+                parameters.getStudyType(),
+                parameters.getMinVoltageDropProportionalThreshold(),
+                parameters.isWithLoads(),
+                parameters.isWithShuntCompensators(),
+                parameters.isWithVSCConverterStations(),
+                parameters.isWithNeutralPosition(),
+                parameters.getInitialVoltageProfileMode(),
+                shortCircuitPredefinedConfiguration);
+    }
 }

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java

@@ -49,7 +49,7 @@ public UUID runAndSaveResult(@NonNull final UUID networkUuid, final String varia
                                  final UUID parametersUuid, final Map<String, Object> parametersOverride,
                                  final UUID reportUuid, final String reporterId, final String reportType,
                                  @NonNull final String userId, final String busId) {
-        ShortCircuitParameters scParameters = EntityDtoUtils.convertInfos(parametersRepository.getByIdOrDefault(parametersUuid)).parameters();
+        ShortCircuitParameters scParameters = EntityDtoUtils.convert(parametersRepository.getByIdOrDefault(parametersUuid));
         if (parametersOverride != null && !parametersOverride.isEmpty()) {
             try {
                 scParameters = objectMapper.updateValue(scParameters, parametersOverride);
@@ -185,4 +185,8 @@ private static ShortCircuitParameters copy(ShortCircuitParameters shortCircuitPa
                 .setInitialVoltageProfileMode(shortCircuitParameters.getInitialVoltageProfileMode())
                 .setVoltageRanges(shortCircuitParameters.getVoltageRanges());
     }
+
+    public UUID createParameters(ShortCircuitParametersInfos parametersInfos) {
+        return parametersRepository.save(EntityDtoUtils.convert(parametersInfos)).getId();
+    }
 }