resolve conflicts

Signed-off-by: maissa SOUISSI <maissa.souissi@rte-france.com>
gridsuite · Jan 29, 2024 · 88627f0 · 88627f0
2 parents 67e1eaa + 2d7600c
commit 88627f0
Show file tree

Hide file tree

Showing 45 changed files with 618 additions and 148 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/BranchModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BranchModificationInfos.java
@@ -35,4 +35,9 @@ public class BranchModificationInfos extends BasicEquipmentModificationInfos {
     @Schema(description = "Current limits Side 2")
     private CurrentLimitsModificationInfos currentLimits2;
 
+    @Schema(description = "Connected 1")
+    private AttributeModification<Boolean> connected1;
+
+    @Schema(description = "Connected 2")
+    private AttributeModification<Boolean> connected2;
 }
diff --git a/src/main/java/org/gridsuite/modification/server/dto/InjectionModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/InjectionModificationInfos.java
@@ -28,4 +28,7 @@ public class InjectionModificationInfos extends BasicEquipmentModificationInfos
 
     @Schema(description = "Bus id modification")
     private AttributeModification<String> busOrBusbarSectionId;
+
+    @Schema(description = "Connected")
+    private AttributeModification<Boolean> connected;
 }
diff --git a/src/main/java/org/gridsuite/modification/server/dto/LoadCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/LoadCreationInfos.java
@@ -38,10 +38,10 @@ public class LoadCreationInfos extends InjectionCreationInfos {
     private LoadType loadType;
 
     @Schema(description = "Active power")
-    private double activePower;
+    private double p0;
 
     @Schema(description = "Reactive power")
-    private double reactivePower;
+    private double q0;
 
     @Override
     public LoadCreationEntity toEntity() {

diff --git a/src/main/java/org/gridsuite/modification/server/dto/LoadModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/LoadModificationInfos.java
@@ -36,10 +36,10 @@ public class LoadModificationInfos extends InjectionModificationInfos {
     private AttributeModification<LoadType> loadType;
 
     @Schema(description = "Active power modification")
-    private AttributeModification<Double> constantActivePower;
+    private AttributeModification<Double> p0;
 
     @Schema(description = "Reactive power modification")
-    private AttributeModification<Double> constantReactivePower;
+    private AttributeModification<Double> q0;
 
     @Override
     public LoadModificationEntity toEntity() {

diff --git a/src/main/java/org/gridsuite/modification/server/dto/ShuntCompensatorModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ShuntCompensatorModificationInfos.java
@@ -33,7 +33,7 @@
 @Schema(description = "Shunt compensator modification")
 @JsonTypeName("SHUNT_COMPENSATOR_MODIFICATION")
 @ModificationErrorTypeName("MODIFY_SHUNT_COMPENSATOR_ERROR")
-public class ShuntCompensatorModificationInfos extends BasicEquipmentModificationInfos {
+public class ShuntCompensatorModificationInfos extends InjectionModificationInfos {
 
     @Schema(description = "Maximum number of sections")
     private AttributeModification<Integer> maximumSectionCount;

diff --git a/...ava/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java b/...ava/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java
@@ -14,6 +14,8 @@
 import org.gridsuite.modification.server.dto.ModificationInfos;
 
 import jakarta.persistence.*;
+import org.gridsuite.modification.server.entities.equipment.modification.FreePropertyEntity;
+import org.springframework.util.CollectionUtils;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -27,11 +29,11 @@ public class LoadCreationEntity extends InjectionCreationEntity {
     @Column(name = "loadType")
     private LoadType loadType;
 
-    @Column(name = "activePower")
-    private double activePower;
+    @Column(name = "p0")
+    private double p0;
 
-    @Column(name = "reactivePower")
-    private double reactivePower;
+    @Column(name = "q0")
+    private double q0;
 
     public LoadCreationEntity(@NonNull LoadCreationInfos loadCreationInfos) {
         super(loadCreationInfos);
@@ -46,8 +48,8 @@ public void update(@NonNull ModificationInfos modificationInfos) {
 
     private void assignAttributes(LoadCreationInfos loadCreationInfos) {
         loadType = loadCreationInfos.getLoadType();
-        activePower = loadCreationInfos.getActivePower();
-        reactivePower = loadCreationInfos.getReactivePower();
+        p0 = loadCreationInfos.getP0();
+        q0 = loadCreationInfos.getQ0();
     }
 
     @Override
@@ -72,7 +74,12 @@ public LoadCreationInfos toModificationInfos() {
             .connected(isConnected())
             // load
             .loadType(getLoadType())
-            .activePower(getActivePower())
-            .reactivePower(getReactivePower());
+            .p0(getP0())
+            .q0(getQ0())
+            // properties
+            .properties(CollectionUtils.isEmpty(getProperties()) ? null :
+                getProperties().stream()
+                    .map(FreePropertyEntity::toInfos)
+                    .toList());
     }
 }
diff --git a/...dsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java b/...dsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java
@@ -137,6 +137,7 @@ public BatteryModificationInfos toModificationInfos() {
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))
                 .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp()))
+                .connected(toAttributeModification(getConnected()))
                 .activePowerSetpoint(toAttributeModification(getActivePowerSetpoint()))
                 .maxActivePower(toAttributeModification(getMaxActivePower()))
                 .minActivePower(toAttributeModification(getMinActivePower()))

diff --git a/...idsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/...idsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
@@ -10,6 +10,7 @@
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.server.dto.BranchModificationInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
+import org.gridsuite.modification.server.entities.equipment.modification.attribute.BooleanModificationEmbedded;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.DoubleModificationEmbedded;
 
 import jakarta.persistence.*;
@@ -52,6 +53,20 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
         ), nullable = true)
     private CurrentLimitsModificationEntity currentLimits2;
 
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "connected1")),
+        @AttributeOverride(name = "opType", column = @Column(name = "connected1Op"))
+    })
+    private BooleanModificationEmbedded connected1;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "connected2")),
+        @AttributeOverride(name = "opType", column = @Column(name = "connected2Op"))
+    })
+    private BooleanModificationEmbedded connected2;
+
     protected BranchModificationEntity(BranchModificationInfos branchModificationInfos) {
         super(branchModificationInfos);
         assignAttributes(branchModificationInfos);
@@ -77,5 +92,7 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
         } else {
             currentLimits2 = branchModificationInfos.getCurrentLimits2().toEntity();
         }
