MAT-6487 refactored the code

MeasureAuthoringTool · Sep 18, 2024 · 7bba303 · 7bba303
1 parent c2046b9
commit 7bba303
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/cms/gov/madie/measure/resources/AdminController.java b/src/main/java/cms/gov/madie/measure/resources/AdminController.java
@@ -237,6 +237,14 @@ public ResponseEntity<Measure> correctMeasureVersion(
     measureToCorrectVersion.setVersion(newDraftVersion);
     measureToCorrectVersion.getMeasureMetaData().setDraft(true);
 
+    deleteRelevantPackageData(id, measureToCorrectVersion);
+
+    Measure correctedVersionMeasure = measureRepository.save(measureToCorrectVersion);
+    actionLogService.logAction(id, Measure.class, ActionType.UPDATED, principal.getName());
+    return ResponseEntity.ok(correctedVersionMeasure);
+  }
+
+  private void deleteRelevantPackageData(String id, Measure measureToCorrectVersion) {
     // QI-Core measure: delete the export
     // QDM Measures: delete the export and cqmMeasure
     Export export = exportRepository.findByMeasureId(id).orElse(null);
@@ -252,10 +260,6 @@ public ResponseEntity<Measure> correctMeasureVersion(
         cqmMeasureRepository.delete(cqmMeasure);
       }
     }
-
-    Measure correctedVersionMeasure = measureRepository.save(measureToCorrectVersion);
-    actionLogService.logAction(id, Measure.class, ActionType.UPDATED, principal.getName());
-    return ResponseEntity.ok(correctedVersionMeasure);
   }
 
   private boolean checkIfVersionIsAlreadyAssociated(