Merge branch 'main' into applytoolongtransactionmini

Author: jonenst

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-network-modification-server</artifactId>
-    <version>2.24.0-SNAPSHOT</version>
+    <version>2.25.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Network modification server</name>
@@ -52,7 +52,9 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
         <!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
-        <network-modification.version>0.37.0</network-modification.version>
+        <network-modification.version>0.42.0</network-modification.version>
+        <!-- FIXME: powsybl-network-store 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-network-store.version>1.31.0</powsybl-network-store.version>
         <powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
     </properties>
 
@@ -96,6 +98,24 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-model</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-iidm-impl</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-client</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.powsybl</groupId>
@@ -207,11 +227,6 @@
             <artifactId>powsybl-open-loadflow</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-config-classic</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

src/main/java/org/gridsuite/modification/server/dto/catalog/LineTypeInfos.java

@@ -67,6 +67,6 @@ public class LineTypeInfos {
 
     @JsonIgnore
     public LineTypeEntity toEntity() {
-        throw new UnsupportedOperationException("TODO");
+        throw new UnsupportedOperationException("toEntity() should be implemented in subclasses");
     }
 }

src/main/java/org/gridsuite/modification/server/elasticsearch/EquipmentInfosService.java

@@ -7,6 +7,7 @@
 package org.gridsuite.modification.server.elasticsearch;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.powsybl.iidm.network.IdentifiableType;
 import org.gridsuite.modification.server.dto.elasticsearch.EquipmentInfos;
 import org.gridsuite.modification.server.dto.elasticsearch.TombstonedEquipmentInfos;
@@ -38,7 +39,7 @@ public class EquipmentInfosService {
     @Value("${spring.data.elasticsearch.partition-size-for-deletion:2048}")
     public int partitionSizeForDeletion;
 
-    private static final Set<IdentifiableType> TYPES_FOR_INDEXING = Set.of(
+    private static final Set<IdentifiableType> TYPES_FOR_EQUIPMENT_INDEXING = Set.of(
             IdentifiableType.SUBSTATION,
             IdentifiableType.VOLTAGE_LEVEL,
             IdentifiableType.HVDC_LINE,
@@ -53,8 +54,16 @@ public class EquipmentInfosService {
             IdentifiableType.STATIC_VAR_COMPENSATOR,
             IdentifiableType.HVDC_CONVERTER_STATION);
 
+    private static final Set<IdentifiableType> TYPES_FOR_MODIFICATION_INDEXING = Sets.union(
+        TYPES_FOR_EQUIPMENT_INDEXING,
+        Set.of(IdentifiableType.SWITCH, IdentifiableType.BUSBAR_SECTION));
+
     public static Set<IdentifiableType> getIndexedEquipmentTypes() {
-        return TYPES_FOR_INDEXING;
+        return TYPES_FOR_EQUIPMENT_INDEXING;
+    }
+
+    public static Set<IdentifiableType> getIndexedEquipmentTypesInModification() {
+        return TYPES_FOR_MODIFICATION_INDEXING;
     }
 
     public EquipmentInfosService(EquipmentInfosRepository equipmentInfosRepository, TombstonedEquipmentInfosRepository tombstonedEquipmentInfosRepository) {

src/main/java/org/gridsuite/modification/server/entities/EntityRegistry.java

@@ -74,6 +74,7 @@ private EntityRegistry() {
         register(VoltageLevelTopologyModificationInfos.class, VoltageLevelTopologyModificationEntity.class);
         register(CreateCouplingDeviceInfos.class, CreateCouplingDeviceEntity.class);
         register(CreateVoltageLevelTopologyInfos.class, CreateVoltageLevelTopologyEntity.class);
+        register(MoveVoltageLevelFeederBaysInfos.class, MoveVoltageLevelFeederBaysEntity.class);
 
         // // attatching and splitting
         register(LineAttachToVoltageLevelInfos.class, LineAttachToVoltageLevelEntity.class);

src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java

@@ -61,6 +61,12 @@ public class BatteryCreationEntity extends InjectionCreationEntity {
     @Column(name = "droop")
     private Float droop;
 
+    @Column(name = "directTransX")
+    private Double directTransX;
+
+    @Column(name = "stepUpTransformerX")
+    private Double stepUpTransformerX;
+
     public BatteryCreationEntity(@NonNull BatteryCreationInfos batteryCreationInfos) {
         super(batteryCreationInfos);
         assignAttributes(batteryCreationInfos);
@@ -83,6 +89,8 @@ private void assignAttributes(BatteryCreationInfos batteryCreationInfos) {
         this.targetQ = batteryCreationInfos.getTargetQ();
         this.participate = batteryCreationInfos.getParticipate();
         this.droop = batteryCreationInfos.getDroop();
+        this.directTransX = batteryCreationInfos.getDirectTransX();
+        this.stepUpTransformerX = batteryCreationInfos.getStepUpTransformerX();
     }
 
     @Override
@@ -117,6 +125,8 @@ public BatteryCreationInfos toModificationInfos() {
                 .targetQ(getTargetQ())
                 .participate(getParticipate())
                 .droop(getDroop())
+                .directTransX(getDirectTransX())
+                .stepUpTransformerX(getStepUpTransformerX())
                 // properties
                 .properties(CollectionUtils.isEmpty(getProperties()) ? null :
                         getProperties().stream()

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java

@@ -63,6 +63,16 @@ public class BatteryModificationEntity extends InjectionModificationEntity {
     })
     private FloatModificationEmbedded droop;
 
+    @Embedded
+    @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "directTransX")), @AttributeOverride(name = "opType", column = @Column(name = "directTransxOp"))
+    })
+    private DoubleModificationEmbedded directTransX;
+
+    @Embedded
+    @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "stepUpTransformerX")), @AttributeOverride(name = "opType", column = @Column(name = "stepUpTransformerxOp"))
+    })
+    private DoubleModificationEmbedded stepUpTransformerX;
+
     @Embedded
     @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minQ")), @AttributeOverride(name = "opType", column = @Column(name = "minqOp"))
     })
