set stashed status for all modification #346

Signed-off-by: jamal-khey <[email protected]>
gridsuite · Oct 11, 2023 · 21c6d4f · 21c6d4f
1 parent 288e6c7
commit 21c6d4f
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 0 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java b/src/main/java/org/gridsuite/modification/server/entities/GroovyScriptEntity.java
@@ -51,6 +51,7 @@ public GroovyScriptInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .script(getScript());
     }
 }
diff --git a/.../org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java b/.../org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java
@@ -108,6 +108,7 @@ public BatteryCreationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .voltageLevelId(getVoltageLevelId())

diff --git a/...rg/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java b/...rg/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java
@@ -164,6 +164,7 @@ public GeneratorCreationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             .voltageLevelId(getVoltageLevelId())

diff --git a/...ava/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java b/...ava/org/gridsuite/modification/server/entities/equipment/creation/LineCreationEntity.java
@@ -64,6 +64,7 @@ public LineCreationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             .seriesResistance(getSeriesResistance())

diff --git a/...ava/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java b/...ava/org/gridsuite/modification/server/entities/equipment/creation/LoadCreationEntity.java
@@ -60,6 +60,7 @@ public LoadCreationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             .voltageLevelId(getVoltageLevelId())

diff --git a/...suite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java b/...suite/modification/server/entities/equipment/creation/ShuntCompensatorCreationEntity.java
@@ -64,6 +64,7 @@ public ShuntCompensatorCreationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             .voltageLevelId(getVoltageLevelId())

diff --git a/...g/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java b/...g/gridsuite/modification/server/entities/equipment/creation/SubstationCreationEntity.java
@@ -64,6 +64,7 @@ public SubstationCreationInfos toSubstationCreationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .substationCountry(getCountry())

diff --git a/...modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java b/...modification/server/entities/equipment/creation/TwoWindingsTransformerCreationEntity.java
@@ -177,6 +177,7 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .seriesResistance(getSeriesResistance())

diff --git a/...gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java b/...gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java
@@ -92,6 +92,7 @@ public VoltageLevelCreationInfos toVoltageLevelCreationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .substationId(getSubstationId())

