MAT-7437: Prevent description on empty notation.

MeasureAuthoringTool · Oct 22, 2024 · 4eb082e · 4eb082e
1 parent 0d61efa
commit 4eb082e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/gov/cms/madie/models/validators/ImprovementNotationValidator.java b/src/main/java/gov/cms/madie/models/validators/ImprovementNotationValidator.java
@@ -13,7 +13,7 @@ public class ImprovementNotationValidator
   @Override
   public boolean isValid(QdmMeasure measure, ConstraintValidatorContext context) {
     if (StringUtils.isEmpty(measure.getImprovementNotation())) {
-      return true;
+      return StringUtils.isEmpty(measure.getImprovementNotationDescription());
     }
     if (StringUtils.equalsIgnoreCase(
             measure.getImprovementNotation(), "Increased score indicates improvement")

diff --git a/src/test/java/gov/cms/madie/models/validators/ImprovementNotationValidatorTest.java b/src/test/java/gov/cms/madie/models/validators/ImprovementNotationValidatorTest.java
@@ -40,6 +40,13 @@ void testImprovementNotationDecrease() {
     assertTrue(validator.isValid(measure, validatorContext));
   }
 
+  @Test
+  void testImprovementNotationWithDescription() {
+    measure.setImprovementNotation("Decreased score indicates improvement");
+    measure.setImprovementNotationDescription("Something useful");
+    assertTrue(validator.isValid(measure, validatorContext));
+  }
+
   @Test
   void testImprovementNotationOtherHasDescription() {
     measure.setImprovementNotation("Other");
@@ -60,6 +67,12 @@ void testInvalidImprovementNotation() {
     assertFalse(validator.isValid(measure, validatorContext));
   }
 
+  @Test
+  void testImprovementNotationDescriptionOnly() {
+    measure.setImprovementNotationDescription("Nonsense description");
+    assertFalse(validator.isValid(measure, validatorContext));
+  }
+
   @Test
   void testEmptyImprovementNotation() {
     assertTrue(validator.isValid(measure, validatorContext));