From f14beb2e24cd413d863baf05d0e84ec6da34c71b Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 4 Jul 2025 06:58:48 +0530 Subject: [PATCH 1/2] IDENTITY_BASE_URL fix --- .../beneficiary/IdentityBeneficiaryServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java index 48d5aef7..5c27c251 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -52,7 +52,7 @@ public class IdentityBeneficiaryServiceImpl implements IdentityBeneficiaryServic private InputMapper inputMapper = new InputMapper(); private String identityBaseURL = ConfigProperties.getPropertyByName("identity-api-url"); private String identity1097BaseURL = ConfigProperties.getPropertyByName("identity-1097-api-url"); - private static final String IDENTITY_BASE_URL = "IDENTITY_BASE_URL"; + private static final String IDENTITY_BASE_URL = "https://amritdemo.piramalswasthya.org"; private static final String BEN_GEN = ConfigProperties.getPropertyByName("genben-api"); private static final String BEN_GEN_API_URL = ConfigProperties.getPropertyByName("generateBeneficiaryIDs-api-url"); @@ -80,7 +80,7 @@ public List getBeneficiaryListByIDs(HashSet benIdList, String } result = httpUtils.post(ConfigProperties.getPropertyByName("identity-api-url-getByBenRegIdList").replace( - IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : identityBaseURL)), benIdList.toString(), header); + IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : "https://amritdemo.piramalswasthya.org")), benIdList.toString(), header); OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class); if (identityResponse != null && identityResponse.getStatusCode() == OutputResponse.USERID_FAILURE) { throw new IEMRException(identityResponse.getErrorMessage()); @@ -401,9 +401,9 @@ public String getIdentityResponse(String request, String auth, Boolean is1097) t if (auth != null) { header.put("Authorization", auth); } - String baseUrl = is1097 ? identity1097BaseURL : identityBaseURL; - String apiUrl = baseUrl + ConfigProperties.getPropertyByName("identity-api-url-benCreate"); + String apiUrl = ConfigProperties.getPropertyByName("identity-api-url-benCreate") + .replace(IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : identityBaseURL)); logger.info("Calling URL: {}", apiUrl); logger.info("Request Payload: {}", request); From 61c13a175da4a67df1974c9f211b4233bd93f6ab Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 4 Jul 2025 07:00:34 +0530 Subject: [PATCH 2/2] IDENTITY_BASE_URL fix --- .../service/beneficiary/IdentityBeneficiaryServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java index 5c27c251..c3bc662d 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -79,6 +79,7 @@ public List getBeneficiaryListByIDs(HashSet benIdList, String header.put("Authorization", auth); } + result = httpUtils.post(ConfigProperties.getPropertyByName("identity-api-url-getByBenRegIdList").replace( IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : "https://amritdemo.piramalswasthya.org")), benIdList.toString(), header); OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class);