honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix operation on nested type-choices in FhirPatch implementation (#4783) 

* Fix operation on nested type-choices in FhirPatch implementation

* Add credit for #4783

---------

Co-authored-by: James Agnew <jamesagnew@gmail.com>
This commit is contained in:
Zach Smith 2023-05-01 11:52:34 +02:00 committed by GitHub
parent 9a095cc2d7
commit 9c1d235f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_8_0/4783-fhirpatch-on-nested-expressions.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 4783
title: "FHIR Patch operations on choice types in nested expressions did not work correctly.
Thanks to Zach Smith for the pull request!"

34
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchApplyR4Test.java
View File

@ -19,6 +19,7 @@ import org.hl7.fhir.r4.model.Patient;
import org.hl7.fhir.r4.model.Questionnaire;
import org.hl7.fhir.r4.model.StringType;
import org.hl7.fhir.r4.model.Type;
import org.hl7.fhir.r4.model.UriType;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -386,7 +387,7 @@ public class FhirPatchApplyR4Test {
Patient patient = new Patient();
patient.setActive(true);
//Given: We create a patch request to add a new active statuts
//Given: We create a patch request to add a new active status
BooleanType theValue = new BooleanType(false);
Parameters patch = new Parameters();
patch.addParameter(createPatchAddOperation("Patient", "active", theValue));
@ -397,6 +398,37 @@ public class FhirPatchApplyR4Test {
//TODO THIS SHOULD THROW AN EXCEPTION. you cannot `add` to a field that is already set.
}
@Test
public void testAddExtensionWithChoiceType() {
FhirPatch svc = new FhirPatch(ourCtx);
Patient patient = new Patient();
Parameters patch = new Parameters();
Parameters.ParametersParameterComponent addOperation = createPatchAddOperation("Patient", "extension", null);
addOperation
.addPart()
.setName("value")
.addPart(
new Parameters.ParametersParameterComponent()
.setName("url")
.setValue(new UriType("http://foo/fhir/extension/foo"))
)
.addPart(
new Parameters.ParametersParameterComponent()
.setName("value")
.setValue(new StringType("foo"))
);
patch.addParameter(addOperation);
svc.apply(patient, patch);
ourLog.debug("Outcome:\n{}", ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(patient));
//Then: it adds the new extension correctly.
assertThat(patient.getExtension(), hasSize(1));
assertThat(patient.getExtension().get(0).getUrl(), is(equalTo("http://foo/fhir/extension/foo")));
assertThat(patient.getExtension().get(0).getValueAsPrimitive().getValueAsString(), is(equalTo("foo")));
}
private Parameters.ParametersParameterComponent createPatchAddOperation(String thePath, String theName, Type theValue) {
return createPatchOperation("add", thePath, theName, theValue, null);
}

4
hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java
View File

@ -225,6 +225,10 @@ public class FhirPatch {
if (value.isPresent()) {
BaseRuntimeChildDefinition partChildDef = childElement.getChildByName(name);
if (partChildDef == null) {
name = name + "[x]";
partChildDef = childElement.getChildByName(name);
}
partChildDef.getMutator().addValue(newValue, value.get());
}

5
pom.xml
View File

@ -863,6 +863,11 @@
<id>delopst</id>
<name>Primož Delopst</name>
</developer>
<developer>
<id>Zach Smith</id>
<name>zachdoctolib</name>
<organization>Doctolib</organization>
</developer>
</developers>
<licenses>