Skip to content

U4X-1027: Simplify the syncfhirprofile api for how the resourceSearchParam are structured for internal processing. #209

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
Jun 11, 2025
Merged

U4X-1027: Simplify the syncfhirprofile api for how the resourceSearchParam are structured for internal processing. #209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743b824
U4X-1027: Simplify the syncfhirprofile api for how the resourceSearch…
slubwama Jun 2, 2025
475fb5e
Merge branch 'master' of https://github.com/mohuganda/openmrs-module-…
slubwama Jun 11, 2025
5e891e1
change filter to remove unnecessary conditions
slubwama Jun 11, 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
51 changes: 49 additions & 2 deletions .../src/main/java/org/openmrs/module/ugandaemrsync/web/resource/SyncFhirProfileResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import io.swagger.models.properties.BooleanProperty;
import io.swagger.models.properties.IntegerProperty;
import io.swagger.models.properties.DateProperty;
import org.json.JSONArray;
import org.json.JSONObject;
import org.openmrs.api.context.Context;
import org.openmrs.module.ugandaemrsync.api.UgandaEMRSyncService;
import org.openmrs.module.ugandaemrsync.model.SyncFhirProfile;
Expand All @@ -23,11 +25,14 @@
import org.openmrs.module.webservices.rest.web.resource.impl.NeedsPaging;
import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException;
import org.openmrs.module.webservices.rest.web.response.ResponseException;
import org.openmrs.module.webservices.validation.ValidateUtil;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static org.openmrs.module.ugandaemrsync.server.SyncConstant.FHIR_FILTER_OBJECT_STRING;

@Resource(name = RestConstants.VERSION_1 + "/syncfhirprofile", supportedClass = SyncFhirProfile.class, supportedOpenmrsVersions = {"1.9.* - 9.*"})
public class SyncFhirProfileResource extends DelegatingCrudResource<SyncFhirProfile> {

Expand All @@ -36,9 +41,14 @@ public SyncFhirProfile newDelegate() {
return new SyncFhirProfile();
}


@Override
public SyncFhirProfile save(SyncFhirProfile SyncFhirProfile) {
return Context.getService(UgandaEMRSyncService.class).saveSyncFhirProfile(SyncFhirProfile);
public SyncFhirProfile save(SyncFhirProfile syncFhirProfile) {
if (syncFhirProfile.getResourceSearchParameter() != null) {
String resourceSearchParameter = processResourceSearchParameter(syncFhirProfile.getResourceSearchParameter().trim());
syncFhirProfile.setResourceSearchParameter(resourceSearchParameter);
}
return Context.getService(UgandaEMRSyncService.class).saveSyncFhirProfile(syncFhirProfile);
}

@Override
Expand Down Expand Up @@ -326,4 +336,41 @@ public Model getUPDATEModel(Representation rep) {
.property("changedBy", new RefProperty("#/definitions/UserGetRef"))
.property("voidedBy", new RefProperty("#/definitions/UserGetRef"));
}

private String processResourceSearchParameter(String resourceSearchParameter){
JSONObject resourceSearchParameterObject=new JSONObject(resourceSearchParameter);
JSONObject jsonObject=new JSONObject(FHIR_FILTER_OBJECT_STRING);
if(resourceSearchParameterObject.has("encounterFilter") && !resourceSearchParameterObject.getString("encounterFilter").equals("") && resourceSearchParameterObject.getString("encounterFilter").split(",").length > 0){
jsonObject.getJSONObject("encounterFilter").put("type",new JSONArray(resourceSearchParameterObject.getString("encounterFilter").split(",")));
}

if(resourceSearchParameterObject.has("episodeofcareFilter") && !resourceSearchParameterObject.getString("episodeofcareFilter").equals("") && resourceSearchParameterObject.getString("episodeofcareFilter").split(",").length > 0){
jsonObject.getJSONObject("episodeofcareFilter").put("type",new JSONArray(resourceSearchParameterObject.getString("episodeofcareFilter").split(",")));
}

if(resourceSearchParameterObject.has("observationFilter") && !resourceSearchParameterObject.getString("observationFilter").equals("") && resourceSearchParameterObject.getString("observationFilter").split(",").length > 0){
jsonObject.getJSONObject("observationFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("observationFilter").split(",")));
}

if(resourceSearchParameterObject.has("medicationdispenseFilter") && !resourceSearchParameterObject.getString("medicationdispenseFilter").equals("") && resourceSearchParameterObject.getString("medicationdispenseFilter").split(",").length > 0){
jsonObject.getJSONObject("medicationdispenseFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("medicationdispenseFilter").split(",")));
}

if(resourceSearchParameterObject.has("medicationrequestFilter") && !resourceSearchParameterObject.getString("medicationrequestFilter").equals("") && resourceSearchParameterObject.getString("medicationrequestFilter").split(",").length > 0){
jsonObject.getJSONObject("medicationrequestFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("medicationrequestFilter").split(",")));
}

if(resourceSearchParameterObject.has("diagnosticreportFilter") && !resourceSearchParameterObject.getString("diagnosticreportFilter").equals("") && resourceSearchParameterObject.getString("diagnosticreportFilter").split(",").length > 0){
jsonObject.getJSONObject("diagnosticreportFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("diagnosticreportFilter").split(",")));
}

if(resourceSearchParameterObject.has("conditionFilter") && !resourceSearchParameterObject.getString("conditionFilter").equals("") && resourceSearchParameterObject.getString("conditionFilter").split(",").length > 0){
jsonObject.getJSONObject("conditionFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("conditionFilter").split(",")));
}

if(resourceSearchParameterObject.has("servicerequestFilter") && !resourceSearchParameterObject.getString("servicerequestFilter").equals("") && resourceSearchParameterObject.getString("servicerequestFilter").split(",").length > 0){
jsonObject.getJSONObject("servicerequestFilter").put("code",new JSONArray(resourceSearchParameterObject.getString("servicerequestFilter").split(",")));
}
return jsonObject.toString();
}
}