Merge pull request #916 from MeasureAuthoringTool/feature/mat-8638-logging-updates

[MAT-8638] Improve async validation status query precision

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(

src/main/java/cms/gov/madie/measure/services/TestCaseValidationService.java

@@ -87,10 +87,7 @@ void submitOnImportValidationTask(
         taskId,
         Instant.now(),
         importExecutor.getQueueSize());
-    importExecutor.submit(
-        () -> {
-          validate(taskId, measureId, testCase, modelType, accessToken);
-        });
+    importExecutor.submit(() -> validate(taskId, measureId, testCase, modelType, accessToken));
   }
 
   void validate(
@@ -102,11 +99,7 @@ void validate(
     // TODO replace with decorator
     Instant startTime = Instant.now();
     log.info(
-        "TestCase Validation::execute::{}::{}::{}::{}",
-        submittedTestCase.getId(),
-        Thread.currentThread().getId(),
-        taskId,
-        startTime);
+        "TestCase Validation::execute::{}::{}::{}", submittedTestCase.getId(), taskId, startTime);
     Measure measure =
         measureRepository.setValidationStatusToValidating(
             submittedTestCase.getId(), measureId, taskId);
@@ -133,9 +126,10 @@ void validate(
           currentTestCase.getId(), measureId, taskId, validationOutcome);
       Instant stopTime = Instant.now();
       log.info(
-          "TestCase Validation::completed::{}::{}::{}::{}",
+          "TestCase Validation::completed::{}::{}::{}::{}::{}",
           currentTestCase.getId(),
           taskId,
+          stopTime,
           Duration.between(startTime, stopTime),
           saveExecutor.getQueueSize());
     } catch (Exception e) {
@@ -157,7 +151,7 @@ public TestCase validateResourceAsynchronously(
     // If the measure is null, the test case has already has PENDING status.
     if (updatedMeasure == null) {
       log.info(
-          "Test Case with Id {} already in validation queue for Measure with Id {}",
+          "TestCase Validation::already pending::{}::measure::{}",
           testCase.getId(),
           measure.getId());
       return testCase;