HLM-6196: updated @component in validators for client reference id va…

…lidation
egovernments · Jun 17, 2024 · 6e915a0 · 6e915a0
1 parent e9c0367
commit 6e915a0
Show file tree

Hide file tree

Showing 20 changed files with 298 additions and 85 deletions.
diff --git a/...c/main/java/org/egov/household/household/member/validators/HmExistentEntityValidator.java b/...c/main/java/org/egov/household/household/member/validators/HmExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.household.HouseholdMember;
 import org.egov.common.models.household.HouseholdMemberBulkRequest;
 import org.egov.common.models.household.HouseholdMemberSearch;
 import org.egov.common.validator.Validator;
 import org.egov.household.repository.HouseholdMemberRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -24,6 +27,9 @@
  *
  * @author kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class HmExistentEntityValidator implements Validator<HouseholdMemberBulkRequest, HouseholdMember> {
 
     private final HouseholdMemberRepository householdMemberRepository;

diff --git a/...ain/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java b/...ain/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java
@@ -9,19 +9,16 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
-import org.egov.common.models.household.Household;
 import org.egov.common.models.household.HouseholdMember;
 import org.egov.common.models.household.HouseholdMemberBulkRequest;
 import org.egov.common.models.household.HouseholdMemberSearch;
-import org.egov.common.models.household.HouseholdSearch;
 import org.egov.common.validator.Validator;
 import org.egov.household.repository.HouseholdMemberRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import static org.egov.common.utils.CommonUtils.checkNonExistentEntities;
-import static org.egov.common.utils.CommonUtils.getIdFieldName;
 import static org.egov.common.utils.CommonUtils.getIdToObjMap;
 import static org.egov.common.utils.CommonUtils.getMethod;
 import static org.egov.common.utils.CommonUtils.getObjClass;
@@ -73,7 +70,6 @@ public Map<HouseholdMember, List<Error>> validate(HouseholdMemberBulkRequest req
         // Create a map of household members with their IDs as keys
         Map<String, HouseholdMember> iMap = getIdToObjMap(householdMembers
                 .stream().filter(notHavingErrors()).collect(Collectors.toList()), idMethod);
-        // Check if the map is not empty
 
         // Lists to store IDs and client reference IDs
         List<String> idList = new ArrayList<>();
@@ -84,9 +80,9 @@ public Map<HouseholdMember, List<Error>> validate(HouseholdMemberBulkRequest req
             clientReferenceIdList.add(householdMember.getClientReferenceId());
         });
 
+        // Check if the map is not empty
         if (!iMap.isEmpty()) {
-            // Extract IDs from the map
-            List<String> householdMemberIds = new ArrayList<>(iMap.keySet());
+
             // Create a search object for querying existing entities
             HouseholdMemberSearch householdMemberSearch = HouseholdMemberSearch.builder()
                     .clientReferenceId(clientReferenceIdList)

diff --git a/...ehold/src/main/java/org/egov/household/validators/household/HExistentEntityValidator.java b/...ehold/src/main/java/org/egov/household/validators/household/HExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.household.Household;
 import org.egov.common.models.household.HouseholdBulkRequest;
 import org.egov.common.models.household.HouseholdSearch;
 import org.egov.common.validator.Validator;
 import org.egov.household.repository.HouseholdRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -23,6 +26,9 @@
  * This validator checks if the provided household entities already exist in the database based on their client reference IDs.
  * @author kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class HExistentEntityValidator implements Validator<HouseholdBulkRequest, Household> {
 
     private final HouseholdRepository householdRepository;

diff --git a/...ces/individual/src/main/java/org/egov/individual/validators/IExistentEntityValidator.java b/...ces/individual/src/main/java/org/egov/individual/validators/IExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.individual.Individual;
 import org.egov.common.models.individual.IndividualBulkRequest;
 import org.egov.common.models.individual.IndividualSearch;
 import org.egov.common.validator.Validator;
 import org.egov.individual.repository.IndividualRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -23,6 +26,9 @@
  * This validator checks if the provided individual entities already exist in the database based on their client reference IDs.
  * @author kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class IExistentEntityValidator implements Validator<IndividualBulkRequest, Individual> {
 
     private final IndividualRepository individualRepository;

diff --git a/.../individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java b/.../individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java
@@ -72,8 +72,7 @@ public Map<Individual, List<Error>> validate(IndividualBulkRequest request) {
         });
         // Check if the entity map is not empty
         if (!eMap.isEmpty()) {
-            // Extract entity IDs
-            List<String> entityIds = new ArrayList<>(eMap.keySet());
+
             // Create a search object for querying existing entities
             IndividualSearch individualSearch = IndividualSearch.builder()
                     .id(idList)

diff --git a/...s/individual/src/main/java/org/egov/individual/validators/NonExistentEntityValidator.java b/...s/individual/src/main/java/org/egov/individual/validators/NonExistentEntityValidator.java
@@ -4,6 +4,7 @@
 import org.egov.common.models.Error;
 import org.egov.common.models.individual.Individual;
 import org.egov.common.models.individual.IndividualBulkRequest;
+import org.egov.common.models.individual.IndividualSearch;
 import org.egov.common.validator.Validator;
 import org.egov.individual.repository.IndividualRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,10 +57,30 @@ public Map<Individual, List<Error>> validate(IndividualBulkRequest request) {
         Method idMethod = getMethod(GET_ID, objClass);
         Map<String, Individual> iMap = getIdToObjMap(individuals
                 .stream().filter(notHavingErrors()).collect(Collectors.toList()), idMethod);
+        // Lists to store IDs and client reference IDs
+        List<String> idList = new ArrayList<>();
+        List<String> clientReferenceIdList = new ArrayList<>();
+        // Extract IDs and client reference IDs from individual entities
+        individuals.forEach(individual -> {
+            idList.add(individual.getId());
+            clientReferenceIdList.add(individual.getClientReferenceId());
+        });
         if (!iMap.isEmpty()) {
-            List<String> individualIds = new ArrayList<>(iMap.keySet());
-            List<Individual> existingIndividuals = individualRepository.findById(individualIds,
-                    getIdFieldName(idMethod), false).getResponse();
+            // Create a search object for querying existing entities
+            IndividualSearch individualSearch = IndividualSearch.builder()
+                    .id(idList)
+                    .clientReferenceId(clientReferenceIdList)
+                    .build();
+
+            List<Individual> existingIndividuals;
+            try {
+                // Query the repository to find existing entities
+                existingIndividuals = individualRepository.find(individualSearch, individuals.size(), 0,
+                        individuals.get(0).getTenantId(), null, false).getResponse();
+            } catch (Exception e) {
+                // Handle query builder exception
+                throw new RuntimeException(e);
+            }
             List<Individual> nonExistentIndividuals = checkNonExistentEntities(iMap,
                     existingIndividuals, idMethod);
             nonExistentIndividuals.forEach(individual -> {

diff --git a/...oject/src/main/java/org/egov/project/validator/beneficiary/PbExistentEntityValidator.java b/...oject/src/main/java/org/egov/project/validator/beneficiary/PbExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.project.BeneficiaryBulkRequest;
 import org.egov.common.models.project.ProjectBeneficiary;
 import org.egov.common.models.project.ProjectBeneficiarySearch;
 import org.egov.common.validator.Validator;
 import org.egov.project.repository.ProjectBeneficiaryRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -24,6 +27,9 @@
  *
  * @author kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class PbExistentEntityValidator implements Validator<BeneficiaryBulkRequest, ProjectBeneficiary> {
 
     private final ProjectBeneficiaryRepository projectBeneficiaryRepository;

diff --git a/...ct/src/main/java/org/egov/project/validator/beneficiary/PbNonExistentEntityValidator.java b/...ct/src/main/java/org/egov/project/validator/beneficiary/PbNonExistentEntityValidator.java
@@ -1,24 +1,24 @@
 package org.egov.project.validator.beneficiary;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.project.BeneficiaryBulkRequest;
 import org.egov.common.models.project.ProjectBeneficiary;
+import org.egov.common.models.project.ProjectBeneficiarySearch;
 import org.egov.common.validator.Validator;
 import org.egov.project.repository.ProjectBeneficiaryRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import static org.egov.common.utils.CommonUtils.checkNonExistentEntities;
-import static org.egov.common.utils.CommonUtils.getIdFieldName;
 import static org.egov.common.utils.CommonUtils.getIdToObjMap;
 import static org.egov.common.utils.CommonUtils.getMethod;
 import static org.egov.common.utils.CommonUtils.getObjClass;
@@ -49,10 +49,30 @@ public Map<ProjectBeneficiary, List<Error>> validate(BeneficiaryBulkRequest requ
         Method idMethod = getMethod(GET_ID, objClass);
         Map<String, ProjectBeneficiary> iMap = getIdToObjMap(projectBeneficiaries
                 .stream().filter(notHavingErrors()).collect(Collectors.toList()), idMethod);
+        // Lists to store IDs and client reference IDs
+        List<String> idList = new ArrayList<>();
+        List<String> clientReferenceIdList = new ArrayList<>();
+        // Extract IDs and client reference IDs from Project Beneficiary entities
+        projectBeneficiaries.forEach(entity -> {
+            idList.add(entity.getId());
+            clientReferenceIdList.add(entity.getClientReferenceId());
+        });
         if (!iMap.isEmpty()) {
-            List<String> beneficiaryIds = new ArrayList<>(iMap.keySet());
-            List<ProjectBeneficiary> existingProjectBeneficiaries = projectBeneficiaryRepository
-                    .findById(beneficiaryIds, false, getIdFieldName(idMethod));
+            ProjectBeneficiarySearch projectBeneficiarySearch = ProjectBeneficiarySearch.builder()
+                    .clientReferenceId(clientReferenceIdList)
+                    .id(idList)
+                    .build();
+
+            List<ProjectBeneficiary> existingProjectBeneficiaries;
+            try {
+                // Query the repository to find existing entities
+                existingProjectBeneficiaries = projectBeneficiaryRepository.find(projectBeneficiarySearch, projectBeneficiaries.size(), 0,
+                        projectBeneficiaries.get(0).getTenantId(), null, false).getResponse();
+            } catch (Exception e) {
+                // Handle query builder exception
+                throw new RuntimeException(e);
+            }
+
             List<ProjectBeneficiary> nonExistentIndividuals = checkNonExistentEntities(iMap,
                     existingProjectBeneficiaries, idMethod);
             nonExistentIndividuals.forEach(projectBeneficiary -> {

diff --git a/...ices/project/src/main/java/org/egov/project/validator/task/PtExistentEntityValidator.java b/...ices/project/src/main/java/org/egov/project/validator/task/PtExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.project.Task;
 import org.egov.common.models.project.TaskBulkRequest;
 import org.egov.common.models.project.TaskSearch;
 import org.egov.common.validator.Validator;
 import org.egov.project.repository.ProjectTaskRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -24,6 +27,9 @@
  *
  * @author: kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class PtExistentEntityValidator implements Validator<TaskBulkRequest, Task> {
 
     private final ProjectTaskRepository projectTaskRepository;

diff --git a/...s/project/src/main/java/org/egov/project/validator/task/PtNonExistentEntityValidator.java b/...s/project/src/main/java/org/egov/project/validator/task/PtNonExistentEntityValidator.java
@@ -1,26 +1,26 @@
 package org.egov.project.validator.task;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.project.Task;
 import org.egov.common.models.project.TaskBulkRequest;
+import org.egov.common.models.project.TaskSearch;
 import org.egov.common.validator.Validator;
 import org.egov.project.repository.ProjectTaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import static org.egov.common.utils.CommonUtils.checkNonExistentEntities;
-import static org.egov.common.utils.CommonUtils.getIdFieldName;
 import static org.egov.common.utils.CommonUtils.getIdMethod;
 import static org.egov.common.utils.CommonUtils.getIdToObjMap;
 import static org.egov.common.utils.CommonUtils.getMethod;
@@ -55,10 +55,29 @@ public Map<Task, List<Error>> validate(TaskBulkRequest request) {
         Method idMethod = getMethod(GET_ID, objClass);
         Map<String, Task> eMap = getIdToObjMap(entities
                 .stream().filter(notHavingErrors()).collect(Collectors.toList()), idMethod);
+        // Lists to store IDs and client reference IDs
+        List<String> idList = new ArrayList<>();
+        List<String> clientReferenceIdList = new ArrayList<>();
+        // Extract IDs and client reference IDs from Project Task entities
+        entities.forEach(entity -> {
+            idList.add(entity.getId());
+            clientReferenceIdList.add(entity.getClientReferenceId());
+        });
         if (!eMap.isEmpty()) {
-            List<String> entityIds = new ArrayList<>(eMap.keySet());
-            List<Task> existingEntities = projectTaskRepository.findById(entityIds,
-                    getIdFieldName(idMethod), false).getResponse();
+            TaskSearch taskSearch = TaskSearch.builder()
+                    .clientReferenceId(clientReferenceIdList)
+                    .id(idList)
+                    .build();
+
+            List<Task> existingEntities;
+            try {
+                // Query the repository to find existing entities
+                existingEntities = projectTaskRepository.find(taskSearch, entities.size(), 0,
+                        entities.get(0).getTenantId(), null, false).getResponse();
+            } catch (Exception e) {
+                // Handle query builder exception
+                throw new RuntimeException(e);
+            }
             List<Task> nonExistentEntities = checkNonExistentEntities(eMap,
                     existingEntities, idMethod);
             nonExistentEntities.forEach(task -> {

diff --git a/...gement/src/main/java/org/egov/referralmanagement/validator/RmExistentEntityValidator.java b/...gement/src/main/java/org/egov/referralmanagement/validator/RmExistentEntityValidator.java
@@ -5,12 +5,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
 import org.egov.common.models.Error;
 import org.egov.common.models.referralmanagement.Referral;
 import org.egov.common.models.referralmanagement.ReferralBulkRequest;
 import org.egov.common.models.referralmanagement.ReferralSearch;
 import org.egov.common.validator.Validator;
 import org.egov.referralmanagement.repository.ReferralRepository;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import static org.egov.common.utils.CommonUtils.getIdFieldName;
@@ -23,6 +26,9 @@
  * This validator checks if the provided referral entities already exist in the database based on their client reference IDs.
  * @author kanishq-egov
  */
+@Component
+@Order(value = 1)
+@Slf4j
 public class RmExistentEntityValidator implements Validator<ReferralBulkRequest, Referral> {
 
     private final ReferralRepository referralRepository;