Modification can now be disabled

src/main/java/org/gridsuite/modification/server/NetworkModificationController.java

@@ -227,7 +227,7 @@ public ResponseEntity<Map<UUID, UUID>> duplicateModifications(@Parameter(descrip
         return ResponseEntity.ok().body(networkModificationService.duplicateModifications(sourceModificationUuids));
     }
 
-    @PutMapping(value = "/network-modifications", produces = MediaType.APPLICATION_JSON_VALUE)
+    @PutMapping(value = "/network-modifications", produces = MediaType.APPLICATION_JSON_VALUE, params = "stashed")
     @Operation(summary = "stash or unstash network modifications")
     @ApiResponse(responseCode = "200", description = "The network modifications were stashed")
     public ResponseEntity<Void> stashNetworkModifications(
@@ -242,6 +242,16 @@ public ResponseEntity<Void> stashNetworkModifications(
         return ResponseEntity.ok().build();
     }
 
+    @PutMapping(value = "/network-modifications", produces = MediaType.APPLICATION_JSON_VALUE, params = "activated")
+    @Operation(summary = "activate or deactivate network modifications")
+    @ApiResponse(responseCode = "200", description = "The activation status related to the network modification was successfully updated")
+    public ResponseEntity<Void> updateNetworkModificationsActivationStatus(
+        @Parameter(description = "Network modification UUIDs") @RequestParam("uuids") List<UUID> networkModificationUuids,
+        @Parameter(description = "activate or deactivate network modifications") @RequestParam(name = "activated") Boolean activated) {
+        networkModificationService.updateNetworkModificationActivation(networkModificationUuids, activated);
+        return ResponseEntity.ok().build();
+    }
+
     @PutMapping(value = "/groups/{groupUuid}/duplications", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Duplicate all modifications in a group and append them at the end of another modifications group")
     @ApiResponse(responseCode = "200", description = "The modifications have been duplicated")

src/main/java/org/gridsuite/modification/server/dto/ModificationInfos.java

@@ -100,12 +100,17 @@ public class ModificationInfos {
     @Schema(description = "Message values")
     private String messageValues;
 
+    @Schema(description = "Modification activated")
+    @Builder.Default
+    private Boolean activated = true;
+
     // Only for metadata
     public static ModificationInfos fromEntity(@NonNull ModificationEntity entity) {
         ModificationInfos modificationInfos = ModificationInfos.builder()
             .uuid(entity.getId())
             .date(entity.getDate())
             .stashed(entity.getStashed())
+            .activated(entity.getActivated())
             .messageType(entity.getMessageType())
             .messageValues(entity.getMessageValues())
             .build();

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

@@ -44,6 +44,7 @@ public CompositeModificationEntity(@NonNull CompositeModificationInfos composite
     public CompositeModificationInfos toModificationInfos() {
         List<ModificationInfos> modificationsInfos = modifications.stream().map(ModificationEntity::toModificationInfos).toList();
         return CompositeModificationInfos.builder()
+                .activated(getActivated())
                 .date(getDate())
                 .uuid(getId())
                 .stashed(getStashed())

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

@@ -52,6 +52,7 @@ public GroovyScriptInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .script(getScript());
     }
 }

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

@@ -60,11 +60,15 @@ public class ModificationEntity {
     @Column(name = "message_values")
     private String messageValues;
 
-    public ModificationEntity(UUID id, String type, Instant date, Boolean stashed, String messageType, String messageValues) {
+    @Column(name = "activated")
+    private Boolean activated = true;
+
+    public ModificationEntity(UUID id, String type, Instant date, Boolean stashed, Boolean activated, String messageType, String messageValues) {
         this.id = id;
         this.type = type;
         this.date = date;
         this.stashed = stashed;
+        this.activated = activated;
         this.messageType = messageType;
         this.messageValues = messageValues;
     }
@@ -82,6 +86,7 @@ protected ModificationEntity(ModificationInfos modificationInfos) {
         this.date = Instant.now().truncatedTo(ChronoUnit.MICROS);
         // Do not put this stashed status in assignAttributes, it's not part of a network modification as such.
         this.stashed = modificationInfos.getStashed();
+        this.activated = modificationInfos.getActivated();
 
         assignAttributes(modificationInfos);
     }

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

@@ -55,6 +55,7 @@ public TabularCreationInfos toModificationInfos() {
                 .date(getDate())
                 .uuid(getId())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .creationType(creationType)
                 .creations(creationsInfos)
                 .build();

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

@@ -48,6 +48,7 @@ public TabularModificationInfos toModificationInfos() {
                 .date(getDate())
                 .uuid(getId())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .modificationType(modificationType)
                 .modifications(modificationsInfos)
                 .build();

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

@@ -112,6 +112,7 @@ public BatteryCreationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 // injection

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

@@ -84,6 +84,7 @@ private void assignAttributes(ConverterStationCreationInfos converterStationCrea
     public ConverterStationCreationInfos toConverterStationInfos() {
         return ConverterStationCreationInfos.builder()
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 // Injection

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

@@ -167,6 +167,7 @@ public GeneratorCreationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             // injection

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

@@ -67,6 +67,7 @@ public LineCreationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             // branch

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

@@ -63,6 +63,7 @@ public LoadCreationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             // injection

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

@@ -72,6 +72,7 @@ public ShuntCompensatorCreationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(getEquipmentName())
             // Injection

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

@@ -60,6 +60,7 @@ public SubstationCreationInfos toSubstationCreationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .country(getCountry())

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

@@ -181,6 +181,7 @@ public TwoWindingsTransformerCreationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 // branch

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

@@ -96,6 +96,7 @@ public VoltageLevelCreationInfos toVoltageLevelCreationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .substationId(getSubstationId())

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

@@ -111,6 +111,7 @@ public VscCreationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .activePowerSetpoint(getActivePowerSetpoint())

src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/ByFilterDeletionEntity.java

@@ -68,6 +68,7 @@ public ByFilterDeletionInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .filters(getFilters().stream()
                         .map(filter -> new FilterInfos(filter.getFilterId(), filter.getName()))
                         .collect(Collectors.toList()))

src/main/java/org/gridsuite/modification/server/entities/equipment/deletion/EquipmentDeletionEntity.java

@@ -60,6 +60,7 @@ public EquipmentDeletionInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentType(getEquipmentType());
         if (equipmentInfos != null) {

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

@@ -123,6 +123,7 @@ public BatteryModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

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

@@ -65,6 +65,7 @@ public ByFormulaModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .identifiableType(getIdentifiableType())
                 .formulaInfosList(getFormulaEntities().stream()
                         .map(FormulaEntity::toFormulaInfos)

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

@@ -114,6 +114,7 @@ public ConverterStationModificationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
             .lossFactor(toAttributeModification(getLossFactor()))

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

@@ -62,6 +62,7 @@ public DeleteAttachingLineInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .attachedLineId(getAttachedLineId())

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

@@ -60,6 +60,7 @@ public DeleteVoltageLevelOnLineInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .replacingLine1Id(getReplacingLine1Id())

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

@@ -165,6 +165,7 @@ public GenerationDispatchInfos toModificationInfos() {
                 .date(getDate())
                 .uuid(getId())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .lossCoefficient(getLossCoefficient())
                 .defaultOutageRate(getDefaultOutageRate())
                 .generatorsWithoutOutage(toGeneratorsFilters(generatorsWithoutOutage))

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

@@ -269,6 +269,7 @@ public GeneratorModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

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

@@ -36,6 +36,7 @@ public GeneratorScalingInfos toModificationInfos() {
                 .date(getDate())
                 .uuid(getId())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .variationType(getVariationType())
                 .variations(getVariations().stream()
                         .map(ScalingVariationEntity::toScalingVariationInfos)

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

@@ -108,6 +108,7 @@ public LineAttachToVoltageLevelInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .lineToAttachToId(getLineToAttachToId())
                 .percent(getPercent())
                 .attachmentPointId(getAttachmentPointId())

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

@@ -85,6 +85,7 @@ public LineModificationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
             .connected1(toAttributeModification(getConnected1()))

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

@@ -90,6 +90,7 @@ public LineSplitWithVoltageLevelInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .lineToSplitId(getLineToSplitId())
             .percent(getPercent())
             .mayNewVoltageLevelInfos(mayVoltageLevelCreation == null ? null : mayVoltageLevelCreation.toVoltageLevelCreationInfos())

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

@@ -87,6 +87,7 @@ private LinesAttachToSplitLinesInfos.LinesAttachToSplitLinesInfosBuilder toLines
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .attachedLineId(getAttachedLineId())

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

@@ -81,6 +81,7 @@ public LoadModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

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

@@ -37,6 +37,7 @@ public LoadScalingInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .variationType(getVariationType())
                 .variations(getVariations().stream()
                         .map(ScalingVariationEntity::toScalingVariationInfos)

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

@@ -54,6 +54,7 @@ public OperatingStatusModificationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .action(getAction())
             .energizedVoltageLevelId(getEnergizedVoltageLevelId());

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

@@ -104,6 +104,7 @@ public ShuntCompensatorModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp()))

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

@@ -55,6 +55,7 @@ public SubstationModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .country(AttributeModification.toAttributeModification(getCountry(), getCountryOp()))

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

@@ -352,6 +352,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(AttributeModification.toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .connected1(toAttributeModification(getConnected1()))

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

@@ -180,6 +180,7 @@ public VoltageInitModificationInfos toModificationInfos() {
             .date(getDate())
             .uuid(getId())
             .stashed(getStashed())
+            .activated(getActivated())
             .generators(toGeneratorsModification(generators))
             .transformers(toTransformersModification(transformers))
             .staticVarCompensators(toStaticVarCompensatorsModification(staticVarCompensators))

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

@@ -101,6 +101,7 @@ public VoltageLevelModificationInfos toModificationInfos() {
                 .equipmentId(getEquipmentId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .nominalV(toAttributeModification(getNominalV()))
                 .lowVoltageLimit(toAttributeModification(getLowVoltageLimit()))

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

@@ -147,6 +147,7 @@ private void assignAttributes(@NonNull VscModificationInfos vscModificationInfos
                 .uuid(getId())
                 .date(getDate())
                 .stashed(getStashed())
+                .activated(getActivated())
                 .equipmentId(getEquipmentId())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
                 .nominalV(toAttributeModification(getNominalV()))

src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/EquipmentAttributeModificationEntity.java

@@ -70,6 +70,7 @@ public EquipmentAttributeModificationInfos toModificationInfos() {
             .uuid(getId())
             .date(getDate())
             .stashed(getStashed())
+            .activated(getActivated())
             .equipmentId(getEquipmentId())
             .equipmentAttributeName(getAttributeName())
             .equipmentAttributeValue(getAttributeValue())

src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java

@@ -166,6 +166,7 @@ private ApplicationStatus apply(List<ModificationInfos> modificationInfosList, N
             reportNode = ReportNode.NO_OP;
         }
         ApplicationStatus groupApplicationStatus = modificationInfosList.stream()
+                .filter(ModificationInfos::getActivated)
                 .map(m -> apply(m, network, reportNode))
                 .reduce(ApplicationStatus::max)
                 .orElse(ApplicationStatus.ALL_OK);