MOSIP-28646 code changes (mosip#1757)

Co-authored-by: Sowmya Ujjappa Banakar <[email protected]>
sowmya695 · Sep 4, 2023 · 96d5735 · 96d5735
1 parent 2d9f2a7
commit 96d5735
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 32 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
@@ -149,14 +149,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;
@@ -502,7 +496,7 @@ private void createInsertRequest(List<AbisQueueDetails> abisQueueDetails, String
 			abisRequestDto.setReqBatchId(batchId);
 			abisRequestDto.setRefRegtrnId(transactionId);
 
-		
+
 			abisRequestDto.setStatusCode(AbisStatusCode.IN_PROGRESS.toString());
 			abisRequestDto.setStatusComment(null);
 			abisRequestDto.setLangCode(AbisHandlerStageConstant.ENG);
@@ -539,7 +533,7 @@ private void createInsertRequest(List<AbisQueueDetails> abisQueueDetails, String
 	 * @param id          the id
 	 * @param bioRefId    the bio ref id
 	 * @param description
-	 * @param status 
+	 * @param status
 	 * @return the insert request bytes
 	 */
 	private byte[] getInsertRequestBytes(String regId, String id, String process, String bioRefId,
@@ -593,20 +587,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).getSegments());
 

diff --git a/...st/java/io/mosip/registration/processor/abis/handler/stage/test/AbisHandlerStageTest.java b/...st/java/io/mosip/registration/processor/abis/handler/stage/test/AbisHandlerStageTest.java
@@ -202,16 +202,19 @@ public void setUp() throws Exception {
 		ReflectionTestUtils.setField(abisHandlerStage, "internalDomainName", "localhost");
 		Mockito.when(env.getProperty("mosip.registration.processor.datetime.pattern"))
 				.thenReturn("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
+		Map<String, Map<String, List<String>>> biometricModalitySegmentsMapforAgeGroup = new HashMap<String, Map<String, List<String>>>();
 		Map<String, List<String>> biometricModalitySegmentsMap = new HashMap();
-		Map<String, List<String>> biometricModalitySegmentsMapInfant = new HashMap();
-		biometricModalitySegmentsMapInfant.put("Face", getFaceList());
+		Map<String, List<String>> biometricModalitySegmentsMapForInfant = new HashMap();
+		biometricModalitySegmentsMapForInfant.put("Face", getFaceList());
 		biometricModalitySegmentsMap.put("Finger", getFingerList());
 		biometricModalitySegmentsMap.put("Iris", getIrisList());
 		biometricModalitySegmentsMap.put("Face", getFaceList());
-		ReflectionTestUtils.setField(abisHandlerStage, "biometricModalitySegmentsMapInfant", biometricModalitySegmentsMapInfant);
-		ReflectionTestUtils.setField(abisHandlerStage, "biometricModalitySegmentsMapMinor", biometricModalitySegmentsMap);
-		ReflectionTestUtils.setField(abisHandlerStage, "biometricModalitySegmentsMapAdult", biometricModalitySegmentsMap);
+		biometricModalitySegmentsMapforAgeGroup.put("INFANT", biometricModalitySegmentsMapForInfant);
+		biometricModalitySegmentsMapforAgeGroup.put("MINOR", biometricModalitySegmentsMap);
+		biometricModalitySegmentsMapforAgeGroup.put("ADULT", biometricModalitySegmentsMap);
+		biometricModalitySegmentsMapforAgeGroup.put("DEFAULT", biometricModalitySegmentsMap);
+
+		ReflectionTestUtils.setField(abisHandlerStage, "biometricModalitySegmentsMapforAgeGroup", biometricModalitySegmentsMapforAgeGroup);
 		ReflectionTestUtils.setField(abisHandlerStage, "exceptionSegmentsMap", getExceptionModalityMap());
 
 		Mockito.when(env.getProperty("DATASHARECREATEURL")).thenReturn("/v1/datashare/create");
@@ -837,11 +840,12 @@ public void biometricsTypeNotFoundConfig()
 
 		defaultMockToProcess();
 
+		Map<String, Map<String, List<String>>> biometricModalitySegmentsMapforAgeGroup = new HashMap<String, Map<String, List<String>>>();
 		Map<String, List<String>> biometricModalitySegmentsMap = new HashMap();
+
 		biometricModalitySegmentsMap.put("Finger", getFingerList());
 		biometricModalitySegmentsMap.put("Iris", getIrisList());
-		ReflectionTestUtils.setField(abisHandlerStage, "biometricModalitySegmentsMapAdult", biometricModalitySegmentsMap);
-		ReflectionTestUtils.setField(abisHandlerStage, "exceptionSegmentsMap", getExceptionModalityMap());
+		biometricModalitySegmentsMapforAgeGroup.put("DEFAULT", biometricModalitySegmentsMap);
 
 		MessageDTO dto = new MessageDTO();
 		dto.setRid("10003100030001520190422074511");
@@ -968,7 +972,7 @@ private void setMetaInfoMap(List<String> exceptionAttributes) throws ApisResourc
 
 		exceptionBiometrcisMap.put("applicant", applicantExceptionBiometrcisMap);
         String gsonString =mapper.writeValueAsString(exceptionBiometrcisMap);
-        
+
 		metaInfoMap.put("exceptionBiometrics", gsonString);
 		Mockito.when(packetManagerService.getMetaInfo(any(), any(), any())).thenReturn(metaInfoMap);
 	}