Skip to content

Removed Exception and logger added #91

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
helenKaryamsetty merged 13 commits into from
May 28, 2025
Merged

Removed Exception and logger added #91

Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cb59cfe
Skip the JwtToken validation if request coming from mobile
ravishanigarapu May 19, 2025
54d149f
Added condition for Android,ios
ravishanigarapu May 19, 2025
d926226
CI properties change
ravishanigarapu May 19, 2025
48ed61d
Verified acceptance crietaria conditions
ravishanigarapu May 20, 2025
8b203a4
Indent and okhttp validated
ravishanigarapu May 20, 2025
06015ae
Handled Authorization in Header
ravishanigarapu May 20, 2025
b6dae7d
Jwttoken and user-agent validation
ravishanigarapu May 22, 2025
db54cfb
null check
ravishanigarapu May 22, 2025
fb8f028
Merge branch 'develop' into develop
ravishanigarapu May 22, 2025
85c394d
Merge branch 'PSMRI:develop' into develop
ravishanigarapu May 28, 2025
080dd67
Try Catch block added
ravishanigarapu May 28, 2025
f7b7d3b
fix: removed exception and added logger
ravishanigarapu May 28, 2025
f6f25c4
Merge branch 'develop' into develop
ravishanigarapu May 28, 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
100 changes: 51 additions & 49 deletions src/main/java/com/wipro/fhir/service/common/CommonServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,68 +173,70 @@ public String processResourceOperation() throws FHIRException {
+ pList.size());
ResourceRequestHandler resourceRequestHandler;
for (PatientEligibleForResourceCreation p : pList) {
try {
logger.info("Bundle creation is started for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode());

logger.info("Bundle creation is started for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode());

resourceRequestHandler = new ResourceRequestHandler();
resourceRequestHandler.setBeneficiaryID(p.getBeneficiaryId());
resourceRequestHandler.setVisitCode(p.getVisitCode());
resourceRequestHandler.setBeneficiaryRegID(p.getBeneficiaryRegID());
resourceRequestHandler = new ResourceRequestHandler();
resourceRequestHandler.setBeneficiaryID(p.getBeneficiaryId());
resourceRequestHandler.setVisitCode(p.getVisitCode());
resourceRequestHandler.setBeneficiaryRegID(p.getBeneficiaryRegID());

// ----------------------------------------------------------------------------------------------
try {

logger.info("*****Fetch beneficiary Id: " + resourceRequestHandler.getBeneficiaryRegID());
List<Object[]> rsObjList = patientEligibleForResourceCreationRepo
.callPatientDemographicSP(resourceRequestHandler.getBeneficiaryRegID());
logger.info("*****Fetch beneficiary Id response recevied :", rsObjList);

PatientDemographic patientDemographicOBJ = patientDemographic.getPatientDemographic(rsObjList);
logger.info("*****Fetch patient after fetching demographics");
if (patientDemographicOBJ != null) {
addCareContextToMongo(patientDemographicOBJ, p);
logger.info("*****Add to mongo success done");
if (patientDemographicOBJ.getPreferredPhoneNo() != null)
sendAbdmAdvSMS(patientDemographicOBJ.getPreferredPhoneNo());
else
try {

logger.info("*****Fetch beneficiary Id: " + resourceRequestHandler.getBeneficiaryRegID());
List<Object[]> rsObjList = patientEligibleForResourceCreationRepo
.callPatientDemographicSP(resourceRequestHandler.getBeneficiaryRegID());
logger.info("*****Fetch beneficiary Id response recevied :", rsObjList);

PatientDemographic patientDemographicOBJ = patientDemographic.getPatientDemographic(rsObjList);
logger.info("*****Fetch patient after fetching demographics");
if (patientDemographicOBJ != null) {
addCareContextToMongo(patientDemographicOBJ, p);
logger.info("*****Add to mongo success done");
if (patientDemographicOBJ.getPreferredPhoneNo() != null)
sendAbdmAdvSMS(patientDemographicOBJ.getPreferredPhoneNo());
else
logger.error(
"Advertisement sms could not be sent as beneficiary phone no not found");
} else
throw new FHIRException(
"Advertisement sms could not be sent as beneficiary phone no not found");
} else
throw new FHIRException(
"Beneficiary not found, benRegId = " + resourceRequestHandler.getBeneficiaryRegID());
"Beneficiary not found, benRegId = " + resourceRequestHandler.getBeneficiaryRegID());

} catch (Exception e) {
logger.error(e.getMessage());
}
} catch (Exception e) {
logger.error(e.getMessage());
}
// ----------------------------------------------------------------------------------------------

// 1. OP consult resource bundle
int i = oPConsultRecordBundle.processOPConsultRecordBundle(resourceRequestHandler, p);
// 2. diagnostic report record budle
int j = diagnosticReportRecordBundle.processDiagnosticReportRecordBundle(resourceRequestHandler, p);
// 3. prescription Bundle
int k = prescriptionBundle.processPrescriptionRecordBundle(resourceRequestHandler, p);

logger.info("The value of i: " + i + " The value of j: " + j + " The value of k: " + k);
// 1. OP consult resource bundle
int i = oPConsultRecordBundle.processOPConsultRecordBundle(resourceRequestHandler, p);
// 2. diagnostic report record budle
int j = diagnosticReportRecordBundle.processDiagnosticReportRecordBundle(resourceRequestHandler, p);
// 3. prescription Bundle
int k = prescriptionBundle.processPrescriptionRecordBundle(resourceRequestHandler, p);

if (i > 0 && j > 0 && k > 0) {
logger.info("The value of i: " + i + " The value of j: " + j + " The value of k: " + k);

// update the processed flag in trigger table
p.setProcessed(true);
PatientEligibleForResourceCreation resultSet = patientEligibleForResourceCreationRepo.save(p);
if (resultSet != null && resultSet.getId().compareTo(BigInteger.ZERO) > 0)
logger.info("processed flag updated successfully after FHIR resource creation");
if (i > 0 && j > 0 && k > 0) {

response = "Bundle creation is success for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode();
// update the processed flag in trigger table
p.setProcessed(true);
PatientEligibleForResourceCreation resultSet = patientEligibleForResourceCreationRepo.save(p);
if (resultSet != null && resultSet.getId().compareTo(BigInteger.ZERO) > 0)
logger.info("processed flag updated successfully after FHIR resource creation");

logger.info("Bundle creation is success for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode());
}
response = "Bundle creation is success for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode();

// adv SMS - ABDM notify2 API
logger.info("Bundle creation is success for BenID : " + p.getBeneficiaryId() + " | BenRegID : "
+ p.getBeneficiaryRegID() + " | VisitCode : " + p.getVisitCode());
}

// adv SMS - ABDM notify2 API
} catch (Exception e) {
logger.error("Fhir Schedule run failed " +e.getMessage());
}
}
return response;
}
Expand Down