From b1bf9220faa83505a8361f7e6b6b7f3237666d81 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Thu, 30 Oct 2025 21:40:44 +0100 Subject: [PATCH] filter by norminalVoltage/country for generators Signed-off-by: SOUISSI Maissa (Externe) --- .../computation/service/AbstractFilterService.java | 8 ++++---- .../gridsuite/computation/service/FilterServiceTest.java | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gridsuite/computation/service/AbstractFilterService.java b/src/main/java/org/gridsuite/computation/service/AbstractFilterService.java index 6558774..55b5936 100644 --- a/src/main/java/org/gridsuite/computation/service/AbstractFilterService.java +++ b/src/main/java/org/gridsuite/computation/service/AbstractFilterService.java @@ -376,14 +376,14 @@ protected ExpertFilter buildExpertFilter(GlobalFilter globalFilter, EquipmentTyp protected List getNominalVoltageFieldType(EquipmentType equipmentType) { return switch (equipmentType) { case LINE, TWO_WINDINGS_TRANSFORMER -> List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2); - case VOLTAGE_LEVEL -> List.of(FieldType.NOMINAL_VOLTAGE); + case VOLTAGE_LEVEL, GENERATOR -> List.of(FieldType.NOMINAL_VOLTAGE); default -> List.of(); }; } protected List getCountryCodeFieldType(EquipmentType equipmentType) { return switch (equipmentType) { - case VOLTAGE_LEVEL, TWO_WINDINGS_TRANSFORMER -> List.of(FieldType.COUNTRY); + case VOLTAGE_LEVEL, TWO_WINDINGS_TRANSFORMER, GENERATOR -> List.of(FieldType.COUNTRY); case LINE -> List.of(FieldType.COUNTRY_1, FieldType.COUNTRY_2); default -> List.of(); }; @@ -391,8 +391,8 @@ protected List getCountryCodeFieldType(EquipmentType equipmentType) { protected List getSubstationPropertiesFieldTypes(EquipmentType equipmentType) { return equipmentType == EquipmentType.LINE ? - List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2) : - List.of(FieldType.SUBSTATION_PROPERTIES); + List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2) : + List.of(FieldType.SUBSTATION_PROPERTIES); } } diff --git a/src/test/java/org/gridsuite/computation/service/FilterServiceTest.java b/src/test/java/org/gridsuite/computation/service/FilterServiceTest.java index e3386fb..56fb99d 100644 --- a/src/test/java/org/gridsuite/computation/service/FilterServiceTest.java +++ b/src/test/java/org/gridsuite/computation/service/FilterServiceTest.java @@ -345,14 +345,16 @@ private static Stream fieldTypeData() { // Nominal voltage Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.LINE, List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2)), Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.TWO_WINDINGS_TRANSFORMER, List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2)), + Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.GENERATOR, List.of(FieldType.NOMINAL_VOLTAGE)), Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.VOLTAGE_LEVEL, List.of(FieldType.NOMINAL_VOLTAGE)), - Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.GENERATOR, Collections.emptyList()), + Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.BATTERY, Collections.emptyList()), // Country code + Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.GENERATOR, List.of(FieldType.COUNTRY)), Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.VOLTAGE_LEVEL, List.of(FieldType.COUNTRY)), Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.TWO_WINDINGS_TRANSFORMER, List.of(FieldType.COUNTRY)), Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.LINE, List.of(FieldType.COUNTRY_1, FieldType.COUNTRY_2)), - Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.GENERATOR, Collections.emptyList()), + Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.BATTERY, Collections.emptyList()), // Substation properties Arguments.of(GlobalFilter.Fields.substationProperty, EquipmentType.LINE, List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2)),