Skip to content

Fix identity variable #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 4, 2025
Merged

Fix identity variable #248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f14beb2
IDENTITY_BASE_URL fix
SauravBizbRolly Jul 4, 2025
1eaeab7
Merge remote-tracking branch 'origin/3.3.0' into 3.3.0
SauravBizbRolly Jul 4, 2025
61c13a1
IDENTITY_BASE_URL fix
SauravBizbRolly Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -79,8 +79,9 @@ public List<BeneficiariesDTO> getBeneficiaryListByIDs(HashSet benIdList, String
header.put("Authorization", auth);
}


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());
Expand Down Expand Up @@ -401,9 +402,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);
Expand Down
Loading