Skip to content

Prescription Template API not working #139

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
ravishanigarapu merged 17 commits into from
Jul 11, 2025
Merged

Prescription Template API not working #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b78f364
Update application.properties
ravishanigarapu Apr 15, 2025
fd3b86c
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Apr 17, 2025
e96e479
Swagger changes
ravishanigarapu Apr 17, 2025
8f2c479
Merge branch 'PSMRI:develop' into develop
ravishanigarapu May 14, 2025
8d9b6ab
Merge branch 'PSMRI:develop' into develop
ravishanigarapu May 20, 2025
025784b
AMM-1456 : Skiped jwtToken validation if not present in Cookie or header
ravishanigarapu May 20, 2025
4f3c0f3
Jwtten and user-agent validation
ravishanigarapu May 22, 2025
fc1c59c
null check
ravishanigarapu May 22, 2025
a5b471e
Merge branch 'PSMRI:develop' into develop
ravishanigarapu May 24, 2025
2265fa4
Constants added and null check
ravishanigarapu May 25, 2025
a192cdc
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Jul 8, 2025
3f2c719
Empty check added
ravishanigarapu Jul 10, 2025
07bfc15
Optimized code
ravishanigarapu Jul 10, 2025
65cfb4f
removed commented code
ravishanigarapu Jul 10, 2025
57de999
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Jul 10, 2025
ea0cd8d
Exception Handled and Null conditions added
ravishanigarapu Jul 10, 2025
58766a5
Coderabbit comments addressed
ravishanigarapu Jul 10, 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
6 changes: 3 additions & 3 deletions src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,19 @@ public String updateGeolocationVillage(@RequestBody String requestObj) {
public ResponseEntity<String> getOutreachMasterForState(@PathVariable("stateID") Integer stateID) {
logger.info("get Outreach programs for state with Id ..." + stateID);

OutputResponse outputResponse = new OutputResponse();
OutputResponse response = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");

try {
String resList = locationServiceImpl.getOutreachProgramsList(stateID);
outputResponse.setResponse(resList);
response.setResponse(resList);
} catch (Exception e) {
logger.error("Error while fetching outreach list for stateId" + stateID);
response.setError(500, "Unable to fetch outreach list for stateId" + stateID + "Exception - " + e);
statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
}
return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(), headers, statusCode);
return new ResponseEntity<>(response.toStringWithSerializeNulls(), headers, statusCode);
}
}
165 changes: 94 additions & 71 deletions src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,36 +604,44 @@ public ResponseEntity<String> savePrescriptionTemplatesToServer(List<Prescriptio
return new ResponseEntity<>(outputResponse.toString(),headers,statusCode);
}

@Override
public ResponseEntity<String> savePrescriptionTemplatesToApp(Integer userID, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");

List<PrescriptionTemplates> templateList = prescriptionTemplatesRepo.getPrescriptionTemplatesByUserID(userID);

outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(templateList));

return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(),headers,statusCode);
}

@Override
public ResponseEntity<String> deletePrescriptionTemplates(Integer userID, Integer tempID) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");

prescriptionTemplatesRepo.deletePrescriptionTemplatesByUserIDAndTempID(userID, tempID);

outputResponse.setResponse("Successfully deleted");

return new ResponseEntity<>(outputResponse.toString(),headers,statusCode);
}

@Override
public ResponseEntity<String> savePrescriptionTemplatesToApp(Integer userID, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");
try {
List<PrescriptionTemplates> templateList = prescriptionTemplatesRepo
.getPrescriptionTemplatesByUserID(userID);
outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls()
.create().toJson(templateList));
} catch (Exception e) {
logger.error("Error while fetching Prescription Templates userID : " + userID);
outputResponse.setError(500, "Unable to fetch Prescription Templates userID" + userID + "Exception - " + e);
statusCode = HttpStatus.INTERNAL_SERVER_ERROR;

}
return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(), headers, statusCode);
}

@Override
public ResponseEntity<String> deletePrescriptionTemplates(Integer userID, Integer tempID) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");
try {
prescriptionTemplatesRepo.deletePrescriptionTemplatesByUserIDAndTempID(userID, tempID);
outputResponse.setResponse("Successfully deleted");
} catch (Exception e) {
logger.error("Error while deleting Prescription Templates userID : " + userID + " tempID : " + tempID);
outputResponse.setError(500, "Unable to delete Prescription Templates userID : " + userID + " tempID "
+ tempID + "Exception - " + e);
statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
}
return new ResponseEntity<>(outputResponse.toString(), headers, statusCode);
}

@Override
public ResponseEntity<String> createNewOutreachActivity(OutreachActivity activity, String authorization) {
Expand Down Expand Up @@ -674,45 +682,60 @@ public ResponseEntity<String> createNewOutreachActivity(OutreachActivity activit
return new ResponseEntity<>(outputResponse.toString(),headers,statusCode);
}

@Override
public ResponseEntity<String> getActivitiesByUser(Integer userId, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");

ArrayList<Object[]> activitiesObj = outreachActivityRepo.getActivitiesByUserID(userId);

ArrayList<OutreachActivity> activities = OutreachActivity.getActivitiesForUser(activitiesObj);

outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(activities));

return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(),headers,statusCode);
}

@Override
public ResponseEntity<String> getActivityById(Integer activityId, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");

OutreachActivity activity = outreachActivityRepo.findById(activityId).get();

if (activity != null && activity.getImg1Data() != null){
String img1 = Base64.getEncoder().encodeToString(activity.getImg1Data());
activity.setImg1(img1);
}

if (activity != null && activity.getImg2Data() != null){
String img2 = Base64.getEncoder().encodeToString(activity.getImg2Data());
activity.setImg2(img2);
}

outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(activity));

return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(),headers,statusCode);
}
@Override
public ResponseEntity<String> getActivitiesByUser(Integer userId, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");
try {
ArrayList<Object[]> activitiesObj = outreachActivityRepo.getActivitiesByUserID(userId);

ArrayList<OutreachActivity> activities = OutreachActivity.getActivitiesForUser(activitiesObj);

outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls()
.create().toJson(activities));
} catch (Exception e) {
logger.error("Encountered exception while fetching activity userId : " + userId);
outputResponse.setError(500, "Encountered exception while fetching activity. " + e);
statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
}
return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(), headers, statusCode);
}

@Override
public ResponseEntity<String> getActivityById(Integer activityId, String authorization) {
OutputResponse outputResponse = new OutputResponse();
HttpStatus statusCode = HttpStatus.OK;

MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
headers.add("Content-Type", "application/json");
try {
Optional<OutreachActivity> activityOptional = outreachActivityRepo.findById(activityId);
if (activityOptional.isPresent()) {
OutreachActivity activity = activityOptional.get();
if (activity.getImg1Data() != null) {
String img1 = Base64.getEncoder().encodeToString(activity.getImg1Data());
activity.setImg1(img1);
}

if (activity.getImg2Data() != null) {
String img2 = Base64.getEncoder().encodeToString(activity.getImg2Data());
activity.setImg2(img2);
}

outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls()
.create().toJson(activity));
}else {
outputResponse.setError(404, "Activity not found with ID : "+activityId);
statusCode = HttpStatus.NOT_FOUND;
}
} catch (Exception e) {
logger.error("Encountered exception while fetching activity activityId " + activityId);
outputResponse.setError(500, "Encountered exception while fetching activity. " + e);
statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
}
return new ResponseEntity<>(outputResponse.toStringWithSerializeNulls(), headers, statusCode);
}
}
Loading