Skip to content

Return OperationOutcome for FHIRServerError #276

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
sameeragunarathne merged 2 commits into from
Apr 3, 2026
Merged

Return OperationOutcome for FHIRServerError #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb061d
Return OperationOutcome for FHIRServerError
mahimadesilva Mar 27, 2026
0b8e76a
Enhance create function to include FHIRContext for including error st…
mahimadesilva Mar 31, 2026
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
42 changes: 21 additions & 21 deletions fhir-service/service.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ service /fhir/r4/Patient on new fhirr4:Listener(config = patientApiConfig) {

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Patient patient) returns r4:DomainResource|error {
return create(fhirConnector, PATIENT, patient.toJson());
return create(fhirConnector, PATIENT, patient.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -627,7 +627,7 @@ service /fhir/r4/Claim on new fhirr4:Listener(config = ClaimApiConfig) {

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Claim claim) returns error|http:Response {
r4:DomainResource createResult = check create(fhirConnector, CLAIM, claim.toJson());
r4:DomainResource createResult = check create(fhirConnector, CLAIM, claim.toJson(), fhirContext);
http:Response response = new;
response.setJsonPayload(createResult.toJson());
return response;
Expand Down Expand Up @@ -695,7 +695,7 @@ service /fhir/r4/ClaimResponse on new fhirr4:Listener(config = claimResponseApiC
// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, ClaimResponse claimResponse) returns error|http:Response {
http:Response response = new;
r4:DomainResource result = check create(fhirConnector, CLAIM_RESPONSE, claimResponse.toJson());
r4:DomainResource result = check create(fhirConnector, CLAIM_RESPONSE, claimResponse.toJson(), fhirContext);
response.setJsonPayload(result.toJson());
response.statusCode = http:STATUS_CREATED;
return response;
Expand Down Expand Up @@ -832,7 +832,7 @@ service /fhir/r4/ExplanationOfBenefit on new fhirr4:Listener(config = eobApiConf

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, ExplanationOfBenefit procedure) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, EXPLANATION_OF_BENEFIT, procedure.toJson());
return create(fhirConnector, EXPLANATION_OF_BENEFIT, procedure.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -887,7 +887,7 @@ service /fhir/r4/MedicationRequest on new fhirr4:Listener(config = medicationReq

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, MedicationRequest medicationRequest) returns error|http:Response {
r4:DomainResource createResult = check create(fhirConnector, MEDICATION_REQUEST, medicationRequest.toJson());
r4:DomainResource createResult = check create(fhirConnector, MEDICATION_REQUEST, medicationRequest.toJson(), fhirContext);
http:Response response = new;
response.setJsonPayload(createResult.toJson());
return response;
Expand Down Expand Up @@ -945,7 +945,7 @@ service /fhir/r4/ServiceRequest on new fhirr4:Listener(config = serviceRequestAp

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, ServiceRequest serviceRequest) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, SERVICE_REQUEST, serviceRequest.toJson());
return create(fhirConnector, SERVICE_REQUEST, serviceRequest.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1000,7 +1000,7 @@ service /fhir/r4/Organization on new fhirr4:Listener(config = organizationApiCon

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Organization organization) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, ORGANIZATION, organization.toJson());
return create(fhirConnector, ORGANIZATION, organization.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1055,7 +1055,7 @@ service /fhir/r4/Practitioner on new fhirr4:Listener(config = practitionerApiCon

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Practitioner practitioner) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, PRACTITIONER, practitioner.toJson());
return create(fhirConnector, PRACTITIONER, practitioner.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1110,7 +1110,7 @@ service /fhir/r4/PractitionerRole on new fhirr4:Listener(config = practitionerRo

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, PractitionerRole practitionerRole) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, PRACTITIONER_ROLE, practitionerRole.toJson());
return create(fhirConnector, PRACTITIONER_ROLE, practitionerRole.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1173,7 +1173,7 @@ service /fhir/r4/AllergyIntolerance on new fhirr4:Listener(config = allergyIntol

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, AllergyIntolerance allergyIntolerance) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, ALLERGY_INTOLERENCE, allergyIntolerance.toJson());
return create(fhirConnector, ALLERGY_INTOLERENCE, allergyIntolerance.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1228,7 +1228,7 @@ service /fhir/r4/Observation on new fhirr4:Listener(config = observationApiConfi

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Observation observation) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, OBSERVATION, observation.toJson());
return create(fhirConnector, OBSERVATION, observation.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1283,7 +1283,7 @@ service /fhir/r4/DiagnosticReport on new fhirr4:Listener(config = diagnosticRepo

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, DiagnosticReport diagnosticReport) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, DIAGNOSTIC_REPORT, diagnosticReport.toJson());
return create(fhirConnector, DIAGNOSTIC_REPORT, diagnosticReport.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1341,7 +1341,7 @@ service /fhir/r4/Encounter on new fhirr4:Listener(config = encounterApiConfig) {

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Encounter procedure) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, ENCOUNTER, procedure.toJson());
return create(fhirConnector, ENCOUNTER, procedure.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1463,7 +1463,7 @@ service /fhir/r4/Questionnaire on new fhirr4:Listener(config = questionnaireApiC
if questionnaire.id is () {
questionnaire.id = uuid:createType1AsString();
}
return create(fhirConnector, QUESTIONNAIRE, questionnaire.toJson());
return create(fhirConnector, QUESTIONNAIRE, questionnaire.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1528,7 +1528,7 @@ service /fhir/r4/QuestionnaireResponse on new fhirr4:Listener(config = questionn
if questionnaireResponse.id is () {
questionnaireResponse.id = uuid:createType1AsString();
}
return create(fhirConnector, QUESTIONNAIRE_RESPONSE, questionnaireResponse.toJson());
return create(fhirConnector, QUESTIONNAIRE_RESPONSE, questionnaireResponse.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1813,7 +1813,7 @@ service /fhir/r4/Library on new fhirr4:Listener(config = libraryApiConfig) {
if library.id is () {
library.id = uuid:createType1AsString();
}
return create(fhirConnector, LIBRARY, library.toJson());
return create(fhirConnector, LIBRARY, library.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -1876,7 +1876,7 @@ service /fhir/r4/Group on new fhirr4:Listener(config = groupApiConfig) {

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, Group fhirGroup) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, GROUP, fhirGroup.toJson());
return create(fhirConnector, GROUP, fhirGroup.toJson(), fhirContext);
}

// Export a group.
Expand Down Expand Up @@ -2263,7 +2263,7 @@ service /fhir/r4/CommunicationRequest on new fhirr4:Listener(config = communicat

// Create a new resource.
isolated resource function post .(r4:FHIRContext fhirContext, CommunicationRequest communicationRequest) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, COMMUNICATION_REQUEST, communicationRequest.toJson());
return create(fhirConnector, COMMUNICATION_REQUEST, communicationRequest.toJson(), fhirContext);
}

// Update the current state of a resource completely.
Expand Down Expand Up @@ -2332,7 +2332,7 @@ service /fhir/r4/ValueSet on new fhirr4:Listener(config = valuesetApiConfig) {
}

isolated resource function post .(r4:FHIRContext fhirContext, r4:ValueSet valueSet) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, VALUE_SET, valueSet.toJson());
return create(fhirConnector, VALUE_SET, valueSet.toJson(), fhirContext);
}

isolated resource function put [string id](r4:FHIRContext fhirContext, r4:ValueSet valueSet) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
Expand Down Expand Up @@ -2416,7 +2416,7 @@ service /fhir/r4/CodeSystem on new fhirr4:Listener(config = codesystemApiConfig)
}

isolated resource function post .(r4:FHIRContext fhirContext, r4:CodeSystem codeSystem) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, CODE_SYSTEM, codeSystem.toJson());
return create(fhirConnector, CODE_SYSTEM, codeSystem.toJson(), fhirContext);
}

isolated resource function put [string id](r4:FHIRContext fhirContext, r4:CodeSystem codeSystem) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
Expand Down Expand Up @@ -2490,7 +2490,7 @@ service /fhir/r4/ConceptMap on new fhirr4:Listener(config = conceptmapApiConfig)
}

isolated resource function post .(r4:FHIRContext fhirContext, r4:ConceptMap conceptMap) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
return create(fhirConnector, CONCEPT_MAP, conceptMap.toJson());
return create(fhirConnector, CONCEPT_MAP, conceptMap.toJson(), fhirContext);
}

isolated resource function put [string id](r4:FHIRContext fhirContext, r4:ConceptMap conceptMap) returns r4:DomainResource|r4:OperationOutcome|r4:FHIRError {
Expand Down
15 changes: 14 additions & 1 deletion fhir-service/source_connect.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,23 @@ import ballerina/http;
import ballerinax/health.clients.fhir as fhirClient;
import ballerinax/health.fhir.r4;

public isolated function create(fhirClient:FHIRConnector fhirConnector, ResourceType resourceType, json payload) returns r4:DomainResource|r4:FHIRError {
public isolated function create(fhirClient:FHIRConnector fhirConnector, ResourceType resourceType, json payload, r4:FHIRContext? fhirContext = ()) returns r4:DomainResource|r4:FHIRError {
fhirClient:FHIRResponse|fhirClient:FHIRError response = fhirConnector->create(payload, returnPreference = "representation");

if response is fhirClient:FHIRError {
if response is fhirClient:FHIRServerError {
int statusCode = response.detail().httpStatusCode;
json|xml body = response.detail().'resource;
if body is json {
r4:OperationOutcome|error operationOutcome = body.cloneWithType();
if operationOutcome is r4:OperationOutcome {
if fhirContext is r4:FHIRContext {
fhirContext.setResponseStatusCode(statusCode);
}
return operationOutcome;
}
}
}
return r4:createFHIRError(response.message(), r4:ERROR, r4:INVALID, httpStatusCode = http:STATUS_BAD_REQUEST);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

Expand Down