Skip to content
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

Jump to bottom

fixed the issue of meta.source field inconsistently populated in subscription messages for different requests #4524

Merged
merged 7 commits into from
Feb 9, 2023
Merged

fixed the issue of meta.source field inconsistently populated in subscription messages for different requests #4524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4dd46e6
fix + test
Qingyixia Feb 8, 2023
fb7a634
Merge branch 'rel_6_4' of https://github.com/hapifhir/hapi-fhir into …
Qingyixia Feb 8, 2023
f2c0895
minor fix
Qingyixia Feb 8, 2023
ad9bb85
Merge branch 'rel_6_4' of https://github.com/hapifhir/hapi-fhir into …
Qingyixia Feb 8, 2023
b997144
Addressing suggestion
Qingyixia Feb 8, 2023
9ba48bf
Merge branch 'rel_6_4' of https://github.com/hapifhir/hapi-fhir into …
Qingyixia Feb 9, 2023
c056aeb
Minor changes
Qingyixia Feb 9, 2023
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
Prev Previous commit
Next Next commit
Addressing suggestion
  • Loading branch information
@Qingyixia
Qingyixia committed Feb 8, 2023
commit b99714451c7b6709bb28821749a56beed36785a1
19 changes: 3 additions & 16 deletions ...n/java/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import ca.uhn.fhir.jpa.subscription.model.ResourceDeliveryMessage;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.api.server.IBundleProvider;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
import ca.uhn.fhir.util.BundleBuilder;
import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.text.StringSubstitutor;
Expand Down Expand Up @@ -140,24 +141,10 @@ protected IBaseBundle createDeliveryBundleForPayloadSearchCriteria(CanonicalSubs
return builder.getBundle();
}

protected IBaseResource updateDeliveryResourceWithMetaSource(CanonicalSubscription theSubscription, IBaseResource thePayloadResource) {
protected IBaseResource updateDeliveryResourceWithMetaSource(IBaseResource thePayloadResource) {
String resType = thePayloadResource.fhirType();
IFhirResourceDao<?> dao = myDaoRegistry.getResourceDao(resType);
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(resType);

String payloadUrl = resType + "?" + Constants.PARAM_ID + "=" + thePayloadResource.getIdElement().getValue();
SearchParameterMap payloadSearchMap = myMatchUrlService.translateMatchUrl(payloadUrl, resourceDefinition);

if (payloadSearchMap == null) {
return null;
}
payloadSearchMap.setLoadSynchronous(true);
IBundleProvider searchResults = dao.search(payloadSearchMap, createRequestDetailForPartitionedRequest(theSubscription));

if (searchResults == null) {
return null;
}
IBaseResource resourceWithMetaSource = searchResults.getAllResources().get(0);
IBaseResource resourceWithMetaSource = dao.read(thePayloadResource.getIdElement(), new SystemRequestDetails());

return resourceWithMetaSource;
}
Expand Down
2 changes: 1 addition & 1 deletion .../fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected void doDelivery(ResourceDeliveryMessage theSourceMessage, CanonicalSub
if (isNotBlank(theSubscription.getPayloadSearchCriteria())) {
payloadResource = createDeliveryBundleForPayloadSearchCriteria(theSubscription, theWrappedMessageToSend.getPayload().getPayload(myFhirContext));
} else if (! theWrappedMessageToSend.getPayload().getPayloadString().contains(HapiExtensions.EXT_META_SOURCE)){
payloadResource = updateDeliveryResourceWithMetaSource(theSubscription, theWrappedMessageToSend.getPayload().getPayload(myFhirContext));
payloadResource = updateDeliveryResourceWithMetaSource(theWrappedMessageToSend.getPayload().getPayload(myFhirContext));
}

if (payloadResource != null) {
Expand Down
19 changes: 9 additions & 10 deletions ...va/ca/uhn/fhir/jpa/subscription/match/deliver/BaseSubscriptionDeliverySubscriberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,16 +406,6 @@ public void testSubscriptionMessageContainsMetaSourceField() throws URISyntaxExc
//Given: we have a subscription message that contains a patient resource
Patient p1 = generatePatient();
p1.addName().setFamily("p1-family");
p1.getMeta().setSource("#example-source");
IBundleProvider bundleProvider = new SimpleBundleProvider(List.of(p1));

//When
when(myInterceptorBroadcaster.callHooks(eq(Pointcut.SUBSCRIPTION_BEFORE_MESSAGE_DELIVERY), ArgumentMatchers.any(HookParams.class))).thenReturn(true);
when(myInterceptorBroadcaster.callHooks(eq(Pointcut.SUBSCRIPTION_AFTER_MESSAGE_DELIVERY), any())).thenReturn(false);
when(myChannelFactory.getOrCreateProducer(any(), any(), any())).thenReturn(myChannelProducer);
when(myDaoRegistry.getResourceDao(anyString())).thenReturn(myResourceDao);
when(myMatchUrlService.translateMatchUrl(any(), any(), any())).thenReturn(new SearchParameterMap());
when(myResourceDao.search(any(), any())).thenReturn(bundleProvider);

CanonicalSubscription subscription = generateSubscription();
subscription.setCriteriaString("[*]");
Expand All @@ -425,6 +415,15 @@ public void testSubscriptionMessageContainsMetaSourceField() throws URISyntaxExc
payload.setPayload(myCtx, p1, EncodingEnum.JSON);
payload.setOperationType(ResourceModifiedMessage.OperationTypeEnum.CREATE);

//When
when(myInterceptorBroadcaster.callHooks(eq(Pointcut.SUBSCRIPTION_BEFORE_MESSAGE_DELIVERY), ArgumentMatchers.any(HookParams.class))).thenReturn(true);
when(myInterceptorBroadcaster.callHooks(eq(Pointcut.SUBSCRIPTION_AFTER_MESSAGE_DELIVERY), any())).thenReturn(false);
when(myChannelFactory.getOrCreateProducer(any(), any(), any())).thenReturn(myChannelProducer);
when(myDaoRegistry.getResourceDao(anyString())).thenReturn(myResourceDao);

p1.getMeta().setSource("#example-source");
when(myResourceDao.read(any(), any())).thenReturn(p1);

//Then: meta.source field will be included in the message
myMessageSubscriber.handleMessage(payload);

Expand Down