Merge pull request #1845 from sowmya695/MOSIP-28646_recent

MOSIP-28646 code changes (#1757) refer previous pr #1767
mosip · Feb 8, 2024 · 7542e26 · 7542e26
2 parents f41f099 + fb071c3
commit 7542e26
Show file tree

Hide file tree

Showing 2 changed files with 1,042 additions and 1,049 deletions.
diff --git a/...ge/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java b/...ge/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java
@@ -153,14 +153,8 @@ public class AbisHandlerStage extends MosipVerticleAPIManager {
 	@Value("${mosip.regproc.data.share.internal.domain.name}")
 	private String internalDomainName;
 
-	@Value("#{${mosip.regproc.abis.handler.biometric-modalities-segments-mapping.INFANT}}")
-	private Map<String, List<String>> biometricModalitySegmentsMapInfant;
-
-	@Value("#{${mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR}}")
-	private Map<String, List<String>> biometricModalitySegmentsMapMinor;
-
-	@Value("#{${mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT}}")
-	private Map<String, List<String>> biometricModalitySegmentsMapAdult;
+	@Value("#{${mosip.regproc.abis.handler.biometric-modalities-segments-mapping-for-age-group}}")
+	private Map<String, Map<String, List<String>>> biometricModalitySegmentsMapforAgeGroup;
 
 	@Value("#{${mosip.regproc.abis.handler.biometric-segments-exceptions-mapping}}")
 	private Map<String, String> exceptionSegmentsMap;
@@ -600,20 +594,15 @@ private String getDataShareUrl(String id, String process) throws Exception {
 
 		Map<String, String> tags = packetManagerService.getAllTags(id);
 		String ageGroup = tags.get("AGE_GROUP");
-
-		if (ageGroup.equalsIgnoreCase("INFANT")) {
-			validateBiometricRecord(biometricRecord, modalities, biometricModalitySegmentsMapInfant,
-					priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
-		} else if (ageGroup.equalsIgnoreCase("MINOR")) {
-			validateBiometricRecord(biometricRecord, modalities, biometricModalitySegmentsMapMinor,
-					priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
-		} else if (ageGroup.equalsIgnoreCase("ADULT")) {
-			validateBiometricRecord(biometricRecord, modalities, biometricModalitySegmentsMapAdult,
-					priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
-		} else {
-			validateBiometricRecord(biometricRecord, modalities, biometricModalitySegmentsMapAdult,
-					priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
+		Map<String, List<String>> biometricModalitySegmentsMap;
+		if(biometricModalitySegmentsMapforAgeGroup.containsKey(ageGroup)){
+			biometricModalitySegmentsMap = biometricModalitySegmentsMapforAgeGroup.get(ageGroup);
+			}
+		else {
+			biometricModalitySegmentsMap = biometricModalitySegmentsMapforAgeGroup.get("DEFAULT");
 		}
+		validateBiometricRecord(biometricRecord, modalities, biometricModalitySegmentsMap,
+					priorityBasedPacketManagerService.getMetaInfo(id, process, ProviderStageName.BIO_DEDUPE));
 
 		byte[] content = cbeffutil.createXML(filterExceptionBiometrics(biometricRecord,id,process).getSegments());