fix colum name

Author: ghazwarhili

src/main/java/org/gridsuite/securityanalysis/server/service/FilterService.java

@@ -7,11 +7,13 @@
 package org.gridsuite.securityanalysis.server.service;
 
 import com.powsybl.network.store.client.NetworkStoreService;
+import lombok.NonNull;
 import org.gridsuite.computation.dto.GlobalFilter;
 import org.gridsuite.computation.dto.ResourceFilterDTO;
-import lombok.NonNull;
 import org.gridsuite.computation.service.AbstractFilterService;
 import org.gridsuite.filter.utils.EquipmentType;
+import org.gridsuite.securityanalysis.server.entities.ContingencyEntity;
+import org.gridsuite.securityanalysis.server.entities.SubjectLimitViolationEntity;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +30,15 @@ public FilterService(
         super(networkStoreService, filterServerBaseUri);
     }
 
-    public Optional<ResourceFilterDTO> getResourceFilter(@NonNull UUID networkUuid, @NonNull String variantId, @NonNull GlobalFilter globalFilter) {
-        return super.getResourceFilter(networkUuid, variantId, globalFilter, List.of(EquipmentType.VOLTAGE_LEVEL), "subjectId");
+    public Optional<ResourceFilterDTO> getResourceFilterN(@NonNull UUID networkUuid, @NonNull String variantId, @NonNull GlobalFilter globalFilter) {
+        return super.getResourceFilter(networkUuid, variantId, globalFilter, List.of(EquipmentType.VOLTAGE_LEVEL), "subjectLimitViolation.subjectId");
+    }
+
+    public Optional<ResourceFilterDTO> getResourceFilterContingencies(@NonNull UUID networkUuid, @NonNull String variantId, @NonNull GlobalFilter globalFilter) {
+        return super.getResourceFilter(networkUuid, variantId, globalFilter, List.of(EquipmentType.LINE), ContingencyEntity.Fields.contingencyId);
+    }
+
+    public Optional<ResourceFilterDTO> getResourceFilterSubjectLimitViolations(@NonNull UUID networkUuid, @NonNull String variantId, @NonNull GlobalFilter globalFilter) {
+        return super.getResourceFilter(networkUuid, variantId, globalFilter, List.of(EquipmentType.VOLTAGE_LEVEL), SubjectLimitViolationEntity.Fields.subjectId);
     }
 }

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisResultService.java

@@ -133,7 +133,7 @@ public List<PreContingencyLimitViolationResultDTO> findNResult(UUID resultUuid,
             allResourceFilters.addAll(resourceFilters);
         }
         if (globalFilter != null) {
-            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilter(networkUuid, variantId, globalFilter);
+            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilterN(networkUuid, variantId, globalFilter);
             resourceGlobalFilters.ifPresent(allResourceFilters::add);
         }
         Specification<PreContingencyLimitViolationEntity> specification = preContingencyLimitViolationSpecificationBuilder.buildSpecification(resultUuid, allResourceFilters);
@@ -311,7 +311,7 @@ public Page<ContingencyEntity> findContingenciesPage(UUID resultUuid, UUID netwo
             allResourceFilters.addAll(resourceFilters);
         }
         if (globalFilter != null) {
-            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilter(networkUuid, variantId, globalFilter);
+            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilterContingencies(networkUuid, variantId, globalFilter);
             resourceGlobalFilters.ifPresent(allResourceFilters::add);
         }
         Specification<ContingencyEntity> specification = contingencySpecificationBuilder.buildSpecification(resultUuid, allResourceFilters);
@@ -355,7 +355,7 @@ public Page<SubjectLimitViolationEntity> findSubjectLimitViolationsPage(UUID res
             allResourceFilters.addAll(resourceFilters);
         }
         if (globalFilter != null) {
-            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilter(networkUuid, variantId, globalFilter);
+            Optional<ResourceFilterDTO> resourceGlobalFilters = filterService.getResourceFilterSubjectLimitViolations(networkUuid, variantId, globalFilter);
             resourceGlobalFilters.ifPresent(allResourceFilters::add);
         }
         Specification<SubjectLimitViolationEntity> specification = subjectLimitViolationSpecificationBuilder.buildSpecification(resultUuid, allResourceFilters);