MAT-8732 refactored code to adopt measurelocking

Author: sb-prateekkeerthi

src/main/java/cms/gov/madie/measure/resources/AdminController.java

@@ -148,20 +148,21 @@ public void resetTestCaseValidationQueue(
                   .getTestCases()
                   .forEach(
                       testCase -> {
-                        if (TestCaseValidationStatus.VALIDATING
+                        if (TestCaseValidationStatus.PENDING
                             .toString()
                             .equalsIgnoreCase(testCase.getValidationStatus())) {
-                          testCase.setValidationStatus(TestCaseValidationStatus.PENDING.toString());
-                          // submit the test case after updating its status
+                          // Submit test case already in PENDING status
                           testCaseValidationService.submitOnSaveValidationTask(
                               measure.getId(),
                               testCase,
                               accessToken,
                               ModelType.valueOfName(measure.getModel()));
-                        } else if (TestCaseValidationStatus.PENDING
+                        } else if (TestCaseValidationStatus.VALIDATING
                             .toString()
                             .equalsIgnoreCase(testCase.getValidationStatus())) {
-                          // Submit test cases already in PENDING status
+                          measureRepository.setValidationStatusToPending(
+                              testCase.getId(), measure.getId());
+                          // submit the test case after updating its status
                           testCaseValidationService.submitOnSaveValidationTask(
                               measure.getId(),
                               testCase,
@@ -174,7 +175,6 @@ public void resetTestCaseValidationQueue(
       log.info(
           "User [{}] - Successfully placed QI Core v6 test cases back on the validation queue",
           principal.getName());
-      measureRepository.saveAll(measureList);
     }
   }
 

src/test/java/cms/gov/madie/measure/resources/AdminControllerMvcTest.java

@@ -741,6 +741,22 @@ public void updateTestCaseValidationStatusProcessesValidatingTestCases() throws
     when(measureRepository.findAllByModel(ModelType.QI_CORE_6_0_0.getValue()))
         .thenReturn(List.of(measure));
 
+    // Mock the repository behavior to update the validation status to PENDING
+    doAnswer(
+            invocation -> {
+              String testCaseId = invocation.getArgument(0, String.class);
+              String measureId = invocation.getArgument(1, String.class);
+              if ("TC1".equals(testCaseId) && "M1".equals(measureId)) {
+                measure
+                    .getTestCases()
+                    .get(0)
+                    .setValidationStatus(TestCaseValidationStatus.PENDING.toString());
+              }
+              return null;
+            })
+        .when(measureRepository)
+        .setValidationStatusToPending(anyString(), anyString());
+
     mockMvc
         .perform(
             MockMvcRequestBuilders.put("/admin/measures/test-cases/restart-validation")
@@ -861,4 +877,85 @@ public void updateTestCaseValidationStatusHandlesMeasuresWithoutTestCases() thro
 
     verifyNoInteractions(testCaseValidationService);
   }
+
+  @Test
+  public void updateTestCaseValidationStatusProcessesMultipleTestCasesWithDifferentStatuses()
+      throws Exception {
+    Measure measure =
+        Measure.builder()
+            .id("M1")
+            .model(ModelType.QI_CORE_6_0_0.getValue())
+            .testCases(
+                List.of(
+                    TestCase.builder()
+                        .id("TC1")
+                        .validationStatus(TestCaseValidationStatus.VALIDATING.toString())
+                        .build(),
+                    TestCase.builder()
+                        .id("TC2")
+                        .validationStatus(TestCaseValidationStatus.PENDING.toString())
+                        .build(),
+                    TestCase.builder()
+                        .id("TC3")
+                        .validationStatus(TestCaseValidationStatus.INVALID.toString())
+                        .build()))
+            .build();
+
+    when(measureRepository.findAllByModel(ModelType.QI_CORE_6_0_0.getValue()))
+        .thenReturn(List.of(measure));
+
+    // Mock the repository behavior to update the validation status to PENDING
+    doAnswer(
+            invocation -> {
+              String testCaseId = invocation.getArgument(0, String.class);
+              String measureId = invocation.getArgument(1, String.class);
+              if ("TC1".equals(testCaseId) && "M1".equals(measureId)) {
+                measure
+                    .getTestCases()
+                    .get(0)
+                    .setValidationStatus(TestCaseValidationStatus.PENDING.toString());
+              }
+              return null;
+            })
+        .when(measureRepository)
+        .setValidationStatusToPending(anyString(), anyString());
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.put("/admin/measures/test-cases/restart-validation")
+                .with(csrf())
+                .with(user(TEST_USER_ID))
+                .header(ADMIN_TEST_API_KEY_HEADER, ADMIN_TEST_API_KEY_HEADER_VALUE)
+                .header("Authorization", "test-okta"))
+        .andExpect(status().isOk());
+
+    verify(testCaseValidationService, times(1))
+        .submitOnSaveValidationTask(
+            eq("M1"),
+            eq(measure.getTestCases().get(0)),
+            eq("test-okta"),
+            eq(ModelType.QI_CORE_6_0_0));
+    verify(testCaseValidationService, times(1))
+        .submitOnSaveValidationTask(
+            eq("M1"),
+            eq(measure.getTestCases().get(1)),
+            eq("test-okta"),
+            eq(ModelType.QI_CORE_6_0_0));
+    verify(testCaseValidationService, never())
+        .submitOnSaveValidationTask(
+            eq("M1"),
+            eq(measure.getTestCases().get(2)),
+            eq("test-okta"),
+            eq(ModelType.QI_CORE_6_0_0));
+
+    assertEquals(
+        TestCaseValidationStatus.PENDING.toString(),
+        measure.getTestCases().get(0).getValidationStatus());
+    assertEquals(
+        TestCaseValidationStatus.PENDING.toString(),
+        measure.getTestCases().get(1).getValidationStatus());
+    assertEquals(
+        TestCaseValidationStatus.INVALID.toString(),
+        measure.getTestCases().get(2).getValidationStatus());
+  }
 }