Add the NAD config uuid and the generation mode.

Signed-off-by: AAJELLAL <[email protected]>

Author: AAJELLAL

src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java

@@ -7,13 +7,15 @@
 package org.gridsuite.studyconfig.server.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.UUID;
 
 /**
  * @author David BRAQUART <david.braquart at rte-france.com>
  */
 @Schema(name = "NetworkAreaDiagramParamDto", description = "Network area diagram parameters")
 public record NetworkAreaDiagramParamInfos(
-
-    @Schema(description = "Initialize with geographical data")
-    Boolean initNadWithGeoData
+    @Schema(description = "The nad generation mode")
+    String nadGenerationMode,
+    @Schema(description = "The nad configuration uuid")
+    UUID nadConfigUuid
 ) { }

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

@@ -12,6 +12,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+
 import java.util.UUID;
 
 /**
@@ -58,6 +59,9 @@ public class NetworkVisualizationParamEntity {
     @Column(name = "component_library")
     private String componentLibrary = "";
 
-    @Column(name = "init_nad_with_geo_data")
-    private Boolean initNadWithGeoData = true;
+    @Column(name = "nad_generation_mode")
+    private String nadGenerationMode = "GEOGRAPHICAL_COORDINATES";
+
+    @Column(name = "nad_config_uuid")
+    private UUID nadConfigUuid;
 }

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

@@ -35,7 +35,7 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
                         entity.getSubstationLayout(),
                         entity.getComponentLibrary()
                 ),
-                new NetworkAreaDiagramParamInfos(entity.getInitNadWithGeoData())
+                new NetworkAreaDiagramParamInfos(entity.getNadGenerationMode(), entity.getNadConfigUuid())
         );
     }
 
@@ -58,6 +58,7 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
         entity.setSubstationLayout(dto.singleLineDiagramParameters().substationLayout());
         entity.setComponentLibrary(dto.singleLineDiagramParameters().componentLibrary());
         // NAD
-        entity.setInitNadWithGeoData(dto.networkAreaDiagramParameters().initNadWithGeoData());
+        entity.setNadConfigUuid(dto.networkAreaDiagramParameters().nadConfigUuid());
+        entity.setNadGenerationMode(dto.networkAreaDiagramParameters().nadGenerationMode());
     }
 }

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

@@ -54,7 +54,8 @@ public UUID duplicateParameters(UUID id) {
                 .substationLayout(entity.getSubstationLayout())
                 .componentLibrary(entity.getComponentLibrary())
                 // NAD
-                .initNadWithGeoData(entity.getInitNadWithGeoData())
+                .nadGenerationMode(entity.getNadGenerationMode())
+                .nadConfigUuid(entity.getNadConfigUuid())
                 .build();
         return repository.save(duplicate).getId();
     }

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -62,3 +62,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250619T162423Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250723T155729Z.xml
+      relativeToChangelogFile: true

src/test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java

@@ -35,6 +35,7 @@
 class NetworkVisualizationParamsIntegrationTest {
 
     private static final String URI_NETWORK_VISUALIZATION_PARAM_BASE = "/v1/network-visualizations-params";
+    private static final String GEOGRAPHICAL_COORDINATES = "GEOGRAPHICAL_COORDINATES";
 
     @Autowired
     private MockMvc mockMvc;
@@ -156,14 +157,14 @@ private NetworkVisualizationParamInfos createDto() {
         return new NetworkVisualizationParamInfos(null,
                 new MapParamInfos(true, false, "flow", true, "base"),
                 new SingleLineDiagramParamInfos(false, false, "layout", "lib"),
-                new NetworkAreaDiagramParamInfos(true));
+                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES, null));
     }
 
     private NetworkVisualizationParamInfos createDtoForUpdate(UUID id) {
         return new NetworkVisualizationParamInfos(id,
                 new MapParamInfos(false, true, "flow2", false, "base2"),
                 new SingleLineDiagramParamInfos(true, true, "layout2", "lib2"),
-                new NetworkAreaDiagramParamInfos(false));
+                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES, null));
     }
 
     private UUID saveAndReturnId(NetworkVisualizationParamInfos dto) {