#1 Add initial support for GetRelatedDocumentsQuery

oehf · Dec 19, 2023 · e310a45 · e310a45
1 parent e3beec8
commit e310a45
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/src/main/java/org/openehealth/app/xdstofhir/registry/query/StoredQueryVistorImpl.java b/src/main/java/org/openehealth/app/xdstofhir/registry/query/StoredQueryVistorImpl.java
@@ -65,6 +65,13 @@
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.Query.Visitor;
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.QueryList;
 
+/**
+ * Implement ITI-18 queries using IPF visitor pattern.
+ *
+ * The XDS queries will be mapped to a FHIR query.
+ *
+ *
+ */
 public class StoredQueryVistorImpl implements Visitor {
     /*
      * Hapi currently ignore "_list" parameter, workaround here with "_has" reverse chain search
@@ -136,7 +143,22 @@ public void visit(GetSubmissionSetAndContentsQuery query) {
 
     @Override
     public void visit(GetRelatedDocumentsQuery query) {
-        throw new UnsupportedOperationException("Not yet implemented");
+        IQuery<Bundle> documentFhirQuery = initDocumentQuery();
+        documentFhirQuery.include(DocumentReference.INCLUDE_RELATESTO);
+        String identifier = MappingSupport.toUrnCoded(Objects.requireNonNullElse(query.getUniqueId(), query.getUuid()));
+        documentFhirQuery.where(DocumentReference.IDENTIFIER.exactly().systemAndValues(URI_URN, identifier));
+        documentFhirQuery.where(DocumentReference.RELATESTO.isMissing(false));
+        buildResultForDocuments(documentFhirQuery);
+        List<DocumentReference> results = new ArrayList<>();
+        populateDocumentTo(results);
+        documentFhirQuery = initDocumentQuery();
+        documentFhirQuery.include(DocumentReference.INCLUDE_RELATESTO);
+        documentFhirQuery.where(DocumentReference.RELATESTO
+                .hasChainedProperty(DocumentReference.IDENTIFIER.exactly().systemAndValues(URI_URN, identifier)));
+        documentFhirQuery.where(DocumentReference.RELATESTO.isMissing(false));
+        buildResultForDocuments(documentFhirQuery);
+        populateDocumentTo(results);
+        documentResult = () -> results.iterator();
     }
 
     @Override
@@ -221,6 +243,12 @@ public void visit(FindDocumentsByReferenceIdQuery query) {
         buildResultForDocuments(documentFhirQuery);
     }
 
+    private void populateDocumentTo(List<DocumentReference> results) {
+        for (var result : documentResult) {
+            results.add(result);
+        }
+    }
+
     private void buildResultForFolder(IQuery<Bundle> folderFhirQuery) {
         folderResult =  () -> new PagingFhirResultIterator<MhdFolder>(folderFhirQuery.execute(), MhdFolder.class);
     }

diff --git a/src/test/java/org/openehealth/app/xdstofhir/registry/query/StoredQueryVistorImplTest.java b/src/test/java/org/openehealth/app/xdstofhir/registry/query/StoredQueryVistorImplTest.java
@@ -21,6 +21,7 @@
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetAllQuery;
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetFoldersForDocumentQuery;
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetFoldersQuery;
+import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetRelatedDocumentsQuery;
 import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetSubmissionSetAndContentsQuery;
 
 @ExtendWith(MockServerExtension.class)
@@ -194,4 +195,28 @@ void testGetFolderForDocuments (){
                 );
     }
 
+    @Test
+    void testGetRelatedDocuments (){
+        mockServer.when(
+                request().withPath("/DocumentReference"))
+                .respond(response().withStatusCode(200).withContentType(MediaType.APPLICATION_JSON)
+                .withBody(EMPTY_BUNDLE_RESULT));
+        var query = (GetRelatedDocumentsQuery) SampleData.createGetRelatedDocumentsQuery().getQuery();
+        classUnderTest.visit(query);
+        classUnderTest.getDocumentResult().iterator();
+
+        mockServer.verify(request()
+                .withQueryStringParameter("identifier", "urn:ietf:rfc:3986|urn:ihe:xds:12.21.34")
+                .withQueryStringParameter("_include", "DocumentReference:subject", "DocumentReference:relatesto")
+                .withQueryStringParameter("_profile", MappingSupport.MHD_COMPREHENSIVE_PROFILE)
+                .withQueryStringParameter("relatesto:missing", "false")
+                );
+        mockServer.verify(request()
+                .withQueryStringParameter("relatesto.identifier", "urn:ietf:rfc:3986|urn:ihe:xds:12.21.34")
+                .withQueryStringParameter("_include", "DocumentReference:subject", "DocumentReference:relatesto")
+                .withQueryStringParameter("_profile", MappingSupport.MHD_COMPREHENSIVE_PROFILE)
+                .withQueryStringParameter("relatesto:missing", "false")
+                );
+    }
+
 }