+        this.connected1 = branchModificationInfos.getConnected1() != null ? new BooleanModificationEmbedded(branchModificationInfos.getConnected1()) : null;
+        this.connected2 = branchModificationInfos.getConnected2() != null ? new BooleanModificationEmbedded(branchModificationInfos.getConnected2()) : null;
     }
 }
diff --git a/...uite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java b/...uite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java
@@ -275,6 +275,7 @@ public GeneratorModificationInfos toModificationInfos() {
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))
                 .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp()))
+                .connected(toAttributeModification(getConnected()))
                 .energySource(toAttributeModification(getEnergySource()))
                 .activePowerSetpoint(toAttributeModification(getActivePowerSetpoint()))
                 .maxActivePower(toAttributeModification(getMaxActivePower()))

diff --git a/...uite/modification/server/entities/equipment/modification/InjectionModificationEntity.java b/...uite/modification/server/entities/equipment/modification/InjectionModificationEntity.java
@@ -6,16 +6,19 @@
  */
 package org.gridsuite.modification.server.entities.equipment.modification;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.server.dto.InjectionModificationInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.OperationType;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.MappedSuperclass;
+import org.gridsuite.modification.server.entities.equipment.modification.attribute.BooleanModificationEmbedded;
 
 /**
  * @author Nicolas Noir <nicolas.noir at rte-france.com>
@@ -38,6 +41,13 @@ public class InjectionModificationEntity extends BasicEquipmentModificationEntit
     @Enumerated(EnumType.STRING)
     private OperationType busOrBusbarSectionIdOp;
 
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "connected")),
+        @AttributeOverride(name = "opType", column = @Column(name = "connectedOp"))
+    })
+    private BooleanModificationEmbedded connected;
+
     protected InjectionModificationEntity(InjectionModificationInfos modificationInfos) {
         super(modificationInfos);
         assignAttributes(modificationInfos);
@@ -54,5 +64,6 @@ private void assignAttributes(InjectionModificationInfos modificationInfos) {
         this.voltageLevelIdOp = modificationInfos.getVoltageLevelId() != null ? modificationInfos.getVoltageLevelId().getOp() : null;
         this.busOrBusbarSectionIdValue = modificationInfos.getBusOrBusbarSectionId() != null ? modificationInfos.getBusOrBusbarSectionId().getValue() : null;
         this.busOrBusbarSectionIdOp = modificationInfos.getBusOrBusbarSectionId() != null ? modificationInfos.getBusOrBusbarSectionId().getOp() : null;
+        this.connected = modificationInfos.getConnected() != null ? new BooleanModificationEmbedded(modificationInfos.getConnected()) : null;
     }
 }
diff --git a/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java
@@ -86,6 +86,8 @@ public LineModificationInfos toModificationInfos() {
             .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
+            .connected1(toAttributeModification(getConnected1()))
+            .connected2(toAttributeModification(getConnected2()))
             .r(toAttributeModification(getR()))
             .x(toAttributeModification(getX()))
             .g1(toAttributeModification(getG1()))

diff --git a/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java
@@ -16,6 +16,9 @@
 import org.gridsuite.modification.server.dto.OperationType;
 
 import jakarta.persistence.*;
+import org.springframework.util.CollectionUtils;
+
+import static org.gridsuite.modification.server.entities.equipment.modification.attribute.IAttributeModificationEmbeddable.toAttributeModification;
 
 /**
  * @author Nicolas Noir <nicolas.noir at rte-france.com>
@@ -33,19 +36,19 @@ public class LoadModificationEntity extends InjectionModificationEntity {
     @Enumerated(EnumType.STRING)
     private OperationType loadTypeOp;
 
-    @Column(name = "activePowerValue")
-    private Double activePowerValue;
+    @Column(name = "p0_value")
+    private Double p0Value;
 
-    @Column(name = "activePowerOp")
+    @Column(name = "p0_op")
     @Enumerated(EnumType.STRING)
-    private OperationType activePowerOp;
+    private OperationType p0Op;
 
-    @Column(name = "reactivePowerValue")
-    private Double reactivePowerValue;
+    @Column(name = "q0_value")
+    private Double q0Value;
 
-    @Column(name = "reactivePowerOp")
+    @Column(name = "q0_Op")
     @Enumerated(EnumType.STRING)
-    private OperationType reactivePowerOp;
+    private OperationType q0Op;
 
     public LoadModificationEntity(@NonNull LoadModificationInfos loadModificationInfos) {
         super(loadModificationInfos);
@@ -61,10 +64,10 @@ public void update(@NonNull ModificationInfos modificationInfos) {
     private void assignAttributes(LoadModificationInfos loadModificationInfos) {
         this.loadTypeValue = loadModificationInfos.getLoadType() != null ? loadModificationInfos.getLoadType().getValue() : null;
         this.loadTypeOp = loadModificationInfos.getLoadType() != null ? loadModificationInfos.getLoadType().getOp() : null;
-        this.activePowerValue = loadModificationInfos.getConstantActivePower() != null ? loadModificationInfos.getConstantActivePower().getValue() : null;
-        this.activePowerOp = loadModificationInfos.getConstantActivePower() != null ? loadModificationInfos.getConstantActivePower().getOp() : null;
-        this.reactivePowerValue = loadModificationInfos.getConstantReactivePower() != null ? loadModificationInfos.getConstantReactivePower().getValue() : null;
-        this.reactivePowerOp = loadModificationInfos.getConstantReactivePower() != null ? loadModificationInfos.getConstantReactivePower().getOp() : null;
+        this.p0Value = loadModificationInfos.getP0() != null ? loadModificationInfos.getP0().getValue() : null;
+        this.p0Op = loadModificationInfos.getP0() != null ? loadModificationInfos.getP0().getOp() : null;
+        this.q0Value = loadModificationInfos.getQ0() != null ? loadModificationInfos.getQ0().getValue() : null;
+        this.q0Op = loadModificationInfos.getQ0() != null ? loadModificationInfos.getQ0().getOp() : null;
     }
 
     @Override
@@ -82,8 +85,14 @@ public LoadModificationInfos toModificationInfos() {
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))
                 .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp()))
+                .connected(toAttributeModification(getConnected()))
                 .loadType(AttributeModification.toAttributeModification(getLoadTypeValue(), getLoadTypeOp()))
-                .constantActivePower(AttributeModification.toAttributeModification(getActivePowerValue(), getActivePowerOp()))
-                .constantReactivePower(AttributeModification.toAttributeModification(getReactivePowerValue(), getReactivePowerOp()));
+                .p0(AttributeModification.toAttributeModification(getP0Value(), getP0Op()))
+                .q0(AttributeModification.toAttributeModification(getQ0Value(), getQ0Op()))
+                // properties
+                .properties(CollectionUtils.isEmpty(getProperties()) ? null :
+                    getProperties().stream()
+                        .map(FreePropertyEntity::toInfos)
+                        .toList());
     }
 }
diff --git a/...dification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java b/...dification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java
@@ -10,11 +10,13 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
+import org.gridsuite.modification.server.dto.AttributeModification;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.dto.ShuntCompensatorModificationInfos;
 import org.gridsuite.modification.server.dto.ShuntCompensatorType;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.DoubleModificationEmbedded;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.EnumModificationEmbedded;
+import org.gridsuite.modification.server.entities.equipment.modification.attribute.IAttributeModificationEmbeddable;
 import org.gridsuite.modification.server.entities.equipment.modification.attribute.IntegerModificationEmbedded;
 
 import jakarta.persistence.AttributeOverride;
@@ -34,7 +36,7 @@
 @Getter
 @Entity
 @Table(name = "shuntCompensatorModification")
-public class ShuntCompensatorModificationEntity extends BasicEquipmentModificationEntity {
+public class ShuntCompensatorModificationEntity extends InjectionModificationEntity {
 
     @Embedded
     @AttributeOverrides(value = {
@@ -103,6 +105,9 @@ public ShuntCompensatorModificationInfos toModificationInfos() {
                 .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
+                .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))
+                .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp()))
+                .connected(IAttributeModificationEmbeddable.toAttributeModification(getConnected()))
                 .shuntCompensatorType(toAttributeModification(getShuntCompensatorType()))
                 .maxQAtNominalV(toAttributeModification(getMaxQAtNominalV()))
                 .maxSusceptance(toAttributeModification(getMaxSusceptance()))

diff --git a/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
@@ -24,6 +24,8 @@
 
 import jakarta.persistence.*;
 
+import static org.gridsuite.modification.server.entities.equipment.modification.attribute.IAttributeModificationEmbeddable.toAttributeModification;
+
 /**
  * @author Florent MILLOT <florent.millot at rte-france.com>
  */
