Add substation and voltageLevel properties to all elements (#260)

Signed-off-by: Ayoub LABIDI <[email protected]>

Author: ayolab

src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java

@@ -19,6 +19,7 @@
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -74,4 +75,11 @@ public class BatteryTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
+
 }

src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java

@@ -10,6 +10,9 @@
 import com.powsybl.iidm.network.Country;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
+
+import java.util.Map;
+
 import org.gridsuite.network.map.dto.ElementInfosWithProperties;
 
 /**
@@ -32,4 +35,10 @@ public class BusTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Country country;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java

@@ -12,6 +12,7 @@
 import org.gridsuite.network.map.dto.ElementInfosWithProperties;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -27,4 +28,10 @@ public class BusBarSectionTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<MeasurementsInfos> measurementAngle;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java

@@ -14,6 +14,7 @@
 import org.gridsuite.network.map.dto.definition.extension.InjectionObservabilityInfos;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -59,4 +60,10 @@ public class DanglingLineTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java

@@ -15,6 +15,7 @@
 import org.gridsuite.network.map.dto.definition.extension.HvdcAngleDroopActivePowerControlInfos;
 import org.gridsuite.network.map.dto.definition.extension.HvdcOperatorActivePowerRangeInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -64,4 +65,16 @@ public class HvdcTabInfos extends ElementInfosWithProperties {
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<HvdcOperatorActivePowerRangeInfos> hvdcOperatorActivePowerRange;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties1;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties1;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties2;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties2;
+
 }

src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java

@@ -14,6 +14,7 @@
 import org.gridsuite.network.map.dto.definition.extension.InjectionObservabilityInfos;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -53,4 +54,10 @@ public class LccConverterStationTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java

@@ -118,4 +118,16 @@ public class LineTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<BranchObservabilityInfos> branchObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties1;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties1;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties2;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties2;
 }

src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java

@@ -16,6 +16,7 @@
 import org.gridsuite.network.map.dto.definition.extension.InjectionObservabilityInfos;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -58,4 +59,10 @@ public class LoadTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java

@@ -15,6 +15,7 @@
 import org.gridsuite.network.map.dto.definition.extension.InjectionObservabilityInfos;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -55,4 +56,10 @@ public class ShuntCompensatorTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }

src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java

@@ -15,6 +15,7 @@
 import org.gridsuite.network.map.dto.definition.extension.InjectionObservabilityInfos;
 import org.gridsuite.network.map.dto.definition.extension.MeasurementsInfos;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -52,4 +53,10 @@ public class StaticVarCompensatorTabInfos extends ElementInfosWithProperties {
 
     @JsonInclude(JsonInclude.Include.NON_ABSENT)
     private Optional<InjectionObservabilityInfos> injectionObservability;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> substationProperties;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Map<String, String> voltageLevelProperties;
 }