reindex equipmentType to separate lcc and vsc types of Hvdcline

gridsuite · Feb 7, 2025 · 17e750b · 17e750b
1 parent b65adc6
commit 17e750b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/elasticsearch/EquipmentInfos.java b/src/main/java/org/gridsuite/modification/server/dto/elasticsearch/EquipmentInfos.java
@@ -87,6 +87,14 @@ public static Set<VoltageLevel> getVoltageLevels(@NonNull Identifiable<?> identi
         throw NetworkModificationException.createEquipmentTypeUnknown(identifiable.getClass().getSimpleName());
     }
 
+    public static String getEquipmentTypeName(@NonNull Identifiable<?> identifiable) {
+        return identifiable instanceof HvdcLine hvdcLine
+                ? String.format("%s_%s",
+                identifiable.getType().name(),
+                hvdcLine.getConverterStation1().getHvdcType().name())
+                : identifiable.getType().name();
+    }
+
     public static Set<VoltageLevelInfos> getVoltageLevelsInfos(@NonNull Identifiable<?> identifiable) {
 
         return getVoltageLevels(identifiable).stream()

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/NetworkStoreListener.java b/src/main/java/org/gridsuite/modification/server/modifications/NetworkStoreListener.java
@@ -181,7 +181,7 @@ public void onCreation(Identifiable identifiable) {
             .variantId(network.getVariantManager().getWorkingVariantId())
             .id(identifiable.getId())
             .name(identifiable.getNameOrId())
-            .type(identifiable.getType().name())
+            .type(EquipmentInfos.getEquipmentTypeName(identifiable))
             .voltageLevels(EquipmentInfos.getVoltageLevelsInfos(identifiable))
             .substations(EquipmentInfos.getSubstationsInfos(identifiable))
             .build());
@@ -231,7 +231,7 @@ private static EquipmentInfos toEquipmentInfos(Identifiable<?> identifiable, UUI
             .variantId(variantId)
             .id(identifiable.getId())
             .name(identifiable.getNameOrId())
-            .type(identifiable.getType().name())
+            .type(EquipmentInfos.getEquipmentTypeName(identifiable))
             .voltageLevels(EquipmentInfos.getVoltageLevelsInfos(identifiable))
             .substations(EquipmentInfos.getSubstationsInfos(identifiable))
             .build();