@@ -351,6 +353,8 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
                 .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
+                .connected1(toAttributeModification(getConnected1()))
+                .connected2(toAttributeModification(getConnected2()))
                 .r(AttributeModification.toAttributeModification(getR()))
                 .x(AttributeModification.toAttributeModification(getX()))
                 .g(AttributeModification.toAttributeModification(getG()))

diff --git a/...main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java b/...main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java
@@ -76,6 +76,20 @@ protected void modifyBranch(Branch<?> branch, BranchModificationInfos branchModi
             ModificationUtils.getInstance().reportModifications(limitsReporter, side2LimitsReports, "side2LimitsModification",
                     "    Side 2");
         }
+        if (branchModificationInfos.getConnected1() != null) {
+            updateConnection(branch, Branch.Side.ONE, modificationInfos.getConnected1().getValue());
+        }
+        if (branchModificationInfos.getConnected2() != null) {
+            updateConnection(branch, Branch.Side.TWO, modificationInfos.getConnected2().getValue());
+        }
+    }
+
+    private void updateConnection(Branch<?> branch, Branch.Side side, Boolean connectionChange) {
+        if (branch.getTerminal(side).isConnected() && Boolean.FALSE.equals(connectionChange)) {
+            branch.getTerminal(side).disconnect();
+        } else if (!branch.getTerminal(side).isConnected() && Boolean.TRUE.equals(connectionChange)) {
+            branch.getTerminal(side).connect();
+        }
     }
 
     protected void modifyCurrentLimits(CurrentLimitsModificationInfos currentLimitsInfos, CurrentLimitsAdder limitsAdder, CurrentLimits currentLimits, List<Report> limitsReports) {

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java b/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java
@@ -92,6 +92,7 @@ private void modifyBattery(Battery battery, BatteryModificationInfos modificatio
 
         modifyBatteryLimitsAttributes(modificationInfos, battery, subReporter);
         modifyBatterySetpointsAttributes(modificationInfos, battery, subReporter);
+        ModificationUtils.getInstance().modifyInjectionConnection(modificationInfos, battery);
     }
 
     private void modifyBatterySetpointsAttributes(BatteryModificationInfos modificationInfos,