MAT-8732 refactored code

Author: sb-prateekkeerthi

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

@@ -160,14 +160,17 @@ public void resetTestCaseValidationQueue(
                         } else if (TestCaseValidationStatus.VALIDATING
                             .toString()
                             .equalsIgnoreCase(testCase.getValidationStatus())) {
-                          measureRepository.setValidationStatusToPending(
-                              testCase.getId(), measure.getId());
-                          // submit the test case after updating its status
-                          testCaseValidationService.submitOnSaveValidationTask(
-                              measure.getId(),
-                              testCase,
-                              accessToken,
-                              ModelType.valueOfName(measure.getModel()));
+                          Measure updatedMeasure =
+                              measureRepository.setValidationStatusToPending(
+                                  testCase.getId(), measure.getId());
+                          if (updatedMeasure != null) {
+                            // submit the test case after updating its status
+                            testCaseValidationService.submitOnSaveValidationTask(
+                                measure.getId(),
+                                testCase,
+                                accessToken,
+                                ModelType.valueOfName(measure.getModel()));
+                          }
                         }
                       });
             }

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

@@ -741,7 +741,6 @@ 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);
@@ -752,7 +751,7 @@ public void updateTestCaseValidationStatusProcessesValidatingTestCases() throws
                     .get(0)
                     .setValidationStatus(TestCaseValidationStatus.PENDING.toString());
               }
-              return null;
+              return measure;
             })
         .when(measureRepository)
         .setValidationStatusToPending(anyString(), anyString());
@@ -768,7 +767,10 @@ public void updateTestCaseValidationStatusProcessesValidatingTestCases() throws
 
     verify(testCaseValidationService, times(1))
         .submitOnSaveValidationTask(
-            eq("M1"), any(TestCase.class), eq("test-okta"), eq(ModelType.QI_CORE_6_0_0));
+            eq("M1"),
+            eq(measure.getTestCases().get(0)),
+            eq("test-okta"),
+            eq(ModelType.QI_CORE_6_0_0));
     assertEquals(
         TestCaseValidationStatus.PENDING.toString(),
         measure.getTestCases().get(0).getValidationStatus());
@@ -929,12 +931,6 @@ public void updateTestCaseValidationStatusProcessesMultipleTestCasesWithDifferen
                 .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"),