Change the DB schema in order to add locationId.

Signed-off-by: AAJELLAL <[email protected]>

Author: AAJELLAL

pom.xml

@@ -13,13 +13,13 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>20</version>
+        <version>21</version>
         <relativePath/>
     </parent>
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-security-analysis-server</artifactId>
-    <version>2.12.0-SNAPSHOT</version>
+    <version>2.14.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Security analysis server</name>
@@ -42,14 +42,11 @@
     </developers>
 
     <properties>
-        <jib.from.image>powsybl/java-dynawo:2.1.0</jib.from.image>
-        <gridsuite-dependencies.version>35</gridsuite-dependencies.version>
+        <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
+        <gridsuite-dependencies.version>37.0.0</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
-        <!-- FIXME: powsybl-ws-commons modules'version is overloaded in the dependencies section
-        The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
-        <powsybl-ws-commons.version>1.17.0</powsybl-ws-commons.version>
     </properties>
 
     <build>
@@ -152,8 +149,6 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-ws-commons</artifactId>
-            <version>${powsybl-ws-commons.version}</version>
-
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -266,4 +261,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

src/main/java/org/gridsuite/securityanalysis/server/dto/LimitViolationDTO.java

@@ -26,6 +26,7 @@ public class LimitViolationDTO {
     private double limitReduction;
     private double value;
     private Double loading;
+    private String locationId;
 
     public static LimitViolationDTO toDto(AbstractLimitViolationEntity limitViolation) {
         return LimitViolationDTO.builder()
@@ -37,11 +38,13 @@ public static LimitViolationDTO toDto(AbstractLimitViolationEntity limitViolatio
             .limitReduction(limitViolation.getLimitReduction())
             .value(limitViolation.getValue())
             .loading(limitViolation.getLoading())
+            .locationId(limitViolation.getLocationId())
             .build();
     }
 
     public List<String> toCsvRow(Map<String, String> translations) {
         List<String> csvRow = new ArrayList<>();
+        csvRow.add(this.getLocationId());
         csvRow.add(this.getLimitType() != null ? CsvExportUtils.translate(this.getLimitType().name(), translations) : "");
         csvRow.add(CsvExportUtils.replaceNullWithEmptyString(CsvExportUtils.translate(this.getLimitName(), translations)));
         csvRow.add(Double.toString(this.getLimit()));

src/main/java/org/gridsuite/securityanalysis/server/dto/PreContingencyLimitViolationResultDTO.java

@@ -11,6 +11,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.FieldNameConstants;
 import org.gridsuite.securityanalysis.server.entities.PreContingencyLimitViolationEntity;
 
 import java.util.List;
@@ -21,30 +22,26 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@FieldNameConstants
 public class PreContingencyLimitViolationResultDTO {
 
     private String subjectId;
-    private String locationId;
     private String status;
     private LimitViolationDTO limitViolation;
 
     public static PreContingencyLimitViolationResultDTO toDto(PreContingencyLimitViolationEntity preContingencyLimitViolation) {
         String subjectId = preContingencyLimitViolation.getSubjectLimitViolation() != null
                 ? preContingencyLimitViolation.getSubjectLimitViolation().getSubjectId()
                 : null;
-        String locationId = preContingencyLimitViolation.getSubjectLimitViolation() != null
-                ? preContingencyLimitViolation.getSubjectLimitViolation().getLocationId()
-                : null;
         return PreContingencyLimitViolationResultDTO.builder()
                 .subjectId(subjectId)
-                .locationId(locationId)
                 .status(preContingencyLimitViolation.getResult().getPreContingencyStatus())
                 .limitViolation(LimitViolationDTO.toDto(preContingencyLimitViolation))
                 .build();
     }
 
     public List<String> toCsvRow(Map<String, String> translations) {
-        List<String> csvRow = List.of(this.getSubjectId());
+        List<String> csvRow = List.of();
 
         if (this.getLimitViolation() != null) {
             return Stream.concat(csvRow.stream(), this.getLimitViolation().toCsvRow(translations).stream()).toList();

src/main/java/org/gridsuite/securityanalysis/server/dto/SubjectLimitViolationDTO.java

@@ -21,22 +21,14 @@
 @Builder
 public class SubjectLimitViolationDTO {
     private String subjectId;
-    private String locationId;
-
     private LimitViolationDTO limitViolation;
 
     public static SubjectLimitViolationDTO toDto(ContingencyLimitViolationEntity limitViolation) {
         String subjectId = limitViolation.getSubjectLimitViolation() != null
             ? limitViolation.getSubjectLimitViolation().getSubjectId()
             : null;
-
-        String locationId = limitViolation.getSubjectLimitViolation() != null
-                ? limitViolation.getSubjectLimitViolation().getLocationId()
-                : null;
-
         return SubjectLimitViolationDTO.builder()
             .subjectId(subjectId)
-            .locationId(locationId)
             .limitViolation(LimitViolationDTO.toDto(limitViolation))
             .build();
     }

src/main/java/org/gridsuite/securityanalysis/server/dto/SubjectLimitViolationResultDTO.java

@@ -27,9 +27,6 @@
 @NoArgsConstructor
 public class SubjectLimitViolationResultDTO {
     private String subjectId;
-
-    private String locationId;
-
     private List<ContingencyLimitViolationDTO> contingencies;
 
     public static SubjectLimitViolationResultDTO toDto(SubjectLimitViolationEntity subjectLimitViolation) {
@@ -39,7 +36,6 @@ public static SubjectLimitViolationResultDTO toDto(SubjectLimitViolationEntity s
 
         return SubjectLimitViolationResultDTO.builder()
             .subjectId(subjectLimitViolation.getSubjectId())
-            .locationId(subjectLimitViolation.getLocationId())
             .contingencies(contingencies)
             .build();
     }

src/main/java/org/gridsuite/securityanalysis/server/entities/AbstractLimitViolationEntity.java

@@ -58,6 +58,9 @@ public abstract class AbstractLimitViolationEntity {
     @Column(name = "loading")
     private Double loading;
 
+    @Column
+    private String locationId;
+
     public static Double computeLoading(LimitViolation limitViolation) {
         return LimitViolationType.CURRENT.equals(limitViolation.getLimitType())
                 ? (100 * limitViolation.getValue()) / (limitViolation.getLimit() * limitViolation.getLimitReduction())

src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyEntity.java

@@ -42,7 +42,6 @@ public ContingencyEntity(String contingencyId, String status, List<ContingencyEl
     private UUID uuid;
 
     private String contingencyId;
-
     @Setter
     @ManyToOne(fetch = FetchType.LAZY)
     private SecurityAnalysisResultEntity result;

src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java

@@ -33,7 +33,6 @@ public class ContingencyLimitViolationEntity extends AbstractLimitViolationEntit
     private ContingencyEntity contingency;
 
     public static ContingencyLimitViolationEntity toEntity(Network network, LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolation) {
-        subjectLimitViolation.setLocationId(ComputationResultUtils.getViolationLocationId(limitViolation, network));
         ContingencyLimitViolationEntity contingencyLimitViolationEntity = ContingencyLimitViolationEntity.builder()
             .limit(limitViolation.getLimit())
             .limitName(limitViolation.getLimitName())
@@ -43,6 +42,7 @@ public static ContingencyLimitViolationEntity toEntity(Network network, LimitVio
             .value(limitViolation.getValue())
             .side(limitViolation.getSide())
             .loading(computeLoading(limitViolation))
+            .locationId(ComputationResultUtils.getViolationLocationId(limitViolation, network))
             .subjectLimitViolation(subjectLimitViolation)
             .build();
 

src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java

@@ -10,10 +10,7 @@
 import com.powsybl.security.LimitViolation;
 import com.powsybl.security.results.PreContingencyResult;
 import com.powsybl.ws.commons.computation.utils.ComputationResultUtils;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -37,7 +34,6 @@
 @FieldNameConstants
 @Table(name = "pre_contingency_limit_violation")
 public class PreContingencyLimitViolationEntity extends AbstractLimitViolationEntity {
-
     @ManyToOne(fetch = FetchType.LAZY)
     @Setter
     SecurityAnalysisResultEntity result;
@@ -47,7 +43,6 @@ public static List<PreContingencyLimitViolationEntity> toEntityList(Network netw
     }
 
     public static PreContingencyLimitViolationEntity toEntity(Network network, LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolation) {
-        subjectLimitViolation.setLocationId(ComputationResultUtils.getViolationLocationId(limitViolation, network));
         return PreContingencyLimitViolationEntity.builder()
             .subjectLimitViolation(subjectLimitViolation)
             .limit(limitViolation.getLimit())
@@ -58,6 +53,7 @@ public static PreContingencyLimitViolationEntity toEntity(Network network, Limit
             .value(limitViolation.getValue())
             .side(limitViolation.getSide())
             .loading(computeLoading(limitViolation))
+            .locationId(ComputationResultUtils.getViolationLocationId(limitViolation, network))
             .build();
     }
 }

src/main/java/org/gridsuite/securityanalysis/server/entities/SubjectLimitViolationEntity.java

@@ -39,11 +39,6 @@ public SubjectLimitViolationEntity(String subjectId, String subjectName) {
 
     private String subjectName;
 
-    @Column
-    @Setter
-    @Getter
-    private String locationId;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @Setter
     @Getter