Updating aggregate pipeline to perform optimally with indexes. Using same pattern for both shared and patient resources.

Author: seanmcilvenna

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

@@ -80,75 +80,34 @@ public List<? extends AbstractResourceEntity> findAll(String facilityId, List<Pa
         return mongoOperations.find(query, entityType);
     }
 
-    public List<SharedResource> findSharedResources(String facilityId, List<PatientReportingEvaluationStatus.Resource> resources) {
-        List<SharedResource> sharedResources = new ArrayList<>();
-        if (resources == null || resources.isEmpty()) {
-            return sharedResources;
-        }
-
-        // Batch the searches so that it doesn't exceed mongo's query limitations
-        List<PatientReportingEvaluationStatus.Resource> remainingResources = new ArrayList<>(resources);
-        while (!remainingResources.isEmpty()) {
-            int characterCount = 0;
-            List<Criteria> batchCriteria = new ArrayList<>();
-
-            for (int i = remainingResources.size() - 1; i >= 0; i--) {
-                PatientReportingEvaluationStatus.Resource resource = remainingResources.get(i);
-                int resourceCharLength = resource.getResourceType().toString().length() + resource.getResourceId().length();
-
-                if (characterCount + resourceCharLength >= 10000) {
-                    break;
-                }
-
-                characterCount += resourceCharLength;
-                batchCriteria.add(Criteria.where("facilityId").is(facilityId)
-                        .and("resourceType").is(resource.getResourceType())
-                        .and("resourceId").is(resource.getResourceId()));
-                remainingResources.remove(i);
-            }
-
-            if (!batchCriteria.isEmpty()) {
-                Criteria combinedCriteria = new Criteria().orOperator(batchCriteria.toArray(new Criteria[0]));
-                Query query = new Query(combinedCriteria);
-                sharedResources.addAll(mongoOperations.find(query, SharedResource.class));
-            }
-        }
-
-        return sharedResources;
-    }
-
-    public List<PatientResource> findPatientResources(String facilityId, String patientId, List<String> reportIds) {
+    public List<PatientResource> findResources(boolean isShared, String facilityId, String correlationId) {
         List<AggregationOperation> pipeline = new ArrayList<>();
 
         pipeline.add(Aggregation.match(Criteria.where("facilityId").is(facilityId)
-                .and("patientId").is(patientId)
-                .and("reports.reportTrackingId").in(reportIds)));
+                .and("correlationId").is(correlationId)));
         pipeline.add(Aggregation.unwind("resources"));
-        pipeline.add(Aggregation.match(Criteria.where("resources.normalizationStatus").is("NORMALIZED")));
+        pipeline.add(Aggregation.replaceRoot("resources"));
+        pipeline.add(Aggregation.match(Criteria.where("isPatientResource").is(!isShared)
+                .and("normalizationStatus").is("NORMALIZED")));
 
         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")
-        );
+                new Document("from", isShared ? "sharedResource" : "patientResource")
+                        .append("localField", "resourceId")
+                        .append("foreignField", "resourceId")
+                        .append("as", "patientResources"));
 
         pipeline.add(new CustomAggregationOperation(lookupStage));
+        pipeline.add(Aggregation.unwind("patientResources"));
+
+        Document matchExpr = new Document("$match",
+                new Document("$expr",
+                        new Document("$and", List.of(
+                                new Document("$eq", List.of("$patientResources.facilityId", facilityId)),
+                                new Document("$eq", List.of("$patientResources.resourceType", "$resourceType"))
+                        ))));
+        pipeline.add(new CustomAggregationOperation(matchExpr));
 
-        pipeline.add(Aggregation.unwind("matchedResources"));
-        pipeline.add(Aggregation.match(Criteria.where("matchedResources.facilityId").is(facilityId)));
-        pipeline.add(Aggregation.replaceRoot("matchedResources"));
+        pipeline.add(Aggregation.replaceRoot("patientResources"));
 
         Aggregation aggregation = Aggregation.newAggregation(pipeline);
         return mongoOperations.aggregate(aggregation, "patientReportingEvaluationStatus", PatientResource.class).getMappedResults();

Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/services/PatientStatusBundler.java

@@ -47,9 +47,8 @@ private List<AbstractResourceEntity> retrieveResources (PatientReportingEvaluati
 
         logger.debug("Collecting patient resources for patient {} and {} shared resources from the database", patientStatus.getPatientId(), sharedResourcesRefs.size());
 
-        List<String> reportIds = patientStatus.getReports().stream().map(PatientReportingEvaluationStatus.Report::getReportTrackingId).toList();
-        var patientResources = resourceRepository.findPatientResources(patientStatus.getFacilityId(), patientStatus.getPatientId(), reportIds);
-        var sharedResources = resourceRepository.findSharedResources(patientStatus.getFacilityId(), sharedResourcesRefs);
+        var patientResources = resourceRepository.findResources(false, patientStatus.getFacilityId(), patientStatus.getCorrelationId());
+        var sharedResources = resourceRepository.findResources(true, patientStatus.getFacilityId(), patientStatus.getCorrelationId());
 
         logger.debug("Retrieved {} patient resources and {} shared resources from the database", patientResources.size(), sharedResources.size());