Skip to content

Commit 772361b

Browse files
author
Slimane AMAR
committed
Add a enum for nad positions generation mode
1 parent a49c6ab commit 772361b

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* Copyright (c) 2025, RTE (http://www.rte-france.com)
3+
* This Source Code Form is subject to the terms of the Mozilla Public
4+
* License, v. 2.0. If a copy of the MPL was not distributed with this
5+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
*/
7+
package org.gridsuite.studyconfig.server.dto;
8+
9+
/**
10+
* @author AJELLAL Ali <[email protected]>
11+
*/
12+
public enum NadPositionsGenerationMode {
13+
GEOGRAPHICAL_COORDINATES,
14+
AUTOMATIC,
15+
CONFIGURED
16+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Schema(name = "NetworkAreaDiagramParamDto", description = "Network area diagram parameters")
1616
public record NetworkAreaDiagramParamInfos(
1717
@Schema(description = "The nad positions generation mode")
18-
String nadPositionsGenerationMode,
18+
NadPositionsGenerationMode nadPositionsGenerationMode,
1919
@Schema(description = "The positions configuration uuid")
2020
UUID nadPositionsConfigUuid
2121
) { }

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
import java.util.UUID;
1717

18+
import static org.gridsuite.studyconfig.server.dto.NadPositionsGenerationMode.GEOGRAPHICAL_COORDINATES;
19+
1820
/**
1921
* @author David BRAQUART <david.braquart at rte-france.com>
2022
*/
@@ -60,7 +62,7 @@ public class NetworkVisualizationParamEntity {
6062
private String componentLibrary = "";
6163

6264
@Column(name = "nad_positions_generation_mode")
63-
private String nadPositionsGenerationMode = "GEOGRAPHICAL_COORDINATES";
65+
private String nadPositionsGenerationMode = GEOGRAPHICAL_COORDINATES.name();
6466

6567
@Column(name = "nad_positions_config_uuid")
6668
private UUID nadPositionsConfigUuid = null;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
*/
77
package org.gridsuite.studyconfig.server.mapper;
88

9-
import org.gridsuite.studyconfig.server.dto.MapParamInfos;
10-
import org.gridsuite.studyconfig.server.dto.NetworkAreaDiagramParamInfos;
11-
import org.gridsuite.studyconfig.server.dto.NetworkVisualizationParamInfos;
12-
import org.gridsuite.studyconfig.server.dto.SingleLineDiagramParamInfos;
9+
import org.gridsuite.studyconfig.server.dto.*;
1310
import org.gridsuite.studyconfig.server.entities.NetworkVisualizationParamEntity;
1411

1512
import java.util.UUID;
@@ -37,7 +34,7 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
3734
entity.getSubstationLayout(),
3835
entity.getComponentLibrary()
3936
),
40-
new NetworkAreaDiagramParamInfos(entity.getNadPositionsGenerationMode(), entity.getNadPositionsConfigUuid())
37+
new NetworkAreaDiagramParamInfos(NadPositionsGenerationMode.valueOf(entity.getNadPositionsGenerationMode()), entity.getNadPositionsConfigUuid())
4138
);
4239
}
4340

@@ -61,7 +58,7 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
6158
entity.setComponentLibrary(dto.singleLineDiagramParameters().componentLibrary());
6259
// NAD
6360
entity.setNadPositionsConfigUuid(dto.networkAreaDiagramParameters().nadPositionsConfigUuid());
64-
entity.setNadPositionsGenerationMode(dto.networkAreaDiagramParameters().nadPositionsGenerationMode());
61+
entity.setNadPositionsGenerationMode(dto.networkAreaDiagramParameters().nadPositionsGenerationMode().name());
6562
}
6663

6764
public static void updateNadPositionsConfigUuid(NetworkVisualizationParamEntity entity, UUID nadPositionsConfigUuid) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.UUID;
2525

2626
import static org.assertj.core.api.Assertions.assertThat;
27+
import static org.gridsuite.studyconfig.server.dto.NadPositionsGenerationMode.GEOGRAPHICAL_COORDINATES;
2728
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
2829
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
2930
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -35,7 +36,6 @@
3536
class NetworkVisualizationParamsIntegrationTest {
3637

3738
private static final String URI_NETWORK_VISUALIZATION_PARAM_BASE = "/v1/network-visualizations-params";
38-
private static final String GEOGRAPHICAL_COORDINATES = "GEOGRAPHICAL_COORDINATES";
3939

4040
@Autowired
4141
private MockMvc mockMvc;

0 commit comments

Comments
 (0)