@@ -102,6 +112,8 @@ private void assignAttributes(BatteryModificationInfos batteryModificationInfos)
         this.maxQ = batteryModificationInfos.getMaxQ() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaxQ()) : null;
         this.participate = batteryModificationInfos.getParticipate() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getParticipate()) : null;
         this.droop = batteryModificationInfos.getDroop() != null ? new FloatModificationEmbedded(batteryModificationInfos.getDroop()) : null;
+        this.directTransX = batteryModificationInfos.getDirectTransX() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getDirectTransX()) : null;
+        this.stepUpTransformerX = batteryModificationInfos.getStepUpTransformerX() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getStepUpTransformerX()) : null;
         this.reactiveCapabilityCurve = batteryModificationInfos.getReactiveCapabilityCurve() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getReactiveCapabilityCurve()) : null;
         this.reactiveCapabilityCurvePoints = toEmbeddablePoints(batteryModificationInfos.getReactiveCapabilityCurvePoints());
     }
@@ -134,6 +146,8 @@ public BatteryModificationInfos toModificationInfos() {
                 .maxQ(toAttributeModification(getMaxQ()))
                 .participate(toAttributeModification(getParticipate()))
                 .droop(toAttributeModification(getDroop()))
+                .directTransX(toAttributeModification(getDirectTransX()))
+                .stepUpTransformerX(toAttributeModification(getStepUpTransformerX()))
                 .reactiveCapabilityCurve(toAttributeModification(getReactiveCapabilityCurve()))
                 .reactiveCapabilityCurvePoints(DTOUtils.toReactiveCapabilityCurvePointsModificationInfos(getReactiveCapabilityCurvePoints()))
                 // properties

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java

@@ -47,6 +47,9 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
     @OrderColumn(name = "pos_operationalLimitsGroups")
     private List<OperationalLimitsGroupModificationEntity> operationalLimitsGroups;
 
+    @Column(name = "enable_olg_modification", columnDefinition = "boolean default true")
+    private Boolean enableOLGModification;
+
     @Embedded
     @AttributeOverrides(value = {
         @AttributeOverride(name = "value", column = @Column(name = "selectedOperationalLimitsGroupId1")),
@@ -217,6 +220,7 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
         x = new DoubleModificationEmbedded(branchModificationInfos.getX());
         r = new DoubleModificationEmbedded(branchModificationInfos.getR());
         this.operationalLimitsGroups = assignOperationalLimitsGroups(branchModificationInfos.getOperationalLimitsGroups(), operationalLimitsGroups);
+        this.enableOLGModification = branchModificationInfos.getEnableOLGModification() == null || branchModificationInfos.getEnableOLGModification();
         this.voltageLevelId1 = branchModificationInfos.getVoltageLevelId1() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId1()) : null;
         this.voltageLevelId2 = branchModificationInfos.getVoltageLevelId2() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId2()) : null;
         this.busOrBusbarSectionId1 = branchModificationInfos.getBusOrBusbarSectionId1() != null ? new StringModificationEmbedded(branchModificationInfos.getBusOrBusbarSectionId1()) : null;

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java

@@ -96,6 +96,7 @@ public LineModificationInfos toModificationInfos() {
             .connectionName2(toAttributeModification(getConnectionName2()))
             .selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
             .selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
+            .enableOLGModification(getEnableOLGModification())
             .connectionDirection1(toAttributeModification(getConnectionDirection1()))
             .connectionDirection2(toAttributeModification(getConnectionDirection2()))
             .connectionPosition1(toAttributeModification(getConnectionPosition1()))

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/MoveFeederBayEmbeddable.java

@@ -0,0 +1,63 @@
+/**
+ * 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.modification.server.entities.equipment.modification;
+
+import com.powsybl.iidm.network.extensions.ConnectablePosition;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.gridsuite.modification.dto.MoveFeederBayInfos;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Embeddable
+public class MoveFeederBayEmbeddable {
+    @Column(name = "equipment_id")
+    private String equipmentId;
+
+    @Column(name = "busbar_section_id")
+    private String busbarSectionId;
+
+    @Schema(description = "connection_side")
+    private String connectionSide;
+
+    @Schema(description = "connection_position")
+    private Integer connectionPosition;
+
+    @Schema(description = "connection_name")
+    private String connectionName;
+
+    @Schema(description = "connection_direction")
+    private ConnectablePosition.Direction connectionDirection;
+
+    MoveFeederBayInfos toConnectablePositionModificationInfos() {
+        return MoveFeederBayInfos.builder()
+            .equipmentId(equipmentId)
+            .busbarSectionId(busbarSectionId)
+            .connectionSide(connectionSide)
+            .connectionPosition(connectionPosition)
+            .connectionName(connectionName)
+            .connectionDirection(connectionDirection)
+            .build();
+    }
+
+    static MoveFeederBayEmbeddable toConnectablePositionModificationEmbeddable(MoveFeederBayInfos moveFeederBayInfos) {
+        return new MoveFeederBayEmbeddable(moveFeederBayInfos.getEquipmentId(),
+            moveFeederBayInfos.getBusbarSectionId(),
+            moveFeederBayInfos.getConnectionSide(),
+            moveFeederBayInfos.getConnectionPosition(),
+            moveFeederBayInfos.getConnectionName(),
+            moveFeederBayInfos.getConnectionDirection());
+    }
+}

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/MoveVoltageLevelFeederBaysEntity.java

@@ -0,0 +1,79 @@
+/**
+ * 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.modification.server.entities.equipment.modification;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import org.gridsuite.modification.dto.ModificationInfos;
+import org.gridsuite.modification.dto.MoveVoltageLevelFeederBaysInfos;
+import org.gridsuite.modification.server.entities.ModificationEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+@NoArgsConstructor
+@Getter
+@Entity
+@Table(name = "move_voltage_level_feeder_bays")
+@PrimaryKeyJoinColumn(name = "id", foreignKey = @ForeignKey(name = "move_voltage_level_feeder_bays_id_fk_constraint"))
+public class MoveVoltageLevelFeederBaysEntity extends ModificationEntity {
+
+    @Column(name = "voltage_level_id")
+    private String voltageLevelId;
+
+    @ElementCollection
+    @CollectionTable(
+        name = "move_feeder_bay",
+        joinColumns = @JoinColumn(name = "modification_id"),
+            foreignKey = @ForeignKey(name = "move_feeder_bay_modification_id_fk_constraint")
+    )
+    private List<MoveFeederBayEmbeddable> moveFeederBays;
+
+    public MoveVoltageLevelFeederBaysEntity(MoveVoltageLevelFeederBaysInfos moveVoltageLevelFeederBaysInfos) {
+        super(moveVoltageLevelFeederBaysInfos);
+        assignAttributes(moveVoltageLevelFeederBaysInfos);
+    }
+
+    @Override
+    public void update(@NonNull ModificationInfos modificationInfos) {
+        super.update(modificationInfos);
+        assignAttributes((MoveVoltageLevelFeederBaysInfos) modificationInfos);
+    }
+
+    private void assignAttributes(MoveVoltageLevelFeederBaysInfos moveVoltageLevelFeederBaysInfos) {
+        if (this.moveFeederBays == null) {
+            this.moveFeederBays = new ArrayList<>();
+        } else {
+            this.moveFeederBays.clear();
+        }
+        this.voltageLevelId = moveVoltageLevelFeederBaysInfos.getVoltageLevelId();
+        this.moveFeederBays.addAll(moveVoltageLevelFeederBaysInfos.getFeederBays().stream()
+            .map(MoveFeederBayEmbeddable::toConnectablePositionModificationEmbeddable)
+            .toList());
+    }
+
+    @Override
+    public MoveVoltageLevelFeederBaysInfos toModificationInfos() {
+        return toMoveVoltageLevelFeederBaysInfosBuilder().build();
+    }
+
+    private MoveVoltageLevelFeederBaysInfos.MoveVoltageLevelFeederBaysInfosBuilder<?, ?> toMoveVoltageLevelFeederBaysInfosBuilder() {
+        return MoveVoltageLevelFeederBaysInfos.builder()
+            .uuid(getId())
+            .date(getDate())
+            .stashed(getStashed())
+            .activated(getActivated())
+            .voltageLevelId(voltageLevelId)
+            .feederBays(moveFeederBays.stream()
+                .map(MoveFeederBayEmbeddable::toConnectablePositionModificationInfos).toList());
+    }
+}