Updating aggregate pipeline to join the two collections on all three important columns: facilityId, resourceType and resourceId

Author: seanmcilvenna

Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/repositories/AbstractResourceRepository.java

@@ -5,6 +5,8 @@
 import com.lantanagroup.link.measureeval.entities.PatientResource;
 import com.lantanagroup.link.measureeval.entities.SharedResource;
 import com.lantanagroup.link.measureeval.records.AbstractResourceRecord;
+import com.lantanagroup.link.shared.mongo.CustomAggregationOperation;
+import org.bson.Document;
 import org.hl7.fhir.r4.model.ResourceType;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -123,7 +125,27 @@ public List<PatientResource> findPatientResources(String facilityId, String pati
                 .and("reports.reportTrackingId").in(reportIds)));
         pipeline.add(Aggregation.unwind("resources"));
         pipeline.add(Aggregation.match(Criteria.where("resources.normalizationStatus").is("NORMALIZED")));
-        pipeline.add(Aggregation.lookup("patientResource", "resources.resourceId", "resourceId", "matchedResources"));
+
+        Document lookupStage = new Document("$lookup",
+                new Document("from", "patientResource")
+                        .append("let", new Document("localResourceId", "$resources.resourceId")
+                                .append("localResourceType", "$resources.resourceType"))
+                        .append("pipeline", List.of(
+                                new Document("$match",
+                                        new Document("$expr",
+                                                new Document("$and", List.of(
+                                                        new Document("$eq", List.of("$resourceId", "$$localResourceId")),
+                                                        new Document("$eq", List.of("$resourceType", "$$localResourceType")),
+                                                        new Document("$eq", List.of("$facilityId", facilityId))
+                                                ))
+                                        )
+                                )
+                        ))
+                        .append("as", "matchedResources")
+        );
+
+        pipeline.add(new CustomAggregationOperation(lookupStage));
+
         pipeline.add(Aggregation.unwind("matchedResources"));
         pipeline.add(Aggregation.match(Criteria.where("matchedResources.facilityId").is(facilityId)));
         pipeline.add(Aggregation.replaceRoot("matchedResources"));

Java/shared/src/main/java/com/lantanagroup/link/shared/mongo/CustomAggregationOperation.java

@@ -0,0 +1,17 @@
+package com.lantanagroup.link.shared.mongo;
+
+import org.bson.Document;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+
+public class CustomAggregationOperation implements AggregationOperation {
+    private final Document operation;
+
+    public CustomAggregationOperation(Document operation) {
+        this.operation = operation;
+    }
+
+    @Override
+    public Document toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext context) {
+        return context.getMappedObject(operation);
+    }
+}