Merge branch 'main' into fix_check_modifications

gridsuite · Dec 21, 2023 · 36af51f · 36af51f
2 parents 14edf4f + 65b9c25
commit 36af51f
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 27 deletions.
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> activePower;
+    private AttributeModification<Double> constantActivePower;
 
     @Schema(description = "Reactive power modification")
-    private AttributeModification<Double> reactivePower;
+    private AttributeModification<Double> constantReactivePower;
 
     @Override
     public LoadModificationEntity toEntity() {

diff --git a/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java
@@ -61,10 +61,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.getActivePower() != null ? loadModificationInfos.getActivePower().getValue() : null;
-        this.activePowerOp = loadModificationInfos.getActivePower() != null ? loadModificationInfos.getActivePower().getOp() : null;
-        this.reactivePowerValue = loadModificationInfos.getReactivePower() != null ? loadModificationInfos.getReactivePower().getValue() : null;
-        this.reactivePowerOp = loadModificationInfos.getReactivePower() != null ? loadModificationInfos.getReactivePower().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;
     }
 
     @Override
@@ -83,7 +83,7 @@ public LoadModificationInfos toModificationInfos() {
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))
                 .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp()))
                 .loadType(AttributeModification.toAttributeModification(getLoadTypeValue(), getLoadTypeOp()))
-                .activePower(AttributeModification.toAttributeModification(getActivePowerValue(), getActivePowerOp()))
-                .reactivePower(AttributeModification.toAttributeModification(getReactivePowerValue(), getReactivePowerOp()));
+                .constantActivePower(AttributeModification.toAttributeModification(getActivePowerValue(), getActivePowerOp()))
+                .constantReactivePower(AttributeModification.toAttributeModification(getReactivePowerValue(), getReactivePowerOp()));
     }
 }
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java b/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java
@@ -53,8 +53,8 @@ private void modifyLoad(Load load, LoadModificationInfos loadModificationInfos,
 
         ModificationUtils.getInstance().applyElementaryModifications(load::setName, () -> load.getOptionalName().orElse("No value"), loadModificationInfos.getEquipmentName(), subReporter, "Name");
         ModificationUtils.getInstance().applyElementaryModifications(load::setLoadType, load::getLoadType, loadModificationInfos.getLoadType(), subReporter, "Type");
-        ModificationUtils.getInstance().applyElementaryModifications(load::setP0, load::getP0, loadModificationInfos.getActivePower(), subReporter, "Active power");
-        ModificationUtils.getInstance().applyElementaryModifications(load::setQ0, load::getQ0, loadModificationInfos.getReactivePower(), subReporter, "Reactive power");
+        ModificationUtils.getInstance().applyElementaryModifications(load::setP0, load::getP0, loadModificationInfos.getConstantActivePower(), subReporter, "Constant active power");
+        ModificationUtils.getInstance().applyElementaryModifications(load::setQ0, load::getQ0, loadModificationInfos.getConstantReactivePower(), subReporter, "Constant reactive power");
 
         // TODO connectivity modification
     }

