Rework

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

Author: ayolab

src/main/java/org/gridsuite/studyconfig/server/configuration/DiagramLayoutJacksonConfiguration.java

@@ -7,8 +7,9 @@
 package org.gridsuite.studyconfig.server.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
-import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayoutJsonMapper;
+
+import org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout.AbstractDiagramLayout;
+import org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout.AbstractDiagramLayoutJsonMapper;
 import org.springframework.context.annotation.Configuration;
 
 import jakarta.annotation.PostConstruct;

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

@@ -0,0 +1,64 @@
+/**
+ * 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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.gridsuite.studyconfig.server.StudyConfigApi;
+import org.gridsuite.studyconfig.server.dto.diagramgridlayout.DiagramGridLayout;
+import org.gridsuite.studyconfig.server.service.DiagramGridLayoutService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
+@RestController
+@RequestMapping(value = "/" + StudyConfigApi.API_VERSION + "/diagram-grid-layout")
+@RequiredArgsConstructor
+@Tag(name = "Diagram Grid Layout Config", description = "Diagram Grid Layout Configuration API")
+public class DiagramGridLayoutController {
+    private final DiagramGridLayoutService diagramGridLayoutService;
+
+    @PostMapping(consumes = APPLICATION_JSON_VALUE)
+    @Operation(summary = "Save diagram grid layout")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The newly created diagram grid layout UUID returned")})
+    public ResponseEntity<UUID> saveDiagramGridLayout(@RequestBody DiagramGridLayout diagramGridLayout) {
+        return ResponseEntity.ok().body(diagramGridLayoutService.saveDiagramGridLayout(diagramGridLayout));
+    }
+
+    @PutMapping(value = "/{id}", consumes = APPLICATION_JSON_VALUE)
+    @Operation(summary = "Update diagram grid layout")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The diagram grid layout has been updated")})
+    public ResponseEntity<Void> updateDiagramGridLayout(@PathVariable("id") UUID diagramGridLayoutUuid,
+                                                  @RequestBody DiagramGridLayout diagramGridLayout) {
+        diagramGridLayoutService.updateDiagramGridLayout(diagramGridLayoutUuid, diagramGridLayout);
+        return ResponseEntity.ok().build();
+    }
+
+    @GetMapping(value = "/{id}", produces = APPLICATION_JSON_VALUE)
+    @Operation(summary = "Get diagram grid layout")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The diagram grid layout is returned")})
+    public ResponseEntity<DiagramGridLayout> getDiagramGridLayout(
+        @PathVariable("id") UUID diagramGridLayoutUuid) {
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(diagramGridLayoutService.getByDiagramGridLayoutUuid(diagramGridLayoutUuid));
+    }
+
+    @DeleteMapping(value = "/{id}")
+    @Operation(summary = "Delete diagram grid layout")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The diagram grid layout is deleted")})
+    public ResponseEntity<DiagramGridLayout> deleteDiagramGridLayout(
+        @PathVariable("id") UUID diagramGridLayoutUuid) {
+        diagramGridLayoutService.deleteDiagramGridLayout(diagramGridLayoutUuid);
+        return ResponseEntity.ok().build();
+    }
+}

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

@@ -4,18 +4,19 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout;
 
 import lombok.*;
-import org.gridsuite.studyconfig.server.dto.studylayout.diagramlayout.AbstractDiagramLayout;
 
 import java.util.List;
 
+import org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout.AbstractDiagramLayout;
+
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Setter
 @Getter
-public class StudyLayout {
-    List<AbstractDiagramLayout> diagramLayoutParams;
+public class DiagramGridLayout {
+    List<AbstractDiagramLayout> diagramLayouts;
 }

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/StudyLayout.java renamed to src/main/java/org/gridsuite/studyconfig/server/dto/diagramgridlayout/DiagramGridLayout.java

@@ -4,7 +4,7 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -23,5 +23,5 @@
 public abstract class AbstractDiagramLayout {
     UUID diagramUuid;
 
-    Map<String, DiagramGridLayout> gridLayout;
+    Map<String, DiagramPosition> diagramPositions;
 }

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

@@ -4,7 +4,7 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/AbstractDiagramLayoutJsonMapper.java renamed to src/main/java/org/gridsuite/studyconfig/server/dto/diagramgridlayout/diagramlayout/AbstractDiagramLayoutJsonMapper.java

@@ -4,7 +4,7 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,7 +13,7 @@
 @Builder
 @AllArgsConstructor
 @Getter
-public class DiagramGridLayout {
+public class DiagramPosition {
     Integer w;
     Integer h;
     Integer x;

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/DiagramGridLayout.java renamed to src/main/java/org/gridsuite/studyconfig/server/dto/diagramgridlayout/diagramlayout/DiagramPosition.java

@@ -4,15 +4,14 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
-import java.util.List;
 import java.util.UUID;
 
 @SuperBuilder
@@ -21,10 +20,8 @@
 @Setter
 @Getter
 public class NetworkAreaDiagramLayout extends AbstractDiagramLayout {
+    UUID originalNadConfigUuid;
+    UUID currentNadConfigUuid;
     UUID filterUuid;
-    UUID nadConfigUuid;
-    List<String> voltageLevelIds;
-    List<String> voltageLevelToExpandIds;
-    List<String> voltageLevelToOmitIds;
-    Integer depth;
+    String name;
 }

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

@@ -4,7 +4,7 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/org/gridsuite/studyconfig/server/dto/studylayout/diagramlayout/SubstationDiagramLayout.java renamed to src/main/java/org/gridsuite/studyconfig/server/dto/diagramgridlayout/diagramlayout/SubstationDiagramLayout.java

@@ -4,7 +4,7 @@
  * 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;
+package org.gridsuite.studyconfig.server.dto.diagramgridlayout.diagramlayout;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;