Get modifications from metadata

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

@@ -20,6 +20,9 @@
 import org.gridsuite.modification.server.entities.equipment.modification.BranchStatusModificationEntity;
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.BranchStatusModification;
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_ACTION_TYPE_EMPTY;
 
 /**
@@ -88,4 +91,16 @@ public void check() {
             throw new NetworkModificationException(BRANCH_ACTION_TYPE_EMPTY);
         }
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        Map<String, String> mapMessageValues = new HashMap<>();
+        mapMessageValues.put("action", getAction().name());
+        mapMessageValues.put("equipmentId", getEquipmentId());
+        if (getEnergizedVoltageLevelId() != null) {
+            mapMessageValues.put("energizedVoltageLevelId", getEnergizedVoltageLevelId());
+        }
+        return mapMessageValues;
+
+    }
 }

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

@@ -21,6 +21,9 @@
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.DeleteAttachingLine;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * @author bendaamerahm <ahmed.bendaamer at rte-france.com>
  */
@@ -64,4 +67,13 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Delete attaching line");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        Map<String, String> mapMessageValues = new LinkedHashMap<>();
+        mapMessageValues.put("attachedLineId", getAttachedLineId());
+        mapMessageValues.put("lineToAttachTo1Id", getLineToAttachTo1Id());
+        mapMessageValues.put("lineToAttachTo2Id", getLineToAttachTo2Id());
+        return mapMessageValues;
+    }
 }

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

@@ -17,6 +17,9 @@
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.DeleteVoltageLevelOnLine;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 
 /**
  * @author bendaamerahm <ahmed.bendaamer at rte-france.com>
@@ -58,4 +61,13 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Delete voltage level on line");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        Map<String, String> mapMessageValues = new LinkedHashMap<>();
+        mapMessageValues.put("lineToAttachTo1Id", getLineToAttachTo1Id());
+        mapMessageValues.put("lineToAttachTo2Id", getLineToAttachTo2Id());
+        return mapMessageValues;
+    }
+
 }

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

@@ -26,6 +26,7 @@
 import org.gridsuite.modification.server.modifications.EquipmentAttributeModification;
 import org.springframework.lang.NonNull;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -110,6 +111,17 @@ public void check() {
         }
     }
 
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        Map<String, String> mapMessageValues = new LinkedHashMap<>();
+        mapMessageValues.put("equipmentAttributeName", getEquipmentAttributeName());
+        mapMessageValues.put("equipmentId", getEquipmentId());
+        mapMessageValues.put("equipmentAttributeValue", getEquipmentAttributeValue() != null
+                    ? getEquipmentAttributeValue().toString()
+                    : null);
+        return mapMessageValues;
+    }
+
     private void checkSwitchStatusModificationInfos() {
         if (!equipmentAttributeName.equals("open")) {
             throw new NetworkModificationException(EQUIPMENT_ATTRIBUTE_NAME_ERROR, "For switch status, the attribute name is only 'open'");

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

@@ -15,6 +15,8 @@
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
+import java.util.Map;
+
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -29,4 +31,9 @@ public class EquipmentModificationInfos extends ModificationInfos {
     @Schema(description = "Equipment ID")
     @NonNull
     private String equipmentId;
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of("equipmentId", getEquipmentId());
+    }
 }

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

@@ -21,6 +21,7 @@
 import org.gridsuite.modification.server.modifications.GenerationDispatch;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -65,4 +66,9 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Generation dispatch");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of();
+    }
 }

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

@@ -16,6 +16,7 @@
 import org.gridsuite.modification.server.entities.equipment.modification.LineAttachToVoltageLevelEntity;
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.LineAttachToVoltageLevel;
+import java.util.Map;
 
 /**
  * @author Nicolas NOIR <nicolas.noir at rte-france.com>
@@ -81,4 +82,9 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Line attach to voltage level");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of("lineToAttachToId", getLineToAttachToId());
+    }
 }

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

@@ -18,6 +18,8 @@
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.LineSplitWithVoltageLevel;
 
+import java.util.Map;
+
 /**
  * @author Laurent GARNIER <laurent.garnier at rte-france.com>
  */
@@ -73,4 +75,9 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Line split with voltage level");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of("lineToSplitId", getLineToSplitId());
+    }
 }

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

@@ -16,6 +16,7 @@
 import org.gridsuite.modification.server.entities.equipment.modification.LinesAttachToSplitLinesEntity;
 import org.gridsuite.modification.server.modifications.AbstractModification;
 import org.gridsuite.modification.server.modifications.LinesAttachToSplitLines;
