MAT-8638: Use $elemMatch in test case validation status queries.

The $elemMatch operator is used to specify multiple criteria on an array of embedded documents such that at least one embedded document satisfies all the specified criteria.

The previous query did not require a single test case to match all criteria. Instead, it would return the measure document if all criteria were met by one or more test cases combined. (i.e., With two criteria, id and status, the measure would return if test case 1 matched ID and test case 3 matched status.)

Signed-off-by: Joseph Kotanchik <joseph.kotanchik@semanticbits.com>

Author: jkotanchik-SB

src/main/java/cms/gov/madie/measure/repositories/TestCaseRepositoryImpl.java

@@ -26,10 +26,12 @@ public Measure setValidationStatusToPending(String testCaseId, String measureId)
     query.addCriteria(
         Criteria.where("_id")
             .is(measureId)
-            .and("testCases._id")
-            .is(testCaseId)
-            .and("testCases.validationStatus")
-            .ne(TestCaseValidationStatus.PENDING.toString()));
+            .and("testCases")
+            .elemMatch(
+                Criteria.where("_id")
+                    .is(testCaseId)
+                    .and("validationStatus")
+                    .ne(TestCaseValidationStatus.PENDING.toString())));
 
     Update update = new Update();
     update.set("testCases.$.validationStatus", TestCaseValidationStatus.PENDING.toString());
@@ -41,10 +43,15 @@ public Measure setValidationStatusToPending(String testCaseId, String measureId)
   @Override
   public Measure setValidationStatusToValidating(String testCaseId, String measureId, UUID taskId) {
     Query query = new Query();
-    query.addCriteria(Criteria.where("_id").is(measureId).and("testCases._id").is(testCaseId));
     query.addCriteria(
-        Criteria.where("testCases.validationStatus")
-            .is(TestCaseValidationStatus.PENDING.toString()));
+        Criteria.where("_id")
+            .is(measureId)
+            .and("testCases")
+            .elemMatch(
+                Criteria.where("_id")
+                    .is(testCaseId)
+                    .and("validationStatus")
+                    .is(TestCaseValidationStatus.PENDING.toString())));
 
     Update update = new Update();
     update.set("testCases.$.validationStatus", TestCaseValidationStatus.VALIDATING.toString());
@@ -75,12 +82,14 @@ public Measure findAndUpdateValidationResults(
     query.addCriteria(
         Criteria.where("_id")
             .is(measureId)
-            .and("testCases._id")
-            .is(testCaseId)
-            .and("testCases.validationStatus")
-            .is(TestCaseValidationStatus.VALIDATING.toString())
-            .and("testCases.validationTaskId")
-            .is(taskId.toString()));
+            .and("testCases")
+            .elemMatch(
+                Criteria.where("_id")
+                    .is(testCaseId)
+                    .and("validationStatus")
+                    .is(TestCaseValidationStatus.VALIDATING.toString())
+                    .and("testCases.validationTaskId")
+                    .is(taskId.toString())));
 
     Update update = new Update();
     update.set(