Fix cyclic dependencies

Signed-off-by: Ayoub LABIDI <[email protected]>

Author: ayolab

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/StudyLayout.java

@@ -2,7 +2,6 @@
 
 import lombok.*;
 import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
-import org.gridsuite.studyconfig.server.entities.studylayout.StudyLayoutEntity;
 
 import java.util.List;
 
@@ -13,10 +12,4 @@
 @Getter
 public class StudyLayout {
     List<AbstractDiagramLayout> diagramLayoutParams;
-
-    public StudyLayoutEntity toEntity() {
-        return StudyLayoutEntity.builder()
-            .diagramGridLayoutEntityList(diagramLayoutParams.stream().map(AbstractDiagramLayout::toEntity).toList())
-            .build();
-    }
 }

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/AbstractDiagramLayout.java

@@ -7,7 +7,12 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.studyconfig.server.entities.studylayout.AbstractDiagramLayoutEntity;
+
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types.NadFromElementDiagramLayout;
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types.NetworkAreaDiagramLayout;
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types.SubstationDiagramLayout;
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types.VoltageLevelDiagramLayout;
+import org.gridsuite.studyconfig.server.dto.studylayout.grid.DiagramGridLayout;
 
 import java.util.Map;
 import java.util.UUID;
@@ -27,12 +32,10 @@
     @JsonSubTypes.Type(value = SubstationDiagramLayout.class, name = "substation"),
     @JsonSubTypes.Type(value = VoltageLevelDiagramLayout.class, name = "voltage-level"),
     @JsonSubTypes.Type(value = NetworkAreaDiagramLayout.class, name = "network-area-diagram"),
-    @JsonSubTypes.Type(value = NadFromElementDiagramLayout.class, name = "nad-from-element"),
+    @JsonSubTypes.Type(value = NadFromElementDiagramLayout.class, name = "nad-from-element")
 })
 public abstract class AbstractDiagramLayout {
     UUID diagramUuid;
 
     Map<String, DiagramGridLayout> gridLayout;
-
-    public abstract AbstractDiagramLayoutEntity toEntity();
 }

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/DiagramGridLayout.java

@@ -0,0 +1,22 @@
+package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+import java.util.UUID;
+
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
+
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class NadFromElementDiagramLayout extends AbstractDiagramLayout {
+    String elementName;
+    String elementType;
+    UUID elementUuid;
+}

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NadFromElementDiagramLayout.java

@@ -0,0 +1,21 @@
+package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
+
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class NetworkAreaDiagramLayout extends AbstractDiagramLayout {
+    List<String> voltageLevelIds;
+    Integer depth;
+}

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/NetworkAreaDiagramLayout.java

@@ -0,0 +1,18 @@
+package org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.types;
+
+import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@Setter
+@Getter
+public class SubstationDiagramLayout extends AbstractDiagramLayout {
+    String substationId;
+}