Remove the nadPositionsConfigUuid and adapt the tests.

AAJELLAL · AAJELLAL · commit 7cea480c1cbe · 2025-08-18T15:18:36.000+02:00
Signed-off-by: AAJELLAL &lt;ali.ajellalod@gmail.com&gt;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java b/src/main/java/org/gridsuite/studyconfig/server/controller/NetworkVisualizationsParamController.java
@@ -102,16 +102,4 @@ public ResponseEntity<Void> deleteParameters(
         service.deleteParameters(id);
         return ResponseEntity.noContent().build();
     }
-
-    @PutMapping("/{id}/nad-positions-config-uuid")
-    @Operation(summary = "Update the positions configuration uuid",
-            description = "Updates existing network visualizations parameter")
-    @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 nadPositionsConfigUuid) {
-        service.updateNadPositionsConfigUuid(id, nadPositionsConfigUuid);
-        return ResponseEntity.noContent().build();
-    }
 }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java b/src/main/java/org/gridsuite/studyconfig/server/dto/NetworkAreaDiagramParamInfos.java
@@ -7,15 +7,12 @@
 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 = "The nad positions generation mode")
-    NadPositionsGenerationMode nadPositionsGenerationMode,
-    @Schema(description = "The positions configuration uuid")
-    UUID nadPositionsConfigUuid
+    NadPositionsGenerationMode nadPositionsGenerationMode
 ) { }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java
@@ -57,7 +57,4 @@ public class NetworkVisualizationParamEntity {
 
     @Column(name = "nad_positions_generation_mode")
     private String nadPositionsGenerationMode = null;
-
-    @Column(name = "nad_positions_config_uuid")
-    private UUID nadPositionsConfigUuid = null;
 }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java b/src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java
@@ -10,8 +10,6 @@
 import org.gridsuite.studyconfig.server.dto.*;
 import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
 
-import java.util.UUID;
-
 /**
  * @author David BRAQUART <david.braquart at rte-france.com>
  */
@@ -35,7 +33,7 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
                         entity.getSubstationLayout(),
                         entity.getComponentLibrary()
                 ),
-                new NetworkAreaDiagramParamInfos(getNadPositionsGenerationMode(entity.getNadPositionsGenerationMode(), nadPositionsGenerationDefaultMode), entity.getNadPositionsConfigUuid())
+                new NetworkAreaDiagramParamInfos(getNadPositionsGenerationMode(entity.getNadPositionsGenerationMode(), nadPositionsGenerationDefaultMode))
         );
     }
 
@@ -63,11 +61,6 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
         entity.setSubstationLayout(dto.singleLineDiagramParameters().substationLayout());
         entity.setComponentLibrary(dto.singleLineDiagramParameters().componentLibrary());
         // NAD
-        entity.setNadPositionsConfigUuid(dto.networkAreaDiagramParameters().nadPositionsConfigUuid());
         entity.setNadPositionsGenerationMode(dto.networkAreaDiagramParameters().nadPositionsGenerationMode().name());
     }
-
-    public static void updateNadPositionsConfigUuid(NetworkVisualizationParamEntity entity, UUID nadPositionsConfigUuid) {
-        entity.setNadPositionsConfigUuid(nadPositionsConfigUuid);
-    }
 }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java b/src/main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java
@@ -61,7 +61,6 @@ public UUID duplicateParameters(UUID id) {
                 .componentLibrary(entity.getComponentLibrary())
                 // NAD
                 .nadPositionsGenerationMode(entity.getNadPositionsGenerationMode())
-                .nadPositionsConfigUuid(entity.getNadPositionsConfigUuid())
                 .build();
         return repository.save(duplicate).getId();
     }
@@ -77,12 +76,6 @@ public void updateParameters(UUID id, NetworkVisualizationParamInfos dto) {
         NetworkVisualizationParamMapper.updateEntity(entity, dto);
     }
 
-    @Transactional
-    public void updateNadPositionsConfigUuid(UUID id, UUID nadPositionsConfigUuid) {
-        NetworkVisualizationParamEntity entity = findEntityById(id);
-        NetworkVisualizationParamMapper.updateNadPositionsConfigUuid(entity, nadPositionsConfigUuid);
-    }
-
     @Transactional
     public void deleteParameters(UUID id) {
         if (!repository.existsById(id)) {
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250723T155729Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250723T155729Z.xml
@@ -1,10 +1,5 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <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_positions_config_uuid" type="uuid"/>
-        </addColumn>
-    </changeSet>
     <changeSet author="ajellalali (generated)" id="1753286256612-7">
         <addColumn tableName="network_visualization_params">
             <column name="nad_positions_generation_mode" type="varchar(255)"/>
diff --git a/src/test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java b/src/test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java
@@ -133,32 +133,6 @@ void testDuplicateParams() throws Exception {
         assertThat(networkVisualizationParamRepository.existsById(duplicatedParams.id())).isTrue();
     }
 
-    @Test
-    void testUpdatePositionsConfigUuidParameter() throws Exception {
-        NetworkVisualizationParamInfos paramsToUpdate = createDto();
-        UUID paramsUuid = saveAndReturnId(paramsToUpdate);
-        UUID updatedPositionsConfigUuid = UUID.randomUUID();
-        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().nadPositionsConfigUuid())
-                .isEqualTo(updatedPositionsConfigUuid);
-    }
-
-    @Test
-    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 + "/nad-positions-config-uuid")
-                        .content(invalidUuid)
-                        .contentType(MediaType.APPLICATION_JSON))
-                .andExpect(status().isBadRequest());
-    }
-
     @Test
     void testUpdateNotFoundPositionsConfigUuidParameter() throws Exception {
         NetworkVisualizationParamInfos paramsToUpdate = createDto();
@@ -195,14 +169,14 @@ private NetworkVisualizationParamInfos createDto() {
         return new NetworkVisualizationParamInfos(null,
                 new MapParamInfos(true, false, "flow", true, "base"),
                 new SingleLineDiagramParamInfos(false, false, "layout", "lib"),
-                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES, null));
+                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES));
     }
 
     private NetworkVisualizationParamInfos createDtoForUpdate(UUID id) {
         return new NetworkVisualizationParamInfos(id,
                 new MapParamInfos(false, true, "flow2", false, "base2"),
                 new SingleLineDiagramParamInfos(true, true, "layout2", "lib2"),
-                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES, null));
+                new NetworkAreaDiagramParamInfos(GEOGRAPHICAL_COORDINATES));
     }
 
     private UUID saveAndReturnId(NetworkVisualizationParamInfos dto) {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,4 @@ public class NetworkVisualizationParamEntity {`
`57`	`57`
`58`	`58`	`@Column(name = "nad_positions_generation_mode")`
`59`	`59`	`private String nadPositionsGenerationMode = null;`
`60`		`-`
`61`		`- @Column(name = "nad_positions_config_uuid")`
`62`		`- private UUID nadPositionsConfigUuid = null;`
`63`	`60`	`}`