From 8bdac2d1e4c716e710a317e1d7585b3ca6223295 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 12:23:11 +0530 Subject: [PATCH 1/7] fix: add logs --- .../service/beneficiary/IdentityBeneficiaryServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 c31a927f..992e7b9f 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -529,8 +529,10 @@ public List generateBeneficiaryIDs(String request, String a if (auth != null) { header.put("Authorization", auth); } + logger.info("Request to generate ben IDs: " + request); + logger.info("Generating ben IDs API URL: " + BEN_GEN + BEN_GEN_API_URL); result = httpUtils.post(BEN_GEN + BEN_GEN_API_URL, request, header); - +logger.info("Response from generate ben IDs: " + result); OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class); if (identityResponse.getStatusCode() == OutputResponse.USERID_FAILURE) { From 3cb2db558e290d3316a77f82d9158e2b169a60e0 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 13:23:13 +0530 Subject: [PATCH 2/7] fix: add url --- src/main/environment/common_example.properties | 1 + .../service/beneficiary/IdentityBeneficiaryServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 09a526dd..6679dbd2 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -208,3 +208,4 @@ captcha.enable-captcha=true cors.allowed-origins=http://localhost:* +sms-consent-source-address='' \ No newline at end of file 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 992e7b9f..25c0cb19 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -529,9 +529,10 @@ public List generateBeneficiaryIDs(String request, String a if (auth != null) { header.put("Authorization", auth); } + logger.info("Request to generate ben IDs: " + request); logger.info("Generating ben IDs API URL: " + BEN_GEN + BEN_GEN_API_URL); - result = httpUtils.post(BEN_GEN + BEN_GEN_API_URL, request, header); + result = httpUtils.post("https://amrittest.piramalswasthya.org/bengen-api/generateBeneficiaryController/generateBeneficiaryIDs", request, header); logger.info("Response from generate ben IDs: " + result); OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class); From 49d390d1375a6e64f1ad6825b5e194ffed13737d Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 13:27:51 +0530 Subject: [PATCH 3/7] fix: add logs --- src/main/java/com/iemr/common/utils/http/HttpUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java index 0f308619..303a4fe5 100644 --- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java @@ -125,6 +125,7 @@ public String post(String uri, String json) { public String post(String uri, String data, HashMap header) { String body; + logger.info("Post uri="+uri); HttpHeaders headers = new HttpHeaders(); if (header.containsKey(headers.AUTHORIZATION)) { headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString()); From b883b1e6acb5e9c1de1fa4f99d5ef3eea9d3b898 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 15:29:12 +0530 Subject: [PATCH 4/7] fix: revert the hardcoded url --- .../service/beneficiary/IdentityBeneficiaryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 25c0cb19..70c2a20c 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -532,7 +532,7 @@ public List generateBeneficiaryIDs(String request, String a logger.info("Request to generate ben IDs: " + request); logger.info("Generating ben IDs API URL: " + BEN_GEN + BEN_GEN_API_URL); - result = httpUtils.post("https://amrittest.piramalswasthya.org/bengen-api/generateBeneficiaryController/generateBeneficiaryIDs", request, header); + result = httpUtils.post(BEN_GEN + BEN_GEN_API_URL, request, header); logger.info("Response from generate ben IDs: " + result); OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class); From b8bfa33054bdde6d8ef616f6db96ea456ca104db Mon Sep 17 00:00:00 2001 From: 5Amogh Date: Fri, 26 Sep 2025 16:25:48 +0530 Subject: [PATCH 5/7] removing static field type for env variables --- .../service/beneficiary/IdentityBeneficiaryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 70c2a20c..2e6ac1d4 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java @@ -59,11 +59,11 @@ public class IdentityBeneficiaryServiceImpl implements IdentityBeneficiaryServic private static final String IDENTITY_BASE_URL = "IDENTITY_BASE_URL"; @Value("${genben-api}") - private static String BEN_GEN ; + private String BEN_GEN ; @Value("${generateBeneficiaryIDs-api-url}") - private static String BEN_GEN_API_URL ; + private String BEN_GEN_API_URL ; @Override From 6a92bac4baf69e2a9321d429f6f586e987e61141 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 20:07:44 +0530 Subject: [PATCH 6/7] fix: merge with 3.6.0 --- src/main/environment/common_example.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index a1c17c16..bea76523 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -208,9 +208,5 @@ captcha.enable-captcha=true cors.allowed-origins=http://localhost:* -<<<<<<< HEAD -sms-consent-source-address='' -======= ### generate Beneficiary IDs URL generateBeneficiaryIDs-api-url=/generateBeneficiaryController/generateBeneficiaryIDs ->>>>>>> 3336300febccd7fc1e5bddef936bb9af11b63f89 From 59de7ac83629e3c7f32b705e7a6479d5bf9262f7 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 26 Sep 2025 20:08:22 +0530 Subject: [PATCH 7/7] fix: merge with 3.6.0 --- src/main/java/com/iemr/common/utils/http/HttpUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java index 303a4fe5..0f308619 100644 --- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java +++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java @@ -125,7 +125,6 @@ public String post(String uri, String json) { public String post(String uri, String data, HashMap header) { String body; - logger.info("Post uri="+uri); HttpHeaders headers = new HttpHeaders(); if (header.containsKey(headers.AUTHORIZATION)) { headers.add(headers.AUTHORIZATION, header.get(headers.AUTHORIZATION).toString());