refactor: reduce complexity of indexation handling (#732)

Signed-off-by: Joris Mancini <[email protected]>

Author: TheMaskedTurtle

src/main/java/org/gridsuite/modification/server/dto/elasticsearch/ModificationApplicationInfos.java

@@ -8,17 +8,14 @@
 
 import lombok.*;
 import org.gridsuite.modification.server.elasticsearch.ESConfig;
-import org.gridsuite.modification.server.modifications.ImpactedEquipmentsInfos;
-import org.gridsuite.modification.server.modifications.IndexedImpactedEquipmentInfos;
 import org.springframework.data.annotation.AccessType;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.elasticsearch.annotations.*;
 
+import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 /**
  * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
@@ -58,7 +55,8 @@ public void setUniqueId(String uniqueId) {
                 @InnerField(suffix = "raw", type = FieldType.Keyword)
             }
     )
-    private Set<String> createdEquipmentIds;
+    @Builder.Default
+    private Set<String> createdEquipmentIds = new HashSet<>();
 
     @MultiField(
             mainField = @Field(type = FieldType.Text),
@@ -67,7 +65,8 @@ public void setUniqueId(String uniqueId) {
                 @InnerField(suffix = "raw", type = FieldType.Keyword)
             }
     )
-    private Set<String> modifiedEquipmentIds;
+    @Builder.Default
+    private Set<String> modifiedEquipmentIds = new HashSet<>();
 
     @MultiField(
             mainField = @Field(type = FieldType.Text),
@@ -76,33 +75,10 @@ public void setUniqueId(String uniqueId) {
                 @InnerField(suffix = "raw", type = FieldType.Keyword)
             }
     )
-    private Set<String> deletedEquipmentIds;
-
-    @Transient
     @Builder.Default
-    ImpactedEquipmentsInfos impactedEquipmentsInfos = new ImpactedEquipmentsInfos();
-
-    public ModificationApplicationInfos flushImpactedEquipments() {
-        createdEquipmentIds = impactedEquipmentsInfos.getCreatedEquipments().stream()
-            .filter(IndexedImpactedEquipmentInfos::shouldIndexInModification)
-            .map(IndexedImpactedEquipmentInfos::impactedEquipmentInfos)
-            .map(BasicEquipmentInfos::getId)
-            .collect(Collectors.toSet());
-        modifiedEquipmentIds = impactedEquipmentsInfos.getModifiedEquipments().stream()
-            .filter(IndexedImpactedEquipmentInfos::shouldIndexInModification)
-            .map(IndexedImpactedEquipmentInfos::impactedEquipmentInfos)
-            .map(BasicEquipmentInfos::getId)
-            .collect(Collectors.toSet());
-        deletedEquipmentIds = impactedEquipmentsInfos.getTombstonedEquipments().stream()
-            .filter(IndexedImpactedEquipmentInfos::shouldIndexInModification)
-            .map(IndexedImpactedEquipmentInfos::impactedEquipmentInfos)
-            .map(BasicEquipmentInfos::getId)
-            .collect(Collectors.toSet());
-        impactedEquipmentsInfos = null;
-        return this;
-    }
+    private Set<String> deletedEquipmentIds = new HashSet<>();
 
-    public boolean hasAnyImpactedEquipment() {
-        return impactedEquipmentsInfos.hasAnyImpactedEquipmentToIndexInModification();
+    public boolean isNotEmpty() {
+        return !createdEquipmentIds.isEmpty() || !modifiedEquipmentIds.isEmpty() || !deletedEquipmentIds.isEmpty();
     }
 }