diff --git a/...java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java b/...java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java
@@ -119,6 +119,7 @@ public VscCreationInfos toModificationInfos() {
         return VscCreationInfos.builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .activePower(getActivePower())

diff --git a/...rg/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java b/...rg/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java
@@ -57,6 +57,7 @@ public EquipmentDeletionInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentType(getEquipmentType());
         if (equipmentInfos != null) {

diff --git a/...dsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java b/...dsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java
@@ -131,6 +131,7 @@ public BatteryModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

diff --git a/...e/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java b/...e/modification/server/entities/equipment/modification/BranchStatusModificationEntity.java
@@ -53,6 +53,7 @@ public BranchStatusModificationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .action(getAction())
             .energizedVoltageLevelId(getEnergizedVoltageLevelId())

diff --git a/...dsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java b/...dsuite/modification/server/entities/equipment/modification/DeleteAttachingLineEntity.java
@@ -61,6 +61,7 @@ public DeleteAttachingLineInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .attachedLineId(getAttachedLineId())

diff --git a/...e/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java b/...e/modification/server/entities/equipment/modification/DeleteVoltageLevelOnLineEntity.java
@@ -59,6 +59,7 @@ public DeleteVoltageLevelOnLineInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .replacingLine1Id(getReplacingLine1Id())

diff --git a/...idsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java b/...idsuite/modification/server/entities/equipment/modification/GenerationDispatchEntity.java
@@ -164,6 +164,7 @@ public GenerationDispatchInfos toModificationInfos() {
         return GenerationDispatchInfos.builder()
                 .date(getDate())
                 .uuid(getId())
+                .stashed(getStashed())
                 .lossCoefficient(getLossCoefficient())
                 .defaultOutageRate(getDefaultOutageRate())
                 .generatorsWithoutOutage(toGeneratorsFilters(generatorsWithoutOutage))

diff --git a/...uite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java b/...uite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java
@@ -270,6 +270,7 @@ public GeneratorModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

diff --git a/...gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java b/...gridsuite/modification/server/entities/equipment/modification/GeneratorScalingEntity.java
@@ -35,6 +35,7 @@ public GeneratorScalingInfos toModificationInfos() {
         return GeneratorScalingInfos.builder()
                 .date(getDate())
                 .uuid(getId())
+                .stashed(getStashed())
                 .variationType(getVariationType())
                 .variations(getVariations().stream()
                         .map(ScalingVariationEntity::toScalingVariationInfos)

diff --git a/...e/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java b/...e/modification/server/entities/equipment/modification/LineAttachToVoltageLevelEntity.java
@@ -107,6 +107,7 @@ public LineAttachToVoltageLevelInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .lineToAttachToId(getLineToAttachToId())
                 .percent(getPercent())
                 .attachmentPointId(getAttachmentPointId())

diff --git a/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java
@@ -83,6 +83,7 @@ public LineModificationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
             .seriesResistance(toAttributeModification(getSeriesResistance()))

diff --git a/.../modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java b/.../modification/server/entities/equipment/modification/LineSplitWithVoltageLevelEntity.java
@@ -89,6 +89,7 @@ public LineSplitWithVoltageLevelInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .lineToSplitId(getLineToSplitId())
             .percent(getPercent())
             .mayNewVoltageLevelInfos(mayVoltageLevelCreation == null ? null : mayVoltageLevelCreation.toVoltageLevelCreationInfos())

diff --git a/...te/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java b/...te/modification/server/entities/equipment/modification/LinesAttachToSplitLinesEntity.java
@@ -86,6 +86,7 @@ private LinesAttachToSplitLinesInfos.LinesAttachToSplitLinesInfosBuilder toLines
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .attachedLineId(getAttachedLineId())

diff --git a/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LoadModificationEntity.java
@@ -77,6 +77,7 @@ public LoadModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

diff --git a/.../org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java b/.../org/gridsuite/modification/server/entities/equipment/modification/LoadScalingEntity.java
@@ -36,6 +36,7 @@ public LoadScalingInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .variationType(getVariationType())
                 .variations(getVariations().stream()
                         .map(ScalingVariationEntity::toScalingVariationInfos)

diff --git a/...dification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java b/...dification/server/entities/equipment/modification/ShuntCompensatorModificationEntity.java
@@ -86,6 +86,7 @@ public ShuntCompensatorModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .voltageLevelId(getVoltageLevelId())
                 .equipmentId(getEquipmentId())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))

diff --git a/...ite/modification/server/entities/equipment/modification/SubstationModificationEntity.java b/...ite/modification/server/entities/equipment/modification/SubstationModificationEntity.java
@@ -79,6 +79,7 @@ public SubstationModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .substationCountry(AttributeModification.toAttributeModification(getSubstationCountryValue(), getSubstationCountryOp()))

diff --git a/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
@@ -348,6 +348,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .seriesResistance(AttributeModification.toAttributeModification(getSeriesResistance()))

diff --git a/...te/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java b/...te/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java
@@ -157,6 +157,7 @@ public VoltageInitModificationInfos toModificationInfos() {
         return VoltageInitModificationInfos.builder()
             .date(getDate())
             .uuid(getId())
+            .stashed(getStashed())
             .generators(toGeneratorsModification(generators))
             .transformers(toTransformersModification(transformers))
             .staticVarCompensators(toStaticVarCompensatorsModification(staticVarCompensators))

diff --git a/...e/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java b/...e/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java
@@ -99,6 +99,7 @@ public VoltageLevelModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .equipmentId(getEquipmentId())
                 .date(getDate())
+                .stashed(getStashed())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .nominalVoltage(toAttributeModification(getNominalVoltage()))
                 .lowVoltageLimit(toAttributeModification(getLowVoltageLimit()))

diff --git a/...erver/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java b/...erver/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java
@@ -68,6 +68,7 @@ public EquipmentAttributeModificationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .stashed(getStashed())
             .equipmentId(getEquipmentId())
             .equipmentAttributeName(getAttributeName())
             .equipmentAttributeValue(getAttributeValue())

diff --git a/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/...in/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
@@ -138,6 +138,7 @@ public List<ModificationInfos> getModificationsMetadata(UUID groupUuid, boolean
     }
 
     public List<ModificationInfos> getModificationsInfos(List<UUID> groupUuids, boolean stashedModifications) {
+//        List modif =  groupUuids.stream().flatMap(this::getModificationEntityStream).toList();
         return groupUuids.stream().flatMap(this::getModificationEntityStream)
                 .filter(m -> m.getStashed() == stashedModifications)
                 .map(ModificationEntity::toModificationInfos)