Add a nad positions generation mode by default

Author: Slimane AMAR

src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java

@@ -7,16 +7,10 @@
 package org.gridsuite.studyconfig.server.entities;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.UUID;
 
-import static org.gridsuite.studyconfig.server.dto.NadPositionsGenerationMode.GEOGRAPHICAL_COORDINATES;
-
 /**
  * @author David BRAQUART <david.braquart at rte-france.com>
  */
@@ -62,7 +56,7 @@ public class NetworkVisualizationParamEntity {
     private String componentLibrary = "";
 
     @Column(name = "nad_positions_generation_mode")
-    private String nadPositionsGenerationMode = GEOGRAPHICAL_COORDINATES.name();
+    private String nadPositionsGenerationMode = null;
 
     @Column(name = "nad_positions_config_uuid")
     private UUID nadPositionsConfigUuid = null;

src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java

@@ -6,6 +6,7 @@
  */
 package org.gridsuite.studyconfig.server.mapper;
 
+import org.apache.logging.log4j.util.Strings;
 import org.gridsuite.studyconfig.server.dto.*;
 import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
 
@@ -19,7 +20,7 @@ public final class NetworkVisualizationParamMapper {
     private NetworkVisualizationParamMapper() {
     }
 
-    public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEntity entity) {
+    public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEntity entity, NadPositionsGenerationMode nadPositionsGenerationDefaultMode) {
         return new NetworkVisualizationParamInfos(
                 entity.getId(),
                 new MapParamInfos(
@@ -34,10 +35,15 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
                         entity.getSubstationLayout(),
                         entity.getComponentLibrary()
                 ),
-                new NetworkAreaDiagramParamInfos(NadPositionsGenerationMode.valueOf(entity.getNadPositionsGenerationMode()), entity.getNadPositionsConfigUuid())
+                new NetworkAreaDiagramParamInfos(getNadPositionsGenerationMode(entity.getNadPositionsGenerationMode(), nadPositionsGenerationDefaultMode), entity.getNadPositionsConfigUuid())
         );
     }
 
+    private static NadPositionsGenerationMode getNadPositionsGenerationMode(String nadPositionsGenerationMode, NadPositionsGenerationMode nadPositionsGenerationDefaultMode) {
+        return Strings.isEmpty(nadPositionsGenerationMode) ? nadPositionsGenerationDefaultMode : NadPositionsGenerationMode.valueOf(nadPositionsGenerationMode);
+
+    }
+
     public static NetworkVisualizationParamEntity toEntity(NetworkVisualizationParamInfos dto) {
         NetworkVisualizationParamEntity entity = new NetworkVisualizationParamEntity();
         updateEntity(entity, dto);

src/main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java

@@ -8,10 +8,12 @@
 
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
+import org.gridsuite.studyconfig.server.dto.NadPositionsGenerationMode;
 import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
 import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
 import org.gridsuite.studyconfig.server.mapper.NetworkVisualizationParamMapper;
 import org.gridsuite.studyconfig.server.repositories.NetworkVisualizationParamRepository;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,9 +28,13 @@ public class NetworkVisualizationsParamService {
 
     private final NetworkVisualizationParamRepository repository;
 
+    @Value("${study-config.nad-positions-generation-default-mode:}")
+    private NadPositionsGenerationMode nadPositionsGenerationDefaultMode;
+
     @Transactional
     public UUID createDefaultParameters() {
         NetworkVisualizationParamEntity entity = new NetworkVisualizationParamEntity();
+        entity.setNadPositionsGenerationMode(nadPositionsGenerationDefaultMode.toString());
         return repository.save(entity).getId();
     }
 
@@ -62,7 +68,7 @@ public UUID duplicateParameters(UUID id) {
 
     @Transactional(readOnly = true)
     public NetworkVisualizationParamInfos getParameters(UUID id) {
-        return NetworkVisualizationParamMapper.toDto(findEntityById(id));
+        return NetworkVisualizationParamMapper.toDto(findEntityById(id), nadPositionsGenerationDefaultMode);
     }
 
     @Transactional

src/main/resources/config/application.yaml

@@ -5,3 +5,6 @@ spring:
 powsybl-ws:
   database:
     name: studyconfig
+
+study-config:
+  nad-positions-generation-default-mode: GEOGRAPHICAL_COORDINATES