Move equipment type filters evalutation to filter lib

pom.xml

@@ -42,9 +42,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>47.0.0</gridsuite-dependencies.version>
-        <!-- TODO filter.version remove when included in gridsuite-dependencies -->
-        <filter.version>1.20.0</filter.version>
+        <gridsuite-dependencies.version>49.0.0</gridsuite-dependencies.version>
         <string-template.version>4.3.1</string-template.version>
         <liquibase-hibernate-package>org.gridsuite.filter.server</liquibase-hibernate-package>
         <sonar.coverage.exclusions>**/migrations/**/*</sonar.coverage.exclusions>
@@ -89,12 +87,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- imports -->
-            <!-- FIXME: to be removed at next gridsuite-dependencies upgrade  -->
-            <dependency>
-                <groupId>org.gridsuite</groupId>
-                <artifactId>gridsuite-filter</artifactId>
-                <version>${filter.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.gridsuite</groupId>
                 <artifactId>gridsuite-dependencies</artifactId>

src/main/java/org/gridsuite/filter/server/FilterController.java

@@ -16,9 +16,9 @@
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
 import org.gridsuite.filter.identifierlistfilter.FilteredIdentifiables;
 import org.gridsuite.filter.identifierlistfilter.IdentifiableAttributes;
-import org.gridsuite.filter.server.dto.FilterAttributes;
-import org.gridsuite.filter.server.dto.FiltersWithEquipmentTypes;
+import org.gridsuite.filter.identifierlistfilter.FilterAttributes;
 import org.gridsuite.filter.server.dto.IdsByGroup;
+import org.gridsuite.filter.utils.FiltersWithEquipmentTypes;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/org/gridsuite/filter/server/FilterService.java

@@ -7,7 +7,6 @@
 package org.gridsuite.filter.server;
 
 import com.powsybl.commons.PowsyblException;
-import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.network.store.client.NetworkStoreService;
 import com.powsybl.network.store.client.PreloadingStrategy;
@@ -17,22 +16,18 @@
 import org.gridsuite.filter.FilterLoader;
 import org.gridsuite.filter.IFilterAttributes;
 import org.gridsuite.filter.exception.FilterCycleException;
-import org.gridsuite.filter.expertfilter.ExpertFilter;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
 import org.gridsuite.filter.identifierlistfilter.FilteredIdentifiables;
 import org.gridsuite.filter.identifierlistfilter.IdentifiableAttributes;
-import org.gridsuite.filter.server.dto.EquipmentTypesByFilterId;
-import org.gridsuite.filter.server.dto.FilterAttributes;
-import org.gridsuite.filter.server.dto.FiltersWithEquipmentTypes;
+import org.gridsuite.filter.identifierlistfilter.FilterAttributes;
 import org.gridsuite.filter.server.dto.IdsByGroup;
 import org.gridsuite.filter.server.error.FilterBusinessErrorCode;
 import org.gridsuite.filter.server.error.FilterException;
 import org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy;
 import org.gridsuite.filter.server.service.DirectoryService;
-import org.gridsuite.filter.server.utils.FilterWithEquipmentTypesUtils;
-import org.gridsuite.filter.utils.EquipmentType;
 import org.gridsuite.filter.utils.FilterServiceUtils;
 import org.gridsuite.filter.utils.FilterType;
+import org.gridsuite.filter.utils.FiltersWithEquipmentTypes;
 import org.gridsuite.filter.utils.expertfilter.FilterCycleDetector;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.http.HttpStatus;
@@ -41,7 +36,6 @@
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.*;
-import java.util.Comparator;
 import java.util.stream.Collectors;
 
 /**
@@ -171,8 +165,9 @@ private AbstractFilter doUpdateFilter(UUID id, AbstractFilter newFilter, String
             newFilter.setId(id);
 
             FilterLoader filterLoader = uuids -> uuids.stream()
-                .map(uuid -> uuid.equals(id) ? newFilter : this.repositoriesService.getFilter(uuid).orElse(null))
+                .map(uuid -> uuid.equals(id) ? newFilter : repositoriesService.getFilter(uuid).orElse(null))
                 .toList();
+
             try {
                 FilterCycleDetector.checkNoCycle(newFilter, filterLoader);
             } catch (FilterCycleException exception) {
@@ -251,55 +246,10 @@ public List<IdentifiableAttributes> evaluateFilter(AbstractFilter filter, UUID n
 
     @Transactional(readOnly = true)
     public FilteredIdentifiables evaluateFiltersWithEquipmentTypes(FiltersWithEquipmentTypes filtersWithEquipmentTypes, UUID networkUuid, String variantId) {
-        Map<String, IdentifiableAttributes> result = new TreeMap<>();
-        Map<String, IdentifiableAttributes> notFound = new TreeMap<>();
         Network network = getNetwork(networkUuid, variantId);
         FilterLoader filterLoader = this.repositoriesService.getFilterLoader();
 
-        filtersWithEquipmentTypes.filters().forEach((FilterAttributes filterAttributes) -> {
-                UUID filterUuid = filterAttributes.getId();
-                Optional<AbstractFilter> optFilter = this.repositoriesService.getFilter(filterUuid);
-                if (optFilter.isEmpty()) {
-                    return;
-                }
-                AbstractFilter filter = optFilter.get();
-                Objects.requireNonNull(filter);
-                EquipmentType filterEquipmentType = filter.getEquipmentType();
-                FilteredIdentifiables filteredIdentifiables = filter.toFilteredIdentifiables(FilterServiceUtils.getIdentifiableAttributes(filter, network, filterLoader));
-
-                // unduplicate equipments and merge in common lists
-                if (filteredIdentifiables.notFoundIds() != null) {
-                    filteredIdentifiables.notFoundIds().forEach(element -> notFound.put(element.getId(), element));
-                }
-
-                if (filteredIdentifiables.equipmentIds() != null) {
-                    if (filterEquipmentType != EquipmentType.SUBSTATION && filterEquipmentType != EquipmentType.VOLTAGE_LEVEL) {
-                        filteredIdentifiables.equipmentIds().forEach(element -> result.put(element.getId(), element));
-                    } else {
-                        Set<IdentifiableType> selectedEquipmentTypes = filtersWithEquipmentTypes.selectedEquipmentTypesByFilter()
-                            .stream()
-                            .filter(equipmentTypesByFilterId -> equipmentTypesByFilterId.filterId().equals(filterUuid))
-                            .findFirst()
-                            .map(EquipmentTypesByFilterId::equipmentTypes)
-                            .orElseThrow(
-                                () -> new IllegalStateException("No selected equipment types for filter " + filterUuid
-                                    + " : substation and voltage level filters should contain an equipment types list")
-                            );
-
-                        // This list is the result of the original filter and so necessarily contains a list of IDs of substations or voltage levels
-                        Set<String> filteredEquipmentIds = filteredIdentifiables.equipmentIds().stream().map(IdentifiableAttributes::getId).collect(Collectors.toSet());
-                        List<ExpertFilter> filters = FilterWithEquipmentTypesUtils.createFiltersForSubEquipments(filterEquipmentType,
-                            filteredEquipmentIds,
-                            selectedEquipmentTypes);
-                        filters.stream().flatMap(expertFilter -> getIdentifiableAttributes(expertFilter, networkUuid, variantId, filterLoader).stream())
-                            .forEach(element -> result.put(element.getId(), element));
-                    }
-                }
-            }
-        );
-        return new FilteredIdentifiables(
-            result.values().stream().sorted(Comparator.comparing(e -> e.getType().ordinal())).toList(),
-            notFound.values().stream().sorted(Comparator.comparing(e -> e.getType().ordinal())).toList());
+        return FilterServiceUtils.evaluateFiltersWithEquipmentTypes(filtersWithEquipmentTypes, network, filterLoader);
     }
 
     @Transactional(readOnly = true)

src/main/java/org/gridsuite/filter/server/RepositoryService.java

@@ -5,7 +5,7 @@
 import org.apache.commons.collections4.ListUtils;
 import org.gridsuite.filter.AbstractFilter;
 import org.gridsuite.filter.FilterLoader;
-import org.gridsuite.filter.server.dto.FilterAttributes;
+import org.gridsuite.filter.identifierlistfilter.FilterAttributes;
 import org.gridsuite.filter.server.repositories.expertfilter.ExpertFilterRepository;
 import org.gridsuite.filter.server.repositories.identifierlistfilter.IdentifierListFilterRepository;
 import org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy;

src/main/java/org/gridsuite/filter/server/repositories/FilterRepository.java

@@ -7,6 +7,7 @@
 
 package org.gridsuite.filter.server.repositories;
 
+import org.gridsuite.filter.identifierlistfilter.FilterMetadata;
 import org.gridsuite.filter.server.entities.AbstractFilterEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/org/gridsuite/filter/server/repositories/proxies/AbstractFilterRepositoryProxy.java

@@ -8,9 +8,9 @@
 package org.gridsuite.filter.server.repositories.proxies;
 
 import org.gridsuite.filter.AbstractFilter;
-import org.gridsuite.filter.server.dto.FilterAttributes;
+import org.gridsuite.filter.identifierlistfilter.FilterAttributes;
 import org.gridsuite.filter.server.entities.AbstractFilterEntity;
-import org.gridsuite.filter.server.repositories.FilterMetadata;
+import org.gridsuite.filter.identifierlistfilter.FilterMetadata;
 import org.gridsuite.filter.server.repositories.FilterRepository;
 import org.gridsuite.filter.utils.EquipmentType;
 import org.gridsuite.filter.utils.FilterType;

src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java

@@ -27,17 +27,15 @@
 import org.gridsuite.filter.IFilterAttributes;
 import org.gridsuite.filter.expertfilter.ExpertFilter;
 import org.gridsuite.filter.expertfilter.expertrule.*;
-import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
-import org.gridsuite.filter.identifierlistfilter.FilteredIdentifiables;
-import org.gridsuite.filter.identifierlistfilter.IdentifiableAttributes;
-import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter;
-import org.gridsuite.filter.identifierlistfilter.IdentifierListFilterEquipmentAttributes;
+import org.gridsuite.filter.identifierlistfilter.*;
 import org.gridsuite.filter.server.dto.*;
 import org.gridsuite.filter.server.service.DirectoryService;
 import org.gridsuite.filter.server.utils.MatcherJson;
 import org.gridsuite.filter.server.utils.assertions.Assertions;
 import org.gridsuite.filter.utils.EquipmentType;
+import org.gridsuite.filter.utils.EquipmentTypesByFilterId;
 import org.gridsuite.filter.utils.FilterType;
+import org.gridsuite.filter.utils.FiltersWithEquipmentTypes;
 import org.gridsuite.filter.utils.expertfilter.CombinatorType;
 import org.gridsuite.filter.utils.expertfilter.FieldType;
 import org.gridsuite.filter.utils.expertfilter.OperatorType;