diff --git a/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
@@ -307,10 +307,11 @@ public void updateModification(@NonNull UUID modificationUuid, @NonNull Modifica
     public void deleteStashedModificationInGroup(UUID groupUuid, boolean errorOnGroupNotFound) {
         try {
             ModificationGroupEntity groupEntity = getModificationGroup(groupUuid);
-            if (!groupEntity.getModifications().isEmpty()) {
-                List<UUID> stashedModifications = groupEntity.getModifications().stream()
-                    .filter(ModificationEntity::getStashed).map(ModificationEntity::getId).collect(Collectors.toList());
-                deleteModifications(groupUuid, stashedModifications);
+            List<UUID> stashedModificationUuids = groupEntity.getModifications().stream()
+                    .filter(modification -> modification != null && modification.getStashed())
+                    .map(ModificationEntity::getId).collect(Collectors.toList());
+            if (!stashedModificationUuids.isEmpty()) {
+                deleteModifications(groupUuid, stashedModificationUuids);
             }
         } catch (NetworkModificationException e) {
             if (e.getType() == MODIFICATION_GROUP_NOT_FOUND && !errorOnGroupNotFound) {

diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LoadModificationTest.java
@@ -45,8 +45,8 @@ protected ModificationInfos buildModification() {
             .equipmentId("v1load")
             .equipmentName(new AttributeModification<>("nameLoad1", OperationType.SET))
             .loadType(new AttributeModification<>(LoadType.FICTITIOUS, OperationType.SET))
-            .activePower(new AttributeModification<>(200.0, OperationType.SET))
-            .reactivePower(new AttributeModification<>(30.0, OperationType.SET))
+            .constantActivePower(new AttributeModification<>(200.0, OperationType.SET))
+            .constantReactivePower(new AttributeModification<>(30.0, OperationType.SET))
             .build();
     }
 
@@ -57,8 +57,8 @@ protected ModificationInfos buildModificationUpdate() {
             .stashed(false)
             .equipmentName(new AttributeModification<>("nameLoadEdited1", OperationType.SET))
             .loadType(new AttributeModification<>(LoadType.AUXILIARY, OperationType.SET))
-            .activePower(new AttributeModification<>(300.0, OperationType.SET))
-            .reactivePower(new AttributeModification<>(50.0, OperationType.SET))
+            .constantActivePower(new AttributeModification<>(300.0, OperationType.SET))
+            .constantReactivePower(new AttributeModification<>(50.0, OperationType.SET))
             .build();
     }
 

diff --git a/.../modification/server/modifications/tabularmodifications/TabularLoadModificationsTest.java b/.../modification/server/modifications/tabularmodifications/TabularLoadModificationsTest.java
@@ -35,9 +35,9 @@ protected Network createNetwork(UUID networkUuid) {
     @Override
     protected ModificationInfos buildModification() {
         List<ModificationInfos> modifications = List.of(
-                LoadModificationInfos.builder().equipmentId("v1load").reactivePower(new AttributeModification<>(300., OperationType.SET)).build(),
-                LoadModificationInfos.builder().equipmentId("v2load").reactivePower(new AttributeModification<>(300., OperationType.SET)).build(),
-                LoadModificationInfos.builder().equipmentId("v3load").reactivePower(new AttributeModification<>(300., OperationType.SET)).build()
+                LoadModificationInfos.builder().equipmentId("v1load").constantReactivePower(new AttributeModification<>(300., OperationType.SET)).build(),
+                LoadModificationInfos.builder().equipmentId("v2load").constantReactivePower(new AttributeModification<>(300., OperationType.SET)).build(),
+                LoadModificationInfos.builder().equipmentId("v3load").constantReactivePower(new AttributeModification<>(300., OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
                 .modificationType("LOAD_MODIFICATION")
@@ -49,9 +49,9 @@ protected ModificationInfos buildModification() {
     @Override
     protected ModificationInfos buildModificationUpdate() {
         List<ModificationInfos> modifications = List.of(
-                LoadModificationInfos.builder().equipmentId("v1load").reactivePower(new AttributeModification<>(500., OperationType.SET)).build(),
-                LoadModificationInfos.builder().equipmentId("v2load").reactivePower(new AttributeModification<>(500., OperationType.SET)).build(),
-                LoadModificationInfos.builder().equipmentId("v3load").reactivePower(new AttributeModification<>(500., OperationType.SET)).build()
+                LoadModificationInfos.builder().equipmentId("v1load").constantReactivePower(new AttributeModification<>(500., OperationType.SET)).build(),
+                LoadModificationInfos.builder().equipmentId("v2load").constantReactivePower(new AttributeModification<>(500., OperationType.SET)).build(),
+                LoadModificationInfos.builder().equipmentId("v3load").constantReactivePower(new AttributeModification<>(500., OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
                 .modificationType("LOAD_MODIFICATION")

diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
@@ -690,7 +690,7 @@ public void runBuildTest() throws Exception {
                 .build().toEntity()
         );
         entities2.add(LoadModificationInfos.builder().equipmentId("newLoad")
-            .equipmentName(new AttributeModification<>("newLoadName", OperationType.SET)).activePower(null).build().toEntity());
+            .equipmentName(new AttributeModification<>("newLoadName", OperationType.SET)).constantActivePower(null).build().toEntity());
         entities2.add(GeneratorModificationInfos.builder()
                 .equipmentId("newGenerator")
                 .equipmentName(new AttributeModification<>("newGeneratorName", OperationType.SET))

diff --git a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java
@@ -133,11 +133,11 @@ public static LoadModificationInfos getModificationLoad(String loadId, String vl
         }
 
         if (activePower != null) {
-            builder.activePower(AttributeModification.toAttributeModification(activePower, OperationType.SET));
+            builder.constantActivePower(AttributeModification.toAttributeModification(activePower, OperationType.SET));
         }
 
         if (reactivePower != null) {
-            builder.reactivePower(AttributeModification.toAttributeModification(reactivePower, OperationType.SET));
+            builder.constantReactivePower(AttributeModification.toAttributeModification(reactivePower, OperationType.SET));
         }
 
         return builder.build();