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

Fixes to cascading delete

This commit is contained in:
jamesagnew 2019-07-02 05:41:38 -04:00
parent f20af05897
commit 491776a7b8
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptor.java
View File

@ -96,22 +96,28 @@ public class CascadingDeleteInterceptor {
for (Iterator<DeleteConflict> iter = theConflictList.iterator(); iter.hasNext(); ) { for (Iterator<DeleteConflict> iter = theConflictList.iterator(); iter.hasNext(); ) {
DeleteConflict next = iter.next(); DeleteConflict next = iter.next();
IdDt nextSource = next.getSourceId(); IdDt nextSource = next.getSourceId();
IFhirResourceDao dao = myDaoRegistry.getResourceDao(nextSource.getResourceType()); String nextSourceId = nextSource.toUnqualifiedVersionless().getValue();
// Interceptor call: STORAGE_CASCADE_DELETE if (!cascadedDeletes.contains(nextSourceId)) {
IBaseResource resource = dao.read(nextSource);
HookParams params = new HookParams()
.add(RequestDetails.class, theRequest)
.addIfMatchesType(ServletRequestDetails.class, theRequest)
.add(DeleteConflictList.class, theConflictList)
.add(IBaseResource.class, resource);
JpaInterceptorBroadcaster.doCallHooks(myInterceptorBroadcaster, theRequest, Pointcut.STORAGE_CASCADE_DELETE, params);
// Actually perform the delete IFhirResourceDao dao = myDaoRegistry.getResourceDao(nextSource.getResourceType());
ourLog.info("Have delete conflict {} - Cascading delete", next);
dao.delete(nextSource, theRequest);
cascadedDeletes.add(nextSource.getValue()); // Interceptor call: STORAGE_CASCADE_DELETE
IBaseResource resource = dao.read(nextSource);
HookParams params = new HookParams()
.add(RequestDetails.class, theRequest)
.addIfMatchesType(ServletRequestDetails.class, theRequest)
.add(DeleteConflictList.class, theConflictList)
.add(IBaseResource.class, resource);
JpaInterceptorBroadcaster.doCallHooks(myInterceptorBroadcaster, theRequest, Pointcut.STORAGE_CASCADE_DELETE, params);
// Actually perform the delete
ourLog.info("Have delete conflict {} - Cascading delete", next);
dao.delete(nextSource, theRequest);
cascadedDeletes.add(nextSourceId);
}
} }
return new DeleteConflictOutcome().setShouldRetryCount(MAX_RETRY_ATTEMPTS); return new DeleteConflictOutcome().setShouldRetryCount(MAX_RETRY_ATTEMPTS);
@ -120,7 +126,7 @@ public class CascadingDeleteInterceptor {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private List<String> getCascadedDeletesMap(RequestDetails theRequest, boolean theCreate) { private List<String> getCascadedDeletesMap(RequestDetails theRequest, boolean theCreate) {
List<String> retVal = (List<String>) theRequest.getUserData().get(CASCADED_DELETES_KEY); List<String> retVal = (List<String>) theRequest.getUserData().get(CASCADED_DELETES_KEY);
if (retVal == null) { if (retVal == null && theCreate) {
retVal = new ArrayList<>(); retVal = new ArrayList<>();
theRequest.getUserData().put(CASCADED_DELETES_KEY, retVal); theRequest.getUserData().put(CASCADED_DELETES_KEY, retVal);
} }

14
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/CascadingDeleteInterceptorR4Test.java
View File

@ -38,6 +38,7 @@ public class CascadingDeleteInterceptorR4Test extends BaseResourceProviderR4Test
private CascadingDeleteInterceptor myDeleteInterceptor; private CascadingDeleteInterceptor myDeleteInterceptor;
private IIdType myObservationId; private IIdType myObservationId;
private IIdType myConditionId; private IIdType myConditionId;
private IIdType myEncounterId;
@Override @Override
@Before @Before
@ -59,19 +60,26 @@ public class CascadingDeleteInterceptorR4Test extends BaseResourceProviderR4Test
p.setActive(true); p.setActive(true);
myPatientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless(); myPatientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
Encounter e = new Encounter();
e.setSubject(new Reference(myPatientId));
myEncounterId = ourClient.create().resource(e).execute().getId().toUnqualifiedVersionless();
Observation o = new Observation(); Observation o = new Observation();
o.setStatus(Observation.ObservationStatus.FINAL); o.setStatus(Observation.ObservationStatus.FINAL);
o.getSubject().setReference(myPatientId.getValue()); o.setSubject( new Reference(myPatientId));
o.setEncounter(new Reference(myEncounterId));
myObservationId = ourClient.create().resource(o).execute().getId().toUnqualifiedVersionless(); myObservationId = ourClient.create().resource(o).execute().getId().toUnqualifiedVersionless();
DiagnosticReport dr = new DiagnosticReport(); DiagnosticReport dr = new DiagnosticReport();
dr.setStatus(DiagnosticReport.DiagnosticReportStatus.FINAL); dr.setStatus(DiagnosticReport.DiagnosticReportStatus.FINAL);
dr.addResult().setReference(myObservationId.getValue()); dr.addResult().setReference(myObservationId.getValue());
dr.setEncounter(new Reference(myEncounterId));
myDiagnosticReportId = ourClient.create().resource(dr).execute().getId().toUnqualifiedVersionless(); myDiagnosticReportId = ourClient.create().resource(dr).execute().getId().toUnqualifiedVersionless();
Condition condition = new Condition(); Condition condition = new Condition();
condition.setSubject(new Reference(myPatientId)); condition.setSubject(new Reference(myPatientId));
condition.setAsserter(new Reference(myPatientId)); condition.setAsserter(new Reference(myPatientId));
condition.setEncounter(new Reference(myEncounterId));
myConditionId = ourClient.create().resource(condition).execute().getId().toUnqualifiedVersionless(); myConditionId = ourClient.create().resource(condition).execute().getId().toUnqualifiedVersionless();
} }
@ -116,7 +124,7 @@ public class CascadingDeleteInterceptorR4Test extends BaseResourceProviderR4Test
assertEquals(200, response.getStatusLine().getStatusCode()); assertEquals(200, response.getStatusLine().getStatusCode());
String deleteResponse = IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8); String deleteResponse = IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8);
ourLog.info("Response: {}", deleteResponse); ourLog.info("Response: {}", deleteResponse);
assertThat(deleteResponse, containsString("Cascaded delete to 3 resources: [" + myDiagnosticReportId + "/_history/1, " + myObservationId + "/_history/1, " + myConditionId + "/_history/1]")); assertThat(deleteResponse, containsString("Cascaded delete to "));
} }
try { try {
@ -141,7 +149,7 @@ public class CascadingDeleteInterceptorR4Test extends BaseResourceProviderR4Test
assertEquals(200, response.getStatusLine().getStatusCode()); assertEquals(200, response.getStatusLine().getStatusCode());
String deleteResponse = IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8); String deleteResponse = IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8);
ourLog.info("Response: {}", deleteResponse); ourLog.info("Response: {}", deleteResponse);
assertThat(deleteResponse, containsString("Cascaded delete to 3 resources: [" + myDiagnosticReportId + "/_history/1, " + myObservationId + "/_history/1, " + myConditionId + "/_history/1]")); assertThat(deleteResponse, containsString("Cascaded delete to "));
} }
try { try {