Add the NAD config uuid and the generation mode.

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

Author: AAJELLAL

src/main/java/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java

@@ -19,15 +19,7 @@
 import org.gridsuite.studyconfig.server.service.NetworkVisualizationsParamService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.UUID;
 
@@ -110,4 +102,16 @@ public ResponseEntity<Void> deleteParameters(
         service.deleteParameters(id);
         return ResponseEntity.noContent().build();
     }
+
+    @PostMapping("/{id}/positions-config-uuid")
+    @Operation(summary = "Update the positions configuration uuid",
+            description = "Updates existing network visualizations parameter")
+    @ApiResponse(responseCode = "204", description = "the positions configuration uuid parameter updated")
+    @ApiResponse(responseCode = "404", description = "the positions configuration uuid parameter not found")
+    public ResponseEntity<Void> updateParameter(
+            @Parameter(description = "ID of the parameters") @PathVariable UUID id,
+            @RequestBody UUID positionsConfigUuid) {
+        service.updatePositionsConfigUuid(id, positionsConfigUuid);
+        return ResponseEntity.noContent().build();
+    }
 }

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

@@ -14,8 +14,8 @@
  */
 @Schema(name = "NetworkAreaDiagramParamDto", description = "Network area diagram parameters")
 public record NetworkAreaDiagramParamInfos(
-    @Schema(description = "The nad generation mode")
-    String nadGenerationMode,
-    @Schema(description = "The nad configuration uuid")
-    UUID nadConfigUuid
+    @Schema(description = "The nad positions generation mode")
+    String nadPositionsGenerationMode,
+    @Schema(description = "The positions configuration uuid")
+    UUID positionsConfigUuid
 ) { }

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

@@ -59,9 +59,9 @@ public class NetworkVisualizationParamEntity {
     @Column(name = "component_library")
     private String componentLibrary = "";
 
-    @Column(name = "nad_generation_mode")
-    private String nadGenerationMode = "GEOGRAPHICAL_COORDINATES";
+    @Column(name = "nad_positions_generation_mode")
+    private String nadPositionsGenerationMode = "GEOGRAPHICAL_COORDINATES";
 
-    @Column(name = "nad_config_uuid")
-    private UUID nadConfigUuid;
+    @Column(name = "positions_config_uuid")
+    private UUID positionsConfigUuid;
 }

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

@@ -12,6 +12,8 @@
 import org.gridsuite.studyconfig.server.dto.SingleLineDiagramParamInfos;
 import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
 
+import java.util.UUID;
+
 /**
  * @author David BRAQUART <david.braquart at rte-france.com>
  */
@@ -35,7 +37,7 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
                         entity.getSubstationLayout(),
                         entity.getComponentLibrary()
                 ),
-                new NetworkAreaDiagramParamInfos(entity.getNadGenerationMode(), entity.getNadConfigUuid())
+                new NetworkAreaDiagramParamInfos(entity.getNadPositionsGenerationMode(), entity.getPositionsConfigUuid())
         );
     }
 
@@ -58,7 +60,11 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
         entity.setSubstationLayout(dto.singleLineDiagramParameters().substationLayout());
         entity.setComponentLibrary(dto.singleLineDiagramParameters().componentLibrary());
         // NAD
-        entity.setNadConfigUuid(dto.networkAreaDiagramParameters().nadConfigUuid());
-        entity.setNadGenerationMode(dto.networkAreaDiagramParameters().nadGenerationMode());
+        entity.setPositionsConfigUuid(dto.networkAreaDiagramParameters().positionsConfigUuid());
+        entity.setNadPositionsGenerationMode(dto.networkAreaDiagramParameters().nadPositionsGenerationMode());
+    }
+
+    public static void updateEntity(NetworkVisualizationParamEntity entity, UUID positionsConfigUuid) {
+        entity.setPositionsConfigUuid(positionsConfigUuid);
     }
 }

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

@@ -54,8 +54,8 @@ public UUID duplicateParameters(UUID id) {
                 .substationLayout(entity.getSubstationLayout())
                 .componentLibrary(entity.getComponentLibrary())
                 // NAD
-                .nadGenerationMode(entity.getNadGenerationMode())
-                .nadConfigUuid(entity.getNadConfigUuid())
+                .nadPositionsGenerationMode(entity.getNadPositionsGenerationMode())
+                .positionsConfigUuid(entity.getPositionsConfigUuid())
                 .build();
         return repository.save(duplicate).getId();
     }
@@ -71,6 +71,12 @@ public void updateParameters(UUID id, NetworkVisualizationParamInfos dto) {
         NetworkVisualizationParamMapper.updateEntity(entity, dto);
     }
 
+    @Transactional
+    public void updatePositionsConfigUuid(UUID id, UUID positionsConfigUuid) {
+        NetworkVisualizationParamEntity entity = findEntityById(id);
+        NetworkVisualizationParamMapper.updateEntity(entity, positionsConfigUuid);
+    }
+
     @Transactional
     public void deleteParameters(UUID id) {
         if (!repository.existsById(id)) {

src/main/resources/db/changelog/changesets/changelog_20250723T155729Z.xml

@@ -2,12 +2,12 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
     <changeSet author="ajellalali (generated)" id="1753286256612-6">
         <addColumn tableName="network_visualization_params">
-            <column name="nad_config_uuid" type="uuid"/>
+            <column name="positions_config_uuid" type="uuid"/>
         </addColumn>
     </changeSet>
     <changeSet author="ajellalali (generated)" id="1753286256612-7">
         <addColumn tableName="network_visualization_params">
-            <column name="nad_generation_mode" type="varchar(255)"/>
+            <column name="nad_positions_generation_mode" type="varchar(255)"/>
         </addColumn>
     </changeSet>
     <changeSet author="ajellalali (generated)" id="1753286256612-8">