From b1283791caa74fd7c6cf88ea3064a7f3f793cfb8 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Fri, 2 Nov 2018 16:45:21 -0400 Subject: [PATCH] Allow JPA server to restore resources and link to them in a single transaction --- .../fhir/jpa/dao/BaseHapiFhirResourceDao.java | 13 + .../jpa/provider/SystemProviderDstu2Test.java | 158 +++++-- .../jpa/provider/r4/SystemProviderR4Test.java | 61 ++- .../resources/dstu2/createdeletebundle.json | 438 ++++++++++++++++++ .../test/resources/r4/createdeletebundle.json | 37 ++ src/changes/changes.xml | 5 + 6 files changed, 658 insertions(+), 54 deletions(-) create mode 100644 hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json create mode 100644 hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java index d5cc0ce599c..7d7e65ca449 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java @@ -1253,6 +1253,19 @@ public abstract class BaseHapiFhirResourceDao extends B IBaseResource oldResource = toResource(entity, false); + /* + * Mark the entity as not deleted - This is also done in the actual updateInternal() + * method later on so it usually doesn't matter whether we do it here, but in the + * case of a transaction with multiple PUTs we don't get there until later so + * having this here means that a transaction can have a reference in one + * resource to another resource in the same transaction that is being + * un-deleted by the transaction. Wacky use case, sure. But it's real. + * + * See SystemProviderR4Test#testTransactionReSavesPreviouslyDeletedResources + * for a test that needs this. + */ + entity.setDeleted(null); + /* * If we aren't indexing, that means we're doing this inside a transaction. * The transaction will do the actual storage to the database a bit later on, diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java index 99340a794c3..ae52fbdfcd3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java @@ -1,12 +1,25 @@ package ca.uhn.fhir.jpa.provider; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.TimeUnit; - +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.dao.dstu2.BaseJpaDstu2Test; +import ca.uhn.fhir.jpa.rp.dstu2.*; +import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; +import ca.uhn.fhir.model.dstu2.resource.*; +import ca.uhn.fhir.model.dstu2.valueset.BundleTypeEnum; +import ca.uhn.fhir.model.dstu2.valueset.HTTPVerbEnum; +import ca.uhn.fhir.model.primitive.DecimalDt; +import ca.uhn.fhir.model.primitive.IdDt; +import ca.uhn.fhir.model.primitive.StringDt; +import ca.uhn.fhir.rest.api.EncodingEnum; +import ca.uhn.fhir.rest.client.api.IGenericClient; +import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; +import ca.uhn.fhir.rest.server.RestfulServer; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; +import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; +import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; +import ca.uhn.fhir.util.BundleUtil; +import ca.uhn.fhir.util.TestUtil; +import com.google.common.base.Charsets; import org.apache.commons.io.IOUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -17,46 +30,32 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.r4.model.IdType; import org.junit.AfterClass; import org.junit.Before; -import org.junit.Test; import org.junit.Ignore; +import org.junit.Test; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.dao.dstu2.BaseJpaDstu2Test; -import ca.uhn.fhir.jpa.rp.dstu2.*; -import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; -import ca.uhn.fhir.model.dstu2.resource.*; -import ca.uhn.fhir.model.dstu2.valueset.BundleTypeEnum; -import ca.uhn.fhir.model.dstu2.valueset.HTTPVerbEnum; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.client.api.IGenericClient; -import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; -import ca.uhn.fhir.rest.server.RestfulServer; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; -import ca.uhn.fhir.util.TestUtil; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; public class SystemProviderDstu2Test extends BaseJpaDstu2Test { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SystemProviderDstu2Test.class); private static RestfulServer myRestServer; private static IGenericClient ourClient; private static FhirContext ourCtx; private static CloseableHttpClient ourHttpClient; - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SystemProviderDstu2Test.class); private static Server ourServer; private static String ourServerBase; - @AfterClass - public static void afterClassClearContext() throws Exception { - ourServer.stop(); - TestUtil.clearAllStaticFieldsForUnitTest(); - } - - @Before public void beforeStartServer() throws Exception { if (myRestServer == null) { @@ -72,9 +71,23 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { OrganizationResourceProvider organizationRp = new OrganizationResourceProvider(); organizationRp.setDao(myOrganizationDao); + LocationResourceProvider locationRp = new LocationResourceProvider(); + locationRp.setDao(myLocationDao); + + BinaryResourceProvider binaryRp = new BinaryResourceProvider(); + binaryRp.setDao(myBinaryDao); + + DiagnosticReportResourceProvider diagnosticReportRp = new DiagnosticReportResourceProvider(); + diagnosticReportRp.setDao(myDiagnosticReportDao); + DiagnosticOrderResourceProvider diagnosticOrderRp = new DiagnosticOrderResourceProvider(); + diagnosticOrderRp.setDao(myDiagnosticOrderDao); + PractitionerResourceProvider practitionerRp = new PractitionerResourceProvider(); + practitionerRp.setDao(myPractitionerDao); + + RestfulServer restServer = new RestfulServer(ourCtx); restServer.setPagingProvider(new FifoMemoryPagingProvider(10).setDefaultPageSize(10)); - restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp); + restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp, binaryRp, locationRp, diagnosticReportRp, diagnosticOrderRp, practitionerRp); restServer.setPlainProviders(mySystemProvider); @@ -157,10 +170,10 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { ourLog.info(response); assertThat(response, not(containsString("_format"))); assertEquals(200, http.getStatusLine().getStatusCode()); - + Bundle responseBundle = ourCtx.newXmlParser().parseResource(Bundle.class, response); assertEquals(BundleTypeEnum.SEARCH_RESULTS, responseBundle.getTypeElement().getValueAsEnum()); - + } finally { http.close(); } @@ -179,10 +192,10 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { } } - @Transactional(propagation=Propagation.NEVER) + @Transactional(propagation = Propagation.NEVER) @Test public void testSuggestKeywords() throws Exception { - + Patient patient = new Patient(); patient.addName().addFamily("testSuggest"); IIdType ptId = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless(); @@ -197,21 +210,21 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { obs.getSubject().setReference(ptId); obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL"); myObservationDao.update(obs, mySrd); - + HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml"); CloseableHttpResponse http = ourHttpClient.execute(get); try { assertEquals(200, http.getStatusLine().getStatusCode()); String output = IOUtils.toString(http.getEntity().getContent(), StandardCharsets.UTF_8); ourLog.info(output); - + Parameters parameters = ourCtx.newXmlParser().parseResource(Parameters.class, output); assertEquals(2, parameters.getParameter().size()); assertEquals("keyword", parameters.getParameter().get(0).getPart().get(0).getName()); assertEquals(new StringDt("ZXCVBNM"), parameters.getParameter().get(0).getPart().get(0).getValue()); assertEquals("score", parameters.getParameter().get(0).getPart().get(1).getName()); assertEquals(new DecimalDt("1.0"), parameters.getParameter().get(0).getPart().get(1).getValue()); - + } finally { http.close(); } @@ -227,7 +240,7 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { obs.getSubject().setReference(ptId); obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL"); myObservationDao.create(obs, mySrd); - + HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords"); CloseableHttpResponse http = ourHttpClient.execute(get); try { @@ -238,7 +251,7 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { } finally { http.close(); } - + get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything"); http = ourHttpClient.execute(get); try { @@ -269,6 +282,44 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { assertEquals("get-resource-counts", op.getCode()); } + @Test + public void testTransactionReSavesPreviouslyDeletedResources() throws IOException { + + for (int i = 0; i < 10; i++) { + ourLog.info("** Beginning pass {}", i); + + Bundle input = myFhirCtx.newJsonParser().parseResource(Bundle.class, IOUtils.toString(getClass().getResourceAsStream("/dstu2/createdeletebundle.json"), Charsets.UTF_8)); + ourClient.transaction().withBundle(input).execute(); + + myPatientDao.read(new IdType("Patient/Patient1063259")); + + deleteAllOfType("Binary"); + deleteAllOfType("Location"); + deleteAllOfType("DiagnosticReport"); + deleteAllOfType("Observation"); + deleteAllOfType("DiagnosticOrder"); + deleteAllOfType("Practitioner"); + deleteAllOfType("Patient"); + deleteAllOfType("Organization"); + + try { + myPatientDao.read(new IdType("Patient/Patient1063259")); + fail(); + } catch (ResourceGoneException e) { + // good + } + + } + + } + + private void deleteAllOfType(String theType) { + BundleUtil.toListOfResources(myFhirCtx, ourClient.search().forResource(theType).execute()) + .forEach(t -> { + ourClient.delete().resourceById(t.getIdElement()).execute(); + }); + } + @Test public void testTransactionFromBundle() throws Exception { InputStream bundleRes = SystemProviderDstu2Test.class.getResourceAsStream("/transaction_link_patient_eve.xml"); @@ -372,20 +423,20 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { @Test public void testTransactionSearch() throws Exception { - for (int i = 0; i < 20; i ++) { + for (int i = 0; i < 20; i++) { Patient p = new Patient(); p.addName().addFamily("PATIENT_" + i); myPatientDao.create(p, mySrd); } - + Bundle req = new Bundle(); req.setType(BundleTypeEnum.TRANSACTION); req.addEntry().getRequest().setMethod(HTTPVerbEnum.GET).setUrl("Patient?"); Bundle resp = ourClient.transaction().withBundle(req).execute(); ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp)); - + assertEquals(1, resp.getEntry().size()); - Bundle respSub = (Bundle)resp.getEntry().get(0).getResource(); + Bundle respSub = (Bundle) resp.getEntry().get(0).getResource(); assertEquals("self", respSub.getLink().get(0).getRelation()); assertEquals(ourServerBase + "/Patient", respSub.getLink().get(0).getUrl()); assertEquals("next", respSub.getLink().get(1).getRelation()); @@ -396,20 +447,20 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { @Test public void testTransactionCount() throws Exception { - for (int i = 0; i < 20; i ++) { + for (int i = 0; i < 20; i++) { Patient p = new Patient(); p.addName().addFamily("PATIENT_" + i); myPatientDao.create(p, mySrd); } - + Bundle req = new Bundle(); req.setType(BundleTypeEnum.TRANSACTION); req.addEntry().getRequest().setMethod(HTTPVerbEnum.GET).setUrl("Patient?_summary=count"); Bundle resp = ourClient.transaction().withBundle(req).execute(); ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp)); - + assertEquals(1, resp.getEntry().size()); - Bundle respSub = (Bundle)resp.getEntry().get(0).getResource(); + Bundle respSub = (Bundle) resp.getEntry().get(0).getResource(); assertEquals(20, respSub.getTotal().intValue()); assertEquals(0, respSub.getEntry().size()); } @@ -423,9 +474,16 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test { ourLog.info(output); assertEquals(200, http.getStatusLine().getStatusCode()); } finally { - IOUtils.closeQuietly(http);; + IOUtils.closeQuietly(http); + ; } } + @AfterClass + public static void afterClassClearContext() throws Exception { + ourServer.stop(); + TestUtil.clearAllStaticFieldsForUnitTest(); + } + } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java index 0a74eb50b8b..1c1b2903a0b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java @@ -3,9 +3,7 @@ package ca.uhn.fhir.jpa.provider.r4; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.provider.SystemProviderDstu2Test; -import ca.uhn.fhir.jpa.rp.r4.ObservationResourceProvider; -import ca.uhn.fhir.jpa.rp.r4.OrganizationResourceProvider; -import ca.uhn.fhir.jpa.rp.r4.PatientResourceProvider; +import ca.uhn.fhir.jpa.rp.r4.*; import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.EncodingEnum; @@ -17,8 +15,10 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; +import ca.uhn.fhir.util.BundleUtil; import ca.uhn.fhir.util.TestUtil; import ca.uhn.fhir.validation.ResultSeverityEnum; +import com.google.common.base.Charsets; import org.apache.commons.io.IOUtils; import org.apache.http.Header; import org.apache.http.client.methods.CloseableHttpResponse; @@ -42,6 +42,7 @@ import org.junit.*; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; @@ -88,8 +89,21 @@ public class SystemProviderR4Test extends BaseJpaR4Test { OrganizationResourceProvider organizationRp = new OrganizationResourceProvider(); organizationRp.setDao(myOrganizationDao); + LocationResourceProvider locationRp = new LocationResourceProvider(); + locationRp.setDao(myLocationDao); + + BinaryResourceProvider binaryRp = new BinaryResourceProvider(); + binaryRp.setDao(myBinaryDao); + + DiagnosticReportResourceProvider diagnosticReportRp = new DiagnosticReportResourceProvider(); + diagnosticReportRp.setDao(myDiagnosticReportDao); + ServiceRequestResourceProvider diagnosticOrderRp = new ServiceRequestResourceProvider(); + diagnosticOrderRp.setDao(myServiceRequestDao); + PractitionerResourceProvider practitionerRp = new PractitionerResourceProvider(); + practitionerRp.setDao(myPractitionerDao); + RestfulServer restServer = new RestfulServer(ourCtx); - restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp); + restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp, locationRp, binaryRp, diagnosticReportRp, diagnosticOrderRp, practitionerRp); restServer.setPlainProviders(mySystemProvider); @@ -385,6 +399,45 @@ public class SystemProviderR4Test extends BaseJpaR4Test { assertEquals("201 Created", resp.getEntry().get(0).getResponse().getStatus()); } + + @Test + public void testTransactionReSavesPreviouslyDeletedResources() throws IOException { + + for (int i = 0; i < 10; i++) { + ourLog.info("** Beginning pass {}", i); + + Bundle input = myFhirCtx.newJsonParser().parseResource(Bundle.class, IOUtils.toString(getClass().getResourceAsStream("/r4/createdeletebundle.json"), Charsets.UTF_8)); + ourClient.transaction().withBundle(input).execute(); + + myPatientDao.read(new IdType("Patient/Patient1063259")); + + deleteAllOfType("Binary"); + deleteAllOfType("Location"); + deleteAllOfType("DiagnosticReport"); + deleteAllOfType("Observation"); + deleteAllOfType("ServiceRequest"); + deleteAllOfType("Practitioner"); + deleteAllOfType("Patient"); + deleteAllOfType("Organization"); + + try { + myPatientDao.read(new IdType("Patient/Patient1063259")); + fail(); + } catch (ResourceGoneException e) { + // good + } + + } + + } + + private void deleteAllOfType(String theType) { + BundleUtil.toListOfResources(myFhirCtx, ourClient.search().forResource(theType).execute()) + .forEach(t -> { + ourClient.delete().resourceById(t.getIdElement()).execute(); + }); + } + @Test public void testTransactionDeleteWithDuplicateDeletes() throws Exception { myDaoConfig.setAllowInlineMatchUrlReferences(true); diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json b/hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json new file mode 100644 index 00000000000..acd21119b49 --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json @@ -0,0 +1,438 @@ + { + "resourceType": "Bundle", + "type": "transaction", + "entry": [ + { + "fullUrl": "Organization/OrgSJHMC", + "resource": { + "resourceType": "Organization", + "id": "OrgSJHMC", + "identifier": [ + { + "system": "http://www.foo.com/fhir/OrganizationIdentifier", + "value": "SJHMC" + } + ], + "name": "SJHMC" + }, + "request": { + "method": "PUT", + "url": "Organization/OrgSJHMC" + } + }, + { + "fullUrl": "Binary/BinaryQ4564699444", + "resource": { + "resourceType": "Binary", + "id": "BinaryQ4564699444", + "contentType": "text/plain", + "content": "MSH|^~\&|HNAM|SJHMC|HNAM|SJHMC|20160314110329||ORU^R01|Q4564699444|T|2.4||||||8859/1PID|1|963258|963258^^^SJHMC_MRN^MRN~1063259^^^AZ_EID||Boba^Fett||19711012|F||1|124 W THOMAS RD^^PHOENIX^AZ^85013||(602)666-5555|(000)000-0000|1|S|NON|18513341^^^SJHMC_FIN||||2|||0PV1|1|P|TOW8^8T22^01^SJHMC|R|||057539^Fgdeg^Ugngx^^^^^^SJHMC_ORG_DOCNUM^1699710046|057539^Fgdeg^Ugngx^^^^^^SJHMC_ORG_DOCNUM^1699710046||LTS||||RA|||057539^Fgdeg^Ugngx^^^^^^SJHMC_ORG_DOCNUM^1699710046|I||E|||||||||||||||||||SJHMC||A|||20160313090000ORC|REOBR|1|5674832^HNAM_ORDERID||SPATH^Surgical Pathology Report|||20160313103900|||||||||12345^TestG^ED Physician||||00010SP20160000336^HNA_ACCN~41673658^HNA_ACCNID||20160313105850||AP|F||1|||||&Rigpmga&Ntgaai-CC&&&Application Sys Analyst II - L||12345^TestG^ED PhysicianOBX|1|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|2|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|3|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|4|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|5|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                              Surgical Pathology Report||||||F|||20160313105850OBX|6|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|7|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Collected Date/Time    Received Date/Time               Accession Number||||||F|||20160313105850OBX|8|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     03/13/2016 10:39:00    03/13/2016 10:52:50              10-SP-17-000336||||||F|||20160313105850OBX|9|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     MST                    MST||||||F|||20160313105850OBX|10|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|11|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                                      Diagnosis||||||F|||20160313105850OBX|12|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     1-3.  Lung, left upper lobe, CT guided biopsies with touch preparation:||||||F|||20160313105850OBX|13|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||       - Poorly differentiated non-small cell carcinoma, pending special stains||||||F|||20160313105850OBX|14|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|15|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Ntgaai-CC Rigpmga, Application Sys Analyst II - L||||||F|||20160313105850OBX|16|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     (Electronically signed)||||||F|||20160313105850OBX|17|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Verified: 03/13/2016 10:58||||||F|||20160313105850OBX|18|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     NR /NR||||||F|||20160313105850OBX|19|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|20|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                                Clinical Information||||||F|||20160313105850OBX|21|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Pre-op diagnosis: Transplant||||||F|||20160313105850OBX|22|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Procedure: Biopsy||||||F|||20160313105850OBX|23|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Post-op diagnosis: N/A||||||F|||20160313105850OBX|24|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Clinical History: Lung transplant||||||F|||20160313105850OBX|25|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|26|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                                 Specimen Submitted||||||F|||20160313105850OBX|27|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     LUNG, TRNSBR BX||||||F|||20160313105850OBX|28|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|29|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                                  Gross Description||||||F|||20160313105850OBX|30|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     1. Received in formalin labeled with the patient's name, medical record||||||F|||20160313105850OBX|31|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     number and left upper lobe core biopsy, is a single red-tan, variegated,||||||F|||20160313105850OBX|32|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     friable soft tissue core, 0.9 cm.  The specimen is entirely submitted in||||||F|||20160313105850OBX|33|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     cassette 1A.||||||F|||20160313105850OBX|34|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|35|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     2. Received in formalin labeled with the patient's name, medical record||||||F|||20160313105850OBX|36|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     number and left upper lobe core biopsy, are two pale gray, friable soft||||||F|||20160313105850OBX|37|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     tissue cores, 0.4, and 1.0 cm.  The specimen is entirely submitted in||||||F|||20160313105850OBX|38|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     cassette 2A.  A quick stain is prepared and examined.||||||F|||20160313105850OBX|39|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|40|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Quick Stain Interpretation: [JME]||||||F|||20160313105850OBX|41|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||       QS1: Positive.||||||F|||20160313105850OBX|42|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|43|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     3.  Received in formalin labeled with the patient's name, medical record||||||F|||20160313105850OBX|44|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     number and left upper lobe core biopsy, is a single red-tan soft tissue||||||F|||20160313105850OBX|45|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     core, 0.5 cm.  The specimen is entirely submitted in cassette 3A.||||||F|||20160313105850OBX|46|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|47|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||                               Microscopic Description||||||F|||20160313105850OBX|48|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     Microscopic examination performed on all histologic sections.And also found incidental lung nodule.||||||F|||20160313105850OBX|49|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|50|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||||||||F|||20160313105850OBX|51|TX|SURGPATH^Surgical Pathology Report^^SPATH^Surgical Pathology Report||     ZZTEST, TRANSPLANT                     1516050(SJH)||||||F|||20160313105850" + }, + "request": { + "method": "POST", + "url": "Binary" + } + }, + { + "fullUrl": "Patient/Patient1063259", + "resource": { + "resourceType": "Patient", + "id": "Patient1063259", + "extension": [ + { + "url": "http://www.foo.com/fhir/extensions/CurrentWorkFlow", + "valueString": "pulmonary" + } + ], + "identifier": [ + { + "system": "http://www.foo.com/fhir/identifier-type/EnterpriseId", + "value": "1063259" + }, + { + "type": { + "coding": [ + { + "system": "http://www.foo.com/Patient/UnknownCode", + "code": "MRN", + "display": "MRN" + } + ] + }, + "system": "http://www.foo.com/fhir/identifier-type/MR", + "value": "963258" + }, + { + "type": { + "coding": [ + { + "system": "http://www.foo.com/Patient/UnknownCode", + "code": "MRN", + "display": "MRN" + } + ] + }, + "system": "http://www.foo.com/fhir/identifier-type/MRN", + "value": "963258" + }, + { + "system": "http://www.foo.com/fhir/identifier-type/", + "value": "1063259" + }, + { + "type": { + "coding": [ + { + "system": "http://hl7.org/fhir/identifier-type", + "code": "AN", + "display": "Account number" + } + ] + }, + "system": "http://www.foo.com/fhir/identifier-type/AN", + "value": "18513341" + } + ], + "name": [ + { + "use": "usual", + "family": [ + "Boba" + ], + "given": [ + "Fett" + ] + } + ], + "telecom": [ + { + "system": "phone", + "value": "(602)666-5555", + "use": "home" + }, + { + "system": "phone", + "value": "(000)000-0000", + "use": "work" + } + ], + "gender": "female", + "birthDate": "1971-10-12", + "address": [ + { + "line": [ + "124 W THOMAS RD" + ], + "city": "PHOENIX", + "state": "AZ", + "postalCode": "85013" + } + ], + "maritalStatus": { + "coding": [ + { + "system": "http://hl7.org/fhir/v3/MaritalStatus", + "code": "S", + "display": "Never Married" + } + ] + }, + "multipleBirthInteger": 0, + "communication": [ + { + "language": { + "coding": [ + { + "code": "1" + } + ] + }, + "preferred": true + } + ], + "active": false + }, + "request": { + "method": "PUT", + "url": "Patient/Patient1063259" + } + }, + { + "fullUrl": "Practitioner/Pract057539", + "resource": { + "resourceType": "Practitioner", + "id": "Pract057539", + "identifier": [ + { + "use": "official", + "system": "http://www.foo.com/fhir/PractitionerIdentifier", + "value": "057539" + } + ], + "name": { + "family": [ + "Fgdeg" + ], + "given": [ + "Ugngx" + ] + }, + "gender": "unknown", + "practitionerRole": [ + { + "role": { + "coding": [ + { + "system": "http://hl7.org/fhir/practitioner-role", + "code": "doctor", + "display": "Doctor" + } + ] + } + } + ], + "communication": [ + { + "coding": [ + { + "code": "1" + } + ] + } + ] + }, + "request": { + "method": "PUT", + "url": "Practitioner/Pract057539" + } + }, + { + "fullUrl": "Practitioner/Pract12345", + "resource": { + "resourceType": "Practitioner", + "id": "Pract12345", + "identifier": [ + { + "use": "official", + "system": "http://www.foo.com/fhir/PractitionerIdentifier", + "value": "12345" + } + ], + "name": { + "family": [ + "TestG" + ], + "given": [ + "ED Physician" + ] + }, + "gender": "unknown", + "practitionerRole": [ + { + "role": { + "coding": [ + { + "system": "http://hl7.org/fhir/practitioner-role", + "code": "doctor", + "display": "Doctor" + } + ] + } + } + ], + "communication": [ + { + "coding": [ + { + "code": "1" + } + ] + } + ] + }, + "request": { + "method": "PUT", + "url": "Practitioner/Pract12345" + } + }, + { + "fullUrl": "Location/LocTOW8.8T22.01", + "resource": { + "resourceType": "Location", + "id": "LocTOW8.8T22.01", + "identifier": [ + { + "system": "http://www.foo.com/fhir/LocationIdentifier", + "value": "TOW8.8T22.01" + } + ], + "name": "SJHMC" + }, + "request": { + "method": "PUT", + "url": "Location/LocTOW8.8T22.01" + } + }, + { + "fullUrl": "Observation/ObxSURGPATH0", + "resource": { + "resourceType": "Observation", + "id": "ObxSURGPATH0", + "identifier": [ + { + "type": { + "coding": [ + { + "system": "http://www.foo.com/fhir/", + "code": "LOOKUP", + "display": "LOOKUP" + } + ] + }, + "value": "_SURGPATH" + } + ], + "status": "final", + "code": { + "coding": [ + { + "system": "http://www.foo.com/Observation/UnknownCode", + "code": "SURGPATH", + "display": "SURGPATH" + } + ] + }, + "subject": { + "reference": "Patient/Patient1063259", + "display": "Boba Fett " + }, + "effectiveDateTime": "2016-03-13T15:58:50Z", + "issued": "2016-03-13T15:58:50Z", + "performer": [ + { + "reference": "Practitioner/Pract12345" + } + ], + "valueString": "\\\\n\\\\n\\\\n\\\\n Surgical Pathology Report\\\\n\\\\n Collected Date/Time Received Date/Time Accession Number\\\\n 03/13/2016 10:39:00 03/13/2016 10:52:50 10-SP-17-000336\\\\n MST MST\\\\n\\\\n Diagnosis\\\\n 1-3. Lung, left upper lobe, CT guided biopsies with touch preparation:\\\\n - Poorly differentiated non-small cell carcinoma, pending special stains\\\\n\\\\n Ntgaai-CC Rigpmga, Application Sys Analyst II - L\\\\n (Electronically signed)\\\\n Verified: 03/13/2016 10:58\\\\n NR /NR\\\\n\\\\n Clinical Information\\\\n Pre-op diagnosis: Transplant\\\\n Procedure: Biopsy\\\\n Post-op diagnosis: N/A\\\\n Clinical History: Lung transplant\\\\n\\\\n Specimen Submitted\\\\n LUNG, TRNSBR BX\\\\n\\\\n Gross Description\\\\n 1. Received in formalin labeled with the patient's name, medical record\\\\n number and left upper lobe core biopsy, is a single red-tan, variegated,\\\\n friable soft tissue core, 0.9 cm. The specimen is entirely submitted in\\\\n cassette 1A.\\\\n\\\\n 2. Received in formalin labeled with the patient's name, medical record\\\\n number and left upper lobe core biopsy, are two pale gray, friable soft\\\\n tissue cores, 0.4, and 1.0 cm. The specimen is entirely submitted in\\\\n cassette 2A. A quick stain is prepared and examined.\\\\n\\\\n Quick Stain Interpretation: [JME]\\\\n QS1: Positive.\\\\n\\\\n 3. Received in formalin labeled with the patient's name, medical record\\\\n number and left upper lobe core biopsy, is a single red-tan soft tissue\\\\n core, 0.5 cm. The specimen is entirely submitted in cassette 3A.\\\\n\\\\n Microscopic Description\\\\n Microscopic examination performed on all histologic sections.And also found incidental lung nodule.\\\\n\\\\n\\\\n ZZTEST, TRANSPLANT 1516050(SJH)", + "device": { + "display": "EMR" + } + }, + "request": { + "method": "PUT", + "url": "Observation/ObxSURGPATH0" + } + }, + { + "fullUrl": "DiagnosticReport/ReportSPATH", + "resource": { + "resourceType": "DiagnosticReport", + "id": "ReportSPATH", + "identifier": [ + { + "system": "http://www.foo.com/fhir/DiagnosticReport", + "value": "5674832" + } + ], + "status": "final", + "category": { + "coding": [ + { + "system": "http://www.foo.com/DiagnosticReport/UnknownCode", + "code": "00010SP20160000336", + "display": "00010SP20160000336" + } + ], + "text": "00010SP20160000336" + }, + "code": { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "SPATH", + "display": "Surgical Pathology Report" + } + ], + "text": "Surgical Pathology Report" + }, + "subject": { + "reference": "Patient/Patient1063259", + "display": "Boba Fett " + }, + "effectiveDateTime": "2016-03-13T15:39:00Z", + "issued": "2016-03-13T15:58:50Z", + "performer": { + "reference": "Practitioner/Pract12345" + }, + "request": [ + { + "reference": "DiagnosticOrder/ORCSPATH" + } + ], + "result": [ + { + "reference": "Observation/ObxSURGPATH0" + } + ] + }, + "request": { + "method": "PUT", + "url": "DiagnosticReport/ReportSPATH" + } + }, + { + "fullUrl": "DiagnosticOrder/ORCSPATH", + "resource": { + "resourceType": "DiagnosticOrder", + "id": "ORCSPATH", + "extension": [ + { + "url": "http://www.foo.com/fhir/extensions/ModalityType", + "valueString": "AP" + }, + { + "url": "http://www.foo.com/fhir/extensions/SendingApplication", + "valueString": "EPIC" + } + ], + "subject": { + "reference": "Patient/Patient1063259" + }, + "orderer": { + "reference": "Practitioner/Pract12345" + }, + "identifier": [ + { + "system": "http://www.foo.com/fhir/DiagnosticOrder", + "value": "EPIC_5674832" + } + ], + "status": "completed", + "event": [ + { + "status": "in-progress", + "dateTime": "2016-03-13T15:39:00Z" + } + ], + "item": [ + { + "code": { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "SPATH", + "display": "Surgical Pathology Report" + } + ], + "text": "Surgical Pathology Report" + } + } + ] + }, + "request": { + "method": "PUT", + "url": "DiagnosticOrder/ORCEPIC5674832" + } + } + ] +} diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json b/hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json new file mode 100644 index 00000000000..abe36b0a8a9 --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json @@ -0,0 +1,37 @@ +{ + "resourceType": "Bundle", + "type": "transaction", + "entry": [ + { + "fullUrl": "Patient/Patient1063259", + "resource": { + "resourceType": "Patient", + "id": "Patient1063259", + "identifier": [ + { + "system": "http://www.foo.com/fhir/identifier-type/EnterpriseId", + "value": "1063259" + } + ] + }, + "request": { + "method": "PUT", + "url": "Patient/Patient1063259" + } + }, + { + "fullUrl": "DiagnosticReport/ReportSPATH", + "resource": { + "resourceType": "DiagnosticReport", + "id": "ReportSPATH", + "subject": { + "reference": "Patient/Patient1063259" + } + }, + "request": { + "method": "PUT", + "url": "DiagnosticReport/ReportSPATH" + } + } + ] +} diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3f2c12cf3d6..409fbfa1bc9 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -146,6 +146,11 @@ The JPA server version migrator tool now runs in a multithreaded way, allowing it to upgrade th database faster when migration tasks require data updates. + + A bug in the JPA server was fixed: When a resource was previously deleted, + a transaction could not be posted that both restored the deleted resource but + also contained references to the now-restored resource. +