From 16dca5c2ec809486fbc55880295b065d910231df Mon Sep 17 00:00:00 2001
From: KA40094929 <KA40094929@APL-5CD1394ZJT>
Date: Wed, 21 May 2025 01:09:43 +0530
Subject: [PATCH 1/2] fix(bug): isNewAbha null issue

---
 .../java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java | 2 +-
 .../com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java  | 2 +-
 .../com/wipro/fhir/service/healthID/HealthIDServiceImpl.java  | 4 ++--
 .../wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java   | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java b/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java
index 8a0fdef..a3fedc8 100644
--- a/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java
+++ b/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java
@@ -76,6 +76,6 @@ public class BenHealthIDMapping {
 	private Timestamp lastModDate;
 	
 	@Transient
-	private boolean isNewAbha;
+	private Boolean isNewAbha;
 
 }
diff --git a/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java b/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java
index d79212e..1dd01b4 100644
--- a/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java
+++ b/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java
@@ -83,6 +83,6 @@ public interface BenHealthIDMappingRepo extends CrudRepository<BenHealthIDMappin
 	Integer updateFacilityIdForVisit(@Param("visitCode") BigInteger visitCode, @Param("abdmFacilityId") String abdmFacilityId);
 	
 	@Query(value = "select isNewAbha from t_healthid where HealthIdNumber=:healthIdNumber order by 1 desc limit 1", nativeQuery = true)
-	boolean getIsNewAbha(@Param("healthIdNumber") String healthIdNumber);
+	Boolean getIsNewAbha(@Param("healthIdNumber") String healthIdNumber);
 
 }
diff --git a/src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java b/src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java
index 7fef7de..8351878 100644
--- a/src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java
+++ b/src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java
@@ -123,8 +123,8 @@ public String getBenHealthID(Long benRegID) {
 		if(healthDetailsList.size() > 0) {
 			for(BenHealthIDMapping healthDetails: healthDetailsList) {
 				String healthIdNumber = healthDetails.getHealthIdNumber();
-				boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber);
-				healthDetails.setNewAbha(isNewAbha);
+				Boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber);
+				healthDetails.setIsNewAbha(isNewAbha);
 					
 				healthDetailsWithAbhaList.add(healthDetails);
 			}
diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
index 4ddc4e9..205bb54 100644
--- a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
+++ b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
@@ -211,8 +211,10 @@ public String enrollmentByAadhaar(String request) throws FHIRException {
 						constructHealthIdResponse(healthIDResp, abhaProfileAsJsonObj);
 						healthIDResp.setProviderServiceMapID(loginData.getProviderServiceMapId());
 						healthIDResp.setCreatedBy(loginData.getCreatedBy());
-						if(jsonResponse.get("isNew") != null && jsonResponse.get("isNew").getAsString() == "true") {
+						if(jsonResponse.get("isNew") != null && (jsonResponse.get("isNew").getAsString() == "true")) {
 							healthIDResp.setIsNewAbha(true);
+						} else {
+							healthIDResp.setIsNewAbha(false);
 						}
 						Integer healthIdCount = healthIDRepo.getCountOfHealthIdNumber(healthIDResp.getHealthIdNumber());
 						HealthIDResponse save = healthIDResp;

From 2159bb0ceea04e94dba913e9c4c07e73c353bdbc Mon Sep 17 00:00:00 2001
From: KA40094929 <KA40094929@APL-5CD1394ZJT>
Date: Wed, 21 May 2025 01:20:38 +0530
Subject: [PATCH 2/2] fix: coderabbit suggestions

---
 .../com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
index 205bb54..e25211d 100644
--- a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
+++ b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
@@ -211,7 +211,7 @@ public String enrollmentByAadhaar(String request) throws FHIRException {
 						constructHealthIdResponse(healthIDResp, abhaProfileAsJsonObj);
 						healthIDResp.setProviderServiceMapID(loginData.getProviderServiceMapId());
 						healthIDResp.setCreatedBy(loginData.getCreatedBy());
-						if(jsonResponse.get("isNew") != null && (jsonResponse.get("isNew").getAsString() == "true")) {
+						if(jsonResponse.get("isNew") != null && "true".equals(jsonResponse.get("isNew").getAsString())) {
 							healthIDResp.setIsNewAbha(true);
 						} else {
 							healthIDResp.setIsNewAbha(false);