Review

Author: Slimane AMAR

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

@@ -103,15 +103,15 @@ public ResponseEntity<Void> deleteParameters(
         return ResponseEntity.noContent().build();
     }
 
-    @PutMapping("/{id}/positions-config-uuid")
+    @PutMapping("/{id}/nad-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(
+    @ApiResponse(responseCode = "204", description = "the nad positions configuration uuid parameter updated")
+    @ApiResponse(responseCode = "404", description = "the nad positions configuration uuid parameter not found")
+    public ResponseEntity<Void> updateNadPositionsConfigUuid(
             @Parameter(description = "ID of the parameters") @PathVariable UUID id,
-            @RequestBody UUID positionsConfigUuid) {
-        service.updatePositionsConfigUuid(id, positionsConfigUuid);
+            @RequestBody UUID nadPositionsConfigUuid) {
+        service.updateNadPositionsConfigUuid(id, nadPositionsConfigUuid);
         return ResponseEntity.noContent().build();
     }
 }

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

@@ -17,5 +17,5 @@ public record NetworkAreaDiagramParamInfos(
     @Schema(description = "The nad positions generation mode")
     String nadPositionsGenerationMode,
     @Schema(description = "The positions configuration uuid")
-    UUID positionsConfigUuid
+    UUID nadPositionsConfigUuid
 ) { }

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

@@ -62,6 +62,6 @@ public class NetworkVisualizationParamEntity {
     @Column(name = "nad_positions_generation_mode")
     private String nadPositionsGenerationMode = "GEOGRAPHICAL_COORDINATES";
 
-    @Column(name = "positions_config_uuid")
-    private UUID positionsConfigUuid;
+    @Column(name = "nad_positions_config_uuid")
+    private UUID nadPositionsConfigUuid = null;
 }

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

@@ -37,7 +37,7 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
                         entity.getSubstationLayout(),
                         entity.getComponentLibrary()
                 ),
-                new NetworkAreaDiagramParamInfos(entity.getNadPositionsGenerationMode(), entity.getPositionsConfigUuid())
+                new NetworkAreaDiagramParamInfos(entity.getNadPositionsGenerationMode(), entity.getNadPositionsConfigUuid())
         );
     }
 
@@ -60,11 +60,11 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
         entity.setSubstationLayout(dto.singleLineDiagramParameters().substationLayout());
         entity.setComponentLibrary(dto.singleLineDiagramParameters().componentLibrary());
         // NAD
-        entity.setPositionsConfigUuid(dto.networkAreaDiagramParameters().positionsConfigUuid());
+        entity.setNadPositionsConfigUuid(dto.networkAreaDiagramParameters().nadPositionsConfigUuid());
         entity.setNadPositionsGenerationMode(dto.networkAreaDiagramParameters().nadPositionsGenerationMode());
     }
 
-    public static void updateEntity(NetworkVisualizationParamEntity entity, UUID positionsConfigUuid) {
-        entity.setPositionsConfigUuid(positionsConfigUuid);
+    public static void updateNadPositionsConfigUuid(NetworkVisualizationParamEntity entity, UUID nadPositionsConfigUuid) {
+        entity.setNadPositionsConfigUuid(nadPositionsConfigUuid);
     }
 }

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

@@ -55,7 +55,7 @@ public UUID duplicateParameters(UUID id) {
                 .componentLibrary(entity.getComponentLibrary())
                 // NAD
                 .nadPositionsGenerationMode(entity.getNadPositionsGenerationMode())
-                .positionsConfigUuid(entity.getPositionsConfigUuid())
+                .nadPositionsConfigUuid(entity.getNadPositionsConfigUuid())
                 .build();
         return repository.save(duplicate).getId();
     }
@@ -72,9 +72,9 @@ public void updateParameters(UUID id, NetworkVisualizationParamInfos dto) {
     }
 
     @Transactional
-    public void updatePositionsConfigUuid(UUID id, UUID positionsConfigUuid) {
+    public void updateNadPositionsConfigUuid(UUID id, UUID nadPositionsConfigUuid) {
         NetworkVisualizationParamEntity entity = findEntityById(id);
-        NetworkVisualizationParamMapper.updateEntity(entity, positionsConfigUuid);
+        NetworkVisualizationParamMapper.updateNadPositionsConfigUuid(entity, nadPositionsConfigUuid);
     }
 
     @Transactional

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

@@ -2,7 +2,7 @@
 <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="positions_config_uuid" type="uuid"/>
+            <column name="nad_positions_config_uuid" type="uuid"/>
         </addColumn>
     </changeSet>
     <changeSet author="ajellalali (generated)" id="1753286256612-7">

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

@@ -138,13 +138,13 @@ void testUpdatePositionsConfigUuidParameter() throws Exception {
         NetworkVisualizationParamInfos paramsToUpdate = createDto();
         UUID paramsUuid = saveAndReturnId(paramsToUpdate);
         UUID updatedPositionsConfigUuid = UUID.randomUUID();
-        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + paramsUuid + "/positions-config-uuid")
+        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + paramsUuid + "/nad-positions-config-uuid")
                         .content("\"" + updatedPositionsConfigUuid + "\"")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isNoContent());
 
         NetworkVisualizationParamInfos retrievedParams = getParams(paramsUuid);
-        assertThat(retrievedParams.networkAreaDiagramParameters().positionsConfigUuid())
+        assertThat(retrievedParams.networkAreaDiagramParameters().nadPositionsConfigUuid())
                 .isEqualTo(updatedPositionsConfigUuid);
     }
 
@@ -153,7 +153,7 @@ void testUpdateWithInvalidPositionsConfigUuidParameter() throws Exception {
         NetworkVisualizationParamInfos paramsToUpdate = createDto();
         UUID paramsUuid = saveAndReturnId(paramsToUpdate);
         String invalidUuid = "\"not-a-valid-uuid\"";
-        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + paramsUuid + "/positions-config-uuid")
+        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + paramsUuid + "/nad-positions-config-uuid")
                         .content(invalidUuid)
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isBadRequest());
@@ -165,7 +165,7 @@ void testUpdateNotFoundPositionsConfigUuidParameter() throws Exception {
         saveAndReturnId(paramsToUpdate);
         UUID nonExistentId = UUID.randomUUID();
         UUID updatedPositionsConfigUuid = UUID.randomUUID();
-        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + nonExistentId + "/positions-config-uuid")
+        mockMvc.perform(put(URI_NETWORK_VISUALIZATION_PARAM_BASE + "/" + nonExistentId + "/nad-positions-config-uuid")
                         .content("\"" + updatedPositionsConfigUuid + "\"")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isNotFound());