feat : improve getClosableSurveyUnits to add new type (#211)

* feat : improve getClosableSurveyUnits to add new type

Author: corbininsee

src/main/java/fr/insee/pearljam/api/repository/SurveyUnitRepository.java

@@ -122,9 +122,39 @@ AND co.type NOT IN ('INA','NOA')
         )
     )
 """)
-	List<SurveyUnit> findClosableIascoSurveyUnitId(@Param("ids") List<String> ids);
+	List<SurveyUnit> findClosableHousef2fSurveyUnitId(@Param("ids") List<String> ids);
 
+	@Query(value = """
+    SELECT su
+    FROM SurveyUnit su
+    LEFT JOIN FETCH su.identification ident
+    WHERE su.id IN (:ids)
+    """)
+	List<SurveyUnit> findClosableIndf2fFSurveyUnitId(@Param("ids") List<String> ids);
+
+	@Query(value = """
+    SELECT su
+    FROM SurveyUnit su
+    LEFT JOIN FETCH su.identification ident
+    WHERE su.id IN (:ids)
+    """)
+	List<SurveyUnit> findClosableIndf2fnorFSurveyUnitId(@Param("ids") List<String> ids);
 
+	@Query(value = """
+    SELECT su
+    FROM SurveyUnit su
+    LEFT JOIN FETCH su.identification ident
+    WHERE su.id IN (:ids)
+    """)
+	List<SurveyUnit> findClosableIndtelFSurveyUnitId(@Param("ids") List<String> ids);
+
+	@Query(value = """
+    SELECT su
+    FROM SurveyUnit su
+    LEFT JOIN FETCH su.identification ident
+    WHERE su.id IN (:ids)
+    """)
+	List<SurveyUnit> findClosableIndtelnorFSurveyUnitId(@Param("ids") List<String> ids);
 
 		@Query(value="SELECT su FROM SurveyUnit su "
 		+" LEFT JOIN fetch su.comments"

src/main/java/fr/insee/pearljam/api/service/impl/SurveyUnitServiceImpl.java

@@ -12,6 +12,7 @@
 import fr.insee.pearljam.api.repository.*;
 import fr.insee.pearljam.api.service.SurveyUnitService;
 import fr.insee.pearljam.api.service.SurveyUnitUpdateService;
+import java.util.function.Function;
 import fr.insee.pearljam.api.service.UserService;
 import fr.insee.pearljam.api.service.UtilsService;
 import fr.insee.pearljam.api.surveyunit.dto.ContactOutcomeDto;
@@ -36,7 +37,6 @@
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author scorcaud
@@ -56,7 +56,6 @@ public class SurveyUnitServiceImpl implements SurveyUnitService {
 	private final SurveyUnitRepository surveyUnitRepository;
 	private final SurveyUnitTempZoneRepository surveyUnitTempZoneRepository;
 	private final AddressRepository addressRepository;
-	private final ContactOutcomeRepository contactOutcomeRepository;
 	private final StateRepository stateRepository;
 	private final InterviewerRepository interviewerRepository;
 	private final CampaignRepository campaignRepository;
@@ -310,22 +309,33 @@ public List<SurveyUnitCampaignDto> getClosableSurveyUnits(HttpServletRequest req
 		List<String> lstOuId = userService.getUserOUs(userId, true).stream().map(OrganizationUnitDto::getId)
 				.toList();
 
-		List<String> noIdentSurveyUnitIds = surveyUnitRepository
-				.findSurveyUnitIdsOfOrganizationUnitsInProcessingPhaseByIdentificationConfiguration(
-						System.currentTimeMillis(), lstOuId, IdentificationConfiguration.NOIDENT);
-		List<String> iascoSurveyUnitIds = surveyUnitRepository
-				.findSurveyUnitIdsOfOrganizationUnitsInProcessingPhaseByIdentificationConfiguration(
-						System.currentTimeMillis(), lstOuId, IdentificationConfiguration.IASCO);
-
-		// apply different business rules to select SU
-		List<SurveyUnit> noIdentSurveyUnitsToCheck = surveyUnitRepository
-				.findClosableNoIdentSurveyUnitId(noIdentSurveyUnitIds);
-		List<SurveyUnit> iascoSurveyUnitsToCheck = surveyUnitRepository
-				.findClosableIascoSurveyUnitId(iascoSurveyUnitIds);
-
-		// merge lists
-		List<SurveyUnit> suToCheck = Stream.concat(noIdentSurveyUnitsToCheck.stream(), iascoSurveyUnitsToCheck.stream())
-				.toList();
+		// Retrieve SurveyUnitIds for each configuration
+		Map<IdentificationConfiguration, List<String>> surveyUnitIdsByConfig = Arrays.stream(IdentificationConfiguration.values())
+				.collect(Collectors.toMap(
+						config -> config,
+						config -> surveyUnitRepository.findSurveyUnitIdsOfOrganizationUnitsInProcessingPhaseByIdentificationConfiguration(
+								System.currentTimeMillis(), lstOuId, config)
+				));
+
+		// Mapping between each configuration and the appropriate method to retrieve closable units
+		Map<IdentificationConfiguration, Function<List<String>, List<SurveyUnit>>> closableSurveyUnitMethods = Map.of(
+				IdentificationConfiguration.NOIDENT, surveyUnitRepository::findClosableNoIdentSurveyUnitId,
+				IdentificationConfiguration.IASCO, surveyUnitRepository::findClosableHousef2fSurveyUnitId,
+				IdentificationConfiguration.HOUSEF2F, surveyUnitRepository::findClosableHousef2fSurveyUnitId,
+				IdentificationConfiguration.INDF2F, surveyUnitRepository::findClosableIndf2fFSurveyUnitId,
+				IdentificationConfiguration.INDF2FNOR, surveyUnitRepository::findClosableIndf2fnorFSurveyUnitId,
+				IdentificationConfiguration.INDTEL, surveyUnitRepository::findClosableIndtelFSurveyUnitId,
+				IdentificationConfiguration.INDTELNOR, surveyUnitRepository::findClosableIndtelnorFSurveyUnitId
+		);
+
+
+		// Retrieving SurveyUnits to check
+		List<SurveyUnit> suToCheck = surveyUnitIdsByConfig.entrySet().stream()
+				.flatMap(entry -> {
+					IdentificationConfiguration config = entry.getKey();
+					List<String> surveyUnitIds = entry.getValue();
+					return closableSurveyUnitMethods.getOrDefault(config, ids -> List.of()).apply(surveyUnitIds).stream();
+				}).toList();
 
 		Map<String, String> mapQuestionnaireStateBySu = Collections.emptyMap();
 

src/test/java/fr/insee/pearljam/domain/campaign/service/dummy/SurveyUnitFakeRepository.java

@@ -47,7 +47,27 @@ public List<SurveyUnit> findClosableNoIdentSurveyUnitId(List<String> ids) {
     }
 
     @Override
-    public List<SurveyUnit> findClosableIascoSurveyUnitId(List<String> ids) {
+    public List<SurveyUnit> findClosableHousef2fSurveyUnitId(List<String> ids) {
+        return List.of();
+    }
+
+    @Override
+    public List<SurveyUnit> findClosableIndf2fFSurveyUnitId(List<String> ids) {
+        return List.of();
+    }
+
+    @Override
+    public List<SurveyUnit> findClosableIndf2fnorFSurveyUnitId(List<String> ids) {
+        return List.of();
+    }
+
+    @Override
+    public List<SurveyUnit> findClosableIndtelFSurveyUnitId(List<String> ids) {
+        return List.of();
+    }
+
+    @Override
+    public List<SurveyUnit> findClosableIndtelnorFSurveyUnitId(List<String> ids) {
         return List.of();
     }