From 16dca5c2ec809486fbc55880295b065d910231df Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 21 May 2025 01:09:43 +0530 Subject: [PATCH 1/8] 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 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 Date: Wed, 21 May 2025 01:20:38 +0530 Subject: [PATCH 2/8] 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); From ad4cb574a6a9d72b0a03e4e5f50d9c94ff7de261 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Sat, 24 May 2025 00:21:07 +0530 Subject: [PATCH 3/8] fix: updated ci properties for prod --- src/main/environment/common_ci.properties | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 4498835..4bdf776 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -40,7 +40,7 @@ clientSecret=@env.NDHM_ABHA_CLIENT_SECRET_KEY@ ##Default ABDM Facility ID abdmFacilityId= @env.ABDM_FACILITY_ID@ -ndhmuserAuthenticate=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/sessions +ndhmuserAuthenticate=@env.ABDM_BASE_URL@/gateway/v0.5/sessions ndhmGenerateOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/generateOtp ndhmVerifyOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/verifyOtp ndhmCreateHealthID=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/createHealthId @@ -57,9 +57,9 @@ abdmcreateHealthIdWithPreVerified= @env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registra ##CareContext Creation API -generateOTPForCareContext=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/users/auth/init -addCareContext = @env.ABDM_HIECM_BASE_URL@/gateway/v0.5/links/link/add-contexts -validateOTPForCareContext=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/users/auth/confirm +generateOTPForCareContext=@env.ABDM_BASE_URL@/gateway/v0.5/users/auth/init +addCareContext = @env.ABDM_BASE_URL@/gateway/v0.5/links/link/add-contexts +validateOTPForCareContext=@env.ABDM_BASE_URL@/gateway/v0.5/users/auth/confirm ##ABHA Card API ## Auth init - aadhar / mobile @@ -73,12 +73,12 @@ generateHealthCard=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/health/facility/getPngCa generateHealthIDCard=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/account/getPngCard ## Generate Notify SMS once episode completed -generateABDM_NotifySMS=@env.ABDM_HIECM_BASE_URL@/gateway/v1/patients/sms/notify2 +generateABDM_NotifySMS=@env.ABDM_BASE_URL@/gateway/v1/patients/sms/notify2 ##verifyBio -abdmVerifyBio=@env.ABDM_BASE_URL@/api/v1/registration/aadhaar/verifyBio -abdmGenerateMobileOTP=@env.ABDM_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP -abdmConfirmAadhaarBio=@env.ABDM_BASE_URL@/api/v1/auth/confirmWithAadhaarBio +abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio +abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP +abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio abdmAccountProfile=@env.ABDM_BASE_URL@/api/v1/account/profile ##ABDM Facility services @@ -86,17 +86,17 @@ getAbdmFacilityServicies= @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/bridge- ##ABDM V3 APIs abdmV3UserAuthenticate = @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/sessions -getAuthCertPublicKey = @env.ABDM_BASE_URL@/abha/api/v3/profile/public/certificate -requestOtpForEnrollment = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/request/otp -abhaEnrollByAadhaar = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/enrol/byAadhaar -printAbhaCard = @env.ABDM_BASE_URL@/abha/api/v3/profile/account/abha-card -abhaLoginRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/request/otp -verifyAbhaLogin = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/verify -abhaProfileLoginVerifyUser = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/verify/user -requestAuthByAbdm = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/auth/byAbdm -webLoginAbhaRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/request/otp -webLoginAbhaVerify = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/verify -webLoginPhrCard = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card +getAuthCertPublicKey = @env.ABDM_ABHA_URL@/abha/api/v3/profile/public/certificate +requestOtpForEnrollment = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/request/otp +abhaEnrollByAadhaar = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/enrol/byAadhaar +printAbhaCard = @env.ABDM_ABHA_URL@/abha/api/v3/profile/account/abha-card +abhaLoginRequestOtp = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/request/otp +verifyAbhaLogin = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify +abhaProfileLoginVerifyUser = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify/user +requestAuthByAbdm = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/auth/byAbdm +webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/request/otp +webLoginAbhaVerify = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/verify +webLoginPhrCard = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card x-CM-ID=@env.X_CM_ID@ abhaMode=@env.ABHA_MODE@ From ee53b5a81e70dc133b1e7babe6a60db7d145e97f Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Sat, 24 May 2025 01:11:57 +0530 Subject: [PATCH 4/8] fix: updated ci properties for abdm --- src/main/environment/common_ci.properties | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 4bdf776..e0acf3b 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -79,24 +79,24 @@ generateABDM_NotifySMS=@env.ABDM_BASE_URL@/gateway/v1/patients/sms/notify2 abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio -abdmAccountProfile=@env.ABDM_BASE_URL@/api/v1/account/profile +abdmAccountProfile=@env.ABDM_ACCOUNT_ID_BASE_URL@/api/v1/account/profile ##ABDM Facility services getAbdmFacilityServicies= @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/bridge-services ##ABDM V3 APIs abdmV3UserAuthenticate = @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/sessions -getAuthCertPublicKey = @env.ABDM_ABHA_URL@/abha/api/v3/profile/public/certificate -requestOtpForEnrollment = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/request/otp -abhaEnrollByAadhaar = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/enrol/byAadhaar -printAbhaCard = @env.ABDM_ABHA_URL@/abha/api/v3/profile/account/abha-card -abhaLoginRequestOtp = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/request/otp -verifyAbhaLogin = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify -abhaProfileLoginVerifyUser = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify/user -requestAuthByAbdm = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/auth/byAbdm -webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/request/otp -webLoginAbhaVerify = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/verify -webLoginPhrCard = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card +getAuthCertPublicKey = @env.ABDM_ABHA_V3_URL@/v3/profile/public/certificate +requestOtpForEnrollment = @env.ABDM_ABHA_V3_URL@/v3/enrollment/request/otp +abhaEnrollByAadhaar = @env.ABDM_ABHA_V3_URL@/v3/enrollment/enrol/byAadhaar +printAbhaCard = @env.ABDM_ABHA_V3_URL@/v3/profile/account/abha-card +abhaLoginRequestOtp = @env.ABDM_ABHA_V3_URL@/v3/profile/login/request/otp +verifyAbhaLogin = @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify +abhaProfileLoginVerifyUser = @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify/user +requestAuthByAbdm = @env.ABDM_ABHA_V3_URL@/v3/enrollment/auth/byAbdm +webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/login/abha/request/otp +webLoginAbhaVerify = @env.ABDM_PHR_URL@/login/abha/verify +webLoginPhrCard = @env.ABDM_PHR_URL@/login/profile/abha/phr-card x-CM-ID=@env.X_CM_ID@ abhaMode=@env.ABHA_MODE@ From 97df66fe002ec97b8838a45bca4159b7cf1ed5cf Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 12:32:03 +0530 Subject: [PATCH 5/8] fix: updated fasterxml jackson dependency to fix scheduler issue --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c35711b..8a82c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -133,13 +133,13 @@ com.fasterxml.jackson.core - jackson-databind - 2.17.0-rc1 + jackson-annotations + 2.19.0 com.fasterxml.jackson.core jackson-core - 2.17.0-rc1 + 2.19.0 From d9e9a7d925c98c12baec646d93ea14fd765ad555 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 13:58:03 +0530 Subject: [PATCH 6/8] fix: updated jackson version --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8a82c9d..c9b852f 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,11 @@ jackson-annotations 2.19.0 + + com.fasterxml.jackson.core + jackson-databind + 2.19.0 + com.fasterxml.jackson.core jackson-core From 029baf2fef02ef59879c4c3bb75dcc99afb1f3ae Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 14:10:51 +0530 Subject: [PATCH 7/8] fix: removed versioning for jackson --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index c9b852f..dde9daa 100644 --- a/pom.xml +++ b/pom.xml @@ -134,17 +134,14 @@ com.fasterxml.jackson.core jackson-annotations - 2.19.0 com.fasterxml.jackson.core jackson-databind - 2.19.0 com.fasterxml.jackson.core jackson-core - 2.19.0 From dd01b9d61a42222a7a4b493c73df03ae3c43f7db Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 30 May 2025 14:35:27 +0530 Subject: [PATCH 8/8] fix: Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f1e4da..dde9daa 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ com.fasterxml.jackson.core - jackson-annotationsjackson-annotations com.fasterxml.jackson.core