Change substation filter on region property (#100)

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/main/java/org/gridsuite/filter/globalfilter/GlobalFilterUtils.java

@@ -100,6 +100,7 @@ public static Optional<AbstractExpertRule> buildCountryCodeRules(
     public static List<FieldType> getSubstationPropertiesFieldTypes(@Nonnull final EquipmentType equipmentType) {
         return switch (equipmentType) {
             case LINE, HVDC_LINE -> List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2);
+            case SUBSTATION -> List.of(FieldType.FREE_PROPERTIES);
             default -> List.of(FieldType.SUBSTATION_PROPERTIES);
         };
     }

src/main/java/org/gridsuite/filter/utils/expertfilter/ExpertFilterUtils.java

@@ -52,7 +52,7 @@ public static <I extends Identifiable<I>> String getFieldValue(FieldType field,
                 case BUS -> getBusFieldValue(field, (Bus) identifiable);
                 case BUSBAR_SECTION -> getBusBarSectionFieldValue(field, (BusbarSection) identifiable);
                 case BATTERY -> getBatteryFieldValue(field, propertyName, (Battery) identifiable);
-                case SUBSTATION -> getSubstationFieldValue(field, propertyName, (Substation) identifiable);
+                case SUBSTATION -> getSubstationFieldValue(field, (Substation) identifiable);
                 case TWO_WINDINGS_TRANSFORMER -> getTwoWindingsTransformerFieldValue(field, propertyName, (TwoWindingsTransformer) identifiable);
                 case STATIC_VAR_COMPENSATOR -> getStaticVarCompensatorFieldValue(field, propertyName, (StaticVarCompensator) identifiable);
                 case DANGLING_LINE -> getDanglingLinesFieldValue(field, propertyName, (DanglingLine) identifiable);
@@ -313,10 +313,9 @@ private static String getHvdcConverterStationFieldValue(FieldType field, HvdcCon
         };
     }
 
-    private static String getSubstationFieldValue(FieldType field, String propertyName, Substation substation) {
+    private static String getSubstationFieldValue(FieldType field, Substation substation) {
         return switch (field) {
             case COUNTRY -> String.valueOf(substation.getCountry().orElse(null));
-            case SUBSTATION_PROPERTIES -> substation.getProperty(propertyName);
             default ->
                 throw new PowsyblException(FIELD_AND_TYPE_NOT_IMPLEMENTED + " [" + field + "," + substation.getType() + "]");
         };

src/test/java/org/gridsuite/filter/expertfilter/PropertiesExpertRuleTest.java

@@ -155,12 +155,12 @@ private static Stream<Arguments> provideArgumentsForSubstationTest() {
 
         return Stream.of(
                 // --- IN --- //
-                Arguments.of(IN, FieldType.SUBSTATION_PROPERTIES, "cvgRegion", List.of("Lille", "PARIS"), substation, true),
-                Arguments.of(IN, FieldType.SUBSTATION_PROPERTIES, "cvgRegion", List.of("Paris"), substation, false),
+                Arguments.of(IN, FieldType.FREE_PROPERTIES, "cvgRegion", List.of("Lille", "PARIS"), substation, true),
+                Arguments.of(IN, FieldType.FREE_PROPERTIES, "cvgRegion", List.of("Paris"), substation, false),
 
                 // --- NOT_IN --- //
-                Arguments.of(NOT_IN, FieldType.SUBSTATION_PROPERTIES, "cvgRegion", List.of("LILLE", "PARIS"), substation, false),
-                Arguments.of(NOT_IN, FieldType.SUBSTATION_PROPERTIES, "cvgRegion", List.of("Paris"), substation, true)
+                Arguments.of(NOT_IN, FieldType.FREE_PROPERTIES, "cvgRegion", List.of("Lille", "PARIS"), substation, false),
+                Arguments.of(NOT_IN, FieldType.FREE_PROPERTIES, "cvgRegion", List.of("Paris"), substation, true)
         );
     }
 

src/test/java/org/gridsuite/filter/globalfilter/GlobalFilterUtilsTest.java

@@ -285,7 +285,8 @@ private static Stream<Arguments> substationPropertyFieldTypeData() {
         return Stream.of(
             // Substation properties
             Arguments.of(EquipmentType.LINE, List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2)),
-            Arguments.of(EquipmentType.GENERATOR, List.of(FieldType.SUBSTATION_PROPERTIES))
+            Arguments.of(EquipmentType.GENERATOR, List.of(FieldType.SUBSTATION_PROPERTIES)),
+            Arguments.of(EquipmentType.SUBSTATION, List.of(FieldType.FREE_PROPERTIES))
         );
     }