+import java.util.Map;
 
 
 /**
@@ -73,4 +74,9 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(getType().name(), "Lines attach to split lines");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of("attachedLineId", getAttachedLineId());
+    }
 }

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

@@ -25,6 +25,7 @@
 import org.gridsuite.modification.server.modifications.AbstractModification;
 
 import java.time.ZonedDateTime;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -84,6 +85,12 @@ public class ModificationInfos {
     @Schema(description = "Modification flag")
     private Boolean stashed;
 
+    @Schema(description = "Message type")
+    private String messageType;
+
+    @Schema(description = "Message values")
+    private String messageValues;
+
     @JsonIgnore
     public ModificationEntity toEntity() {
         throw new UnsupportedOperationException("TODO");
@@ -109,6 +116,11 @@ public final ModificationType getType() {
         return ModificationType.valueOf(this.getClass().getAnnotation(JsonTypeName.class).value());
     }
 
+    @JsonIgnore
+    public Map<String, String> getMapMessageValues() {
+        return Map.of();
+    }
+
     @JsonIgnore
     public void check() {
         // To check input DTO before hypothesis creation. Nothing to check here

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

@@ -15,6 +15,7 @@
 import org.gridsuite.modification.server.VariationType;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author bendaamerahm <ahmed.bendaamer at rte-france.com>
@@ -31,4 +32,10 @@ public class ScalingInfos extends ModificationInfos {
 
     @Schema(description = "variation type")
     private VariationType variationType;
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        return Map.of("variationType", getVariationType().name());
+    }
+
 }

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

@@ -21,7 +21,9 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.experimental.SuperBuilder;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Etienne Homer <etienne.homer at rte-france.com>
@@ -54,4 +56,11 @@ public AbstractModification toModification() {
     public Reporter createSubReporter(ReporterModel reporter) {
         return reporter.createSubReporter(ModificationType.TABULAR_MODIFICATION.name(), "Tabular modification");
     }
+
+    @Override
+    public Map<String, String> getMapMessageValues() {
+        Map<String, String> mapMessageValues = new HashMap<>();
+        mapMessageValues.put("tabularModificationType", getModificationType());
+        return mapMessageValues;
+    }
 }

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

@@ -6,13 +6,15 @@
  */
 package org.gridsuite.modification.server.entities;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.SneakyThrows;
 import org.gridsuite.modification.server.NetworkModificationException;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 
-import jakarta.persistence.*;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
@@ -50,10 +52,18 @@ public class ModificationEntity {
     @Column(name = "modifications_order")
     private int modificationsOrder;
 
-    public ModificationEntity(UUID id, ZonedDateTime date, Boolean stashed) {
+    @Column(name = "message_type")
+    private String messageType;
+
+    @Column(name = "message_values")
+    private String messageValues;
+
+    public ModificationEntity(UUID id, ZonedDateTime date, Boolean stashed, String messageType, String messageValues) {
         this.id = id;
         this.date = date;
         this.stashed = stashed;
+        this.messageType = messageType;
+        this.messageValues = messageValues;
     }
 
     protected ModificationEntity(ModificationInfos modificationInfos) {
@@ -62,13 +72,17 @@ protected ModificationEntity(ModificationInfos modificationInfos) {
         }
         //We need to limit the precision to avoid database precision storage limit issue (postgres has a precision of 6 digits while h2 can go to 9)
         this.date = ZonedDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.MICROS);
+
+        assignAttributes(modificationInfos);
     }
 
     public ModificationInfos toModificationInfos() {
         return ModificationInfos.builder()
                 .uuid(this.id)
                 .date(this.date)
                 .stashed(this.stashed)
+                .messageType(this.messageType)
+                .messageValues(this.messageValues)
                 .build();
     }
 
@@ -77,6 +91,13 @@ public void update(ModificationInfos modificationInfos) {
         if (modificationInfos == null) {
             throw new NullPointerException("Impossible to update entity from null DTO");
         }
+        assignAttributes(modificationInfos);
+    }
+
+    @SneakyThrows
+    private void assignAttributes(ModificationInfos modificationInfos) {
+        this.setMessageType(modificationInfos.getType().name());
+        this.setMessageValues(new ObjectMapper().writeValueAsString(modificationInfos.getMapMessageValues()));
     }
 
     public ModificationEntity copy() {

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

@@ -59,6 +59,8 @@ public TabularModificationInfos toModificationInfos() {
                 .uuid(getId())
                 .modificationType(modificationType)
                 .modifications(modificationsInfos)
+                .messageType(getMessageType())
+                .messageValues(getMessageValues())
                 .build();
     }
 

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

@@ -53,6 +53,8 @@ public BranchStatusModificationInfos toModificationInfos() {
             .builder()
             .uuid(getId())
             .date(getDate())
+            .messageType(getMessageType())
+            .messageValues(getMessageValues())
             .equipmentId(getEquipmentId())
             .action(getAction())
             .energizedVoltageLevelId(getEnergizedVoltageLevelId())

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

@@ -61,6 +61,8 @@ public DeleteAttachingLineInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .messageType(getMessageType())
+                .messageValues(getMessageValues())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .attachedLineId(getAttachedLineId())

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

@@ -59,6 +59,8 @@ public DeleteVoltageLevelOnLineInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .messageType(getMessageType())
+                .messageValues(getMessageValues())
                 .lineToAttachTo1Id(getLineToAttachTo1Id())
                 .lineToAttachTo2Id(getLineToAttachTo2Id())
                 .replacingLine1Id(getReplacingLine1Id())

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

@@ -6,15 +6,14 @@
  */
 package org.gridsuite.modification.server.entities.equipment.modification;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.server.dto.EquipmentModificationInfos;
 import org.gridsuite.modification.server.dto.ModificationInfos;
 import org.gridsuite.modification.server.entities.ModificationEntity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.MappedSuperclass;
-
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */

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

@@ -107,6 +107,8 @@ public LineAttachToVoltageLevelInfos toModificationInfos() {
                 .builder()
                 .uuid(getId())
                 .date(getDate())
+                .messageType(getMessageType())
+                .messageValues(getMessageValues())
                 .lineToAttachToId(getLineToAttachToId())
                 .percent(getPercent())
                 .attachmentPointId(getAttachmentPointId())