Remove useless NadFromElement and add attributes to NetworkAreaDiagram

ayolab · ayolab · commit d627aed3c94a · 2025-07-18T00:16:44.000+02:00
Signed-off-by: Ayoub LABIDI &lt;ayoub.labidi@protonmail.com&gt;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/configuration/DiagramLayoutJacksonConfiguration.java b/src/main/java/org/gridsuite/studyconfig/server/configuration/DiagramLayoutJacksonConfiguration.java
@@ -1,15 +1,14 @@
-/*
-  Copyright (c) 2024, RTE (http://www.rte-france.com)
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package org.gridsuite.studyconfig.server.configuration;
 
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.NadFromElementDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.NetworkAreaDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.SubstationDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.VoltageLevelDiagramLayout;
@@ -33,8 +32,7 @@ public Module diagramLayoutTypeModule() {
         module.registerSubtypes(
             new NamedType(SubstationDiagramLayout.class, "substation"),
             new NamedType(VoltageLevelDiagramLayout.class, "voltage-level"),
-            new NamedType(NetworkAreaDiagramLayout.class, "network-area-diagram"),
-            new NamedType(NadFromElementDiagramLayout.class, "nad-from-element")
+            new NamedType(NetworkAreaDiagramLayout.class, "network-area-diagram")
         );
 
         return module;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/controller/StudyLayoutController.java b/src/main/java/org/gridsuite/studyconfig/server/controller/StudyLayoutController.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/StudyLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/StudyLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout;
 
 import lombok.*;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/AbstractDiagramLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/AbstractDiagramLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/DiagramGridLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/DiagramGridLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NadFromElementDiagramLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NadFromElementDiagramLayout.java
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NetworkAreaDiagramLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NetworkAreaDiagramLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
@@ -7,13 +13,18 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import java.util.UUID;
 
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
 @Setter
 @Getter
 public class NetworkAreaDiagramLayout extends AbstractDiagramLayout {
+    UUID filterUuid;
+    UUID nadConfigUuid;
     List<String> voltageLevelIds;
+    List<String> voltageLevelToExpandIds;
+    List<String> voltageLevelToOmitIds;
     Integer depth;
 }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/SubstationDiagramLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/SubstationDiagramLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/VoltageLevelDiagramLayout.java b/src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/VoltageLevelDiagramLayout.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/AbstractDiagramLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/AbstractDiagramLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.*;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/DiagramGridLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/DiagramGridLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.Embeddable;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/NadFromElementDiagramLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/NadFromElementDiagramLayoutEntity.java
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/NetworkAreaDiagramLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/NetworkAreaDiagramLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.*;
@@ -7,6 +13,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import java.util.UUID;
 
 @Entity
 @SuperBuilder
@@ -15,13 +22,36 @@
 @Getter
 @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "fk_network_area_diagram_layout_abstract"))
 public class NetworkAreaDiagramLayoutEntity extends AbstractDiagramLayoutEntity {
-    @ElementCollection(fetch = FetchType.EAGER)
+    @Column(name = "filter_uuid")
+    UUID filterUuid;
+
+    @Column(name = "nad_config_uuid")
+    UUID nadConfigUuid;
+
+    @ElementCollection
     @CollectionTable(
         name = "network_area_diagram_voltage_level_ids",
         joinColumns = @JoinColumn(name = "network_area_diagram_layout_id"),
         foreignKey = @ForeignKey(name = "fk_network_area_diagram_voltage_level_ids")
     )
     List<String> voltageLevelIds;
 
+    @ElementCollection
+    @CollectionTable(
+        name = "network_area_diagram_voltage_level_to_expand_ids",
+        joinColumns = @JoinColumn(name = "network_area_diagram_layout_id"),
+        foreignKey = @ForeignKey(name = "fk_network_area_diagram_voltage_level_to_expand_ids")
+    )
+    List<String> voltageLevelToExpandIds;
+
+    @ElementCollection
+    @CollectionTable(
+        name = "network_area_diagram_voltage_level_to_omit_ids",
+        joinColumns = @JoinColumn(name = "network_area_diagram_layout_id"),
+        foreignKey = @ForeignKey(name = "fk_network_area_diagram_voltage_level_to_omit_ids")
+    )
+    List<String> voltageLevelToOmitIds;
+
+    @Column(name = "depth")
     Integer depth;
 }
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/StudyLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/StudyLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.*;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/StudyLayoutRepository.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/StudyLayoutRepository.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/SubstationDiagramLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/SubstationDiagramLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.*;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/VoltageLevelLayoutEntity.java b/src/main/java/org/gridsuite/studyconfig/server/entities/studylayout/VoltageLevelLayoutEntity.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.entities.studylayout;
 
 import jakarta.persistence.*;
diff --git a/src/main/java/org/gridsuite/studyconfig/server/mapper/StudyLayoutMapper.java b/src/main/java/org/gridsuite/studyconfig/server/mapper/StudyLayoutMapper.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2024, RTE (http://www.rte-france.com)
+  Copyright (c) 2025, RTE (http://www.rte-france.com)
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -9,13 +9,11 @@
 import org.gridsuite.studyconfig.server.dto.studylayout.StudyLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.DiagramGridLayout;
-import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.NadFromElementDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.NetworkAreaDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.SubstationDiagramLayout;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.VoltageLevelDiagramLayout;
 import org.gridsuite.studyconfig.server.entities.studylayout.AbstractDiagramLayoutEntity;
 import org.gridsuite.studyconfig.server.entities.studylayout.DiagramGridLayoutEntity;
-import org.gridsuite.studyconfig.server.entities.studylayout.NadFromElementDiagramLayoutEntity;
 import org.gridsuite.studyconfig.server.entities.studylayout.NetworkAreaDiagramLayoutEntity;
 import org.gridsuite.studyconfig.server.entities.studylayout.StudyLayoutEntity;
 import org.gridsuite.studyconfig.server.entities.studylayout.SubstationDiagramLayoutEntity;
@@ -27,15 +25,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * Mapper for conversion between StudyLayout DTOs and Entities
- *
- * @author Generated based on StudyLayoutConversionService
- */
 public final class StudyLayoutMapper {
 
     private StudyLayoutMapper() {
-        // Private constructor to prevent instantiation
     }
 
     public static StudyLayoutEntity toEntity(StudyLayout dto) {
@@ -68,17 +60,14 @@ public static AbstractDiagramLayoutEntity toDiagramLayoutEntity(AbstractDiagramL
                     .build();
             case NetworkAreaDiagramLayout n -> NetworkAreaDiagramLayoutEntity.builder()
                     .diagramUuid(n.getDiagramUuid())
+                    .filterUuid(n.getFilterUuid())
+                    .nadConfigUuid(n.getNadConfigUuid())
                     .voltageLevelIds(n.getVoltageLevelIds())
+                    .voltageLevelToExpandIds(n.getVoltageLevelToExpandIds())
+                    .voltageLevelToOmitIds(n.getVoltageLevelToOmitIds())
                     .depth(n.getDepth())
                     .gridLayout(convertGridLayoutMap(n.getGridLayout(), StudyLayoutMapper::toGridLayoutEntity))
                     .build();
-            case NadFromElementDiagramLayout nad -> NadFromElementDiagramLayoutEntity.builder()
-                    .diagramUuid(nad.getDiagramUuid())
-                    .elementName(nad.getElementName())
-                    .elementType(nad.getElementType())
-                    .elementUuid(nad.getElementUuid())
-                    .gridLayout(convertGridLayoutMap(nad.getGridLayout(), StudyLayoutMapper::toGridLayoutEntity))
-                    .build();
             case null -> null;
             default -> throw new IllegalArgumentException("Unknown diagram layout DTO type: " + dto.getClass());
         };
@@ -98,17 +87,14 @@ public static AbstractDiagramLayout toDiagramLayoutDto(AbstractDiagramLayoutEnti
                     .build();
             case NetworkAreaDiagramLayoutEntity n -> NetworkAreaDiagramLayout.builder()
                     .diagramUuid(n.getDiagramUuid())
-                    .voltageLevelIds(n.getVoltageLevelIds())
+                    .filterUuid(n.getFilterUuid())
+                    .nadConfigUuid(n.getNadConfigUuid())
+                    .voltageLevelIds(n.getVoltageLevelIds() != null ? List.copyOf(n.getVoltageLevelIds()) : null)
+                    .voltageLevelToExpandIds(n.getVoltageLevelToExpandIds() != null ? List.copyOf(n.getVoltageLevelToExpandIds()) : null)
+                    .voltageLevelToOmitIds(n.getVoltageLevelToOmitIds() != null ? List.copyOf(n.getVoltageLevelToOmitIds()) : null)
                     .depth(n.getDepth())
                     .gridLayout(convertGridLayoutMap(n.getGridLayout(), StudyLayoutMapper::toGridLayoutDto))
                     .build();
-            case NadFromElementDiagramLayoutEntity nad -> NadFromElementDiagramLayout.builder()
-                    .diagramUuid(nad.getDiagramUuid())
-                    .elementName(nad.getElementName())
-                    .elementType(nad.getElementType())
-                    .elementUuid(nad.getElementUuid())
-                    .gridLayout(convertGridLayoutMap(nad.getGridLayout(), StudyLayoutMapper::toGridLayoutDto))
-                    .build();
             case null -> null;
             default -> throw new IllegalArgumentException("Unknown diagram layout entity type: " + entity.getClass());
         };
diff --git a/src/main/java/org/gridsuite/studyconfig/server/service/StudyLayoutService.java b/src/main/java/org/gridsuite/studyconfig/server/service/StudyLayoutService.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.gridsuite.studyconfig.server.service;
 
 import jakarta.persistence.EntityNotFoundException;
diff --git a/src/main/resources/db/changelog/changesets/changelog_20250717T215546Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250717T215546Z.xml
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
diff --git a/src/test/java/org/gridsuite/studyconfig/server/StudyLayoutControllerTest.java b/src/test/java/org/gridsuite/studyconfig/server/StudyLayoutControllerTest.java
