Merge pull request #324 from MeasureAuthoringTool/feature/MAT-9425-composite-updates

Feature/mat 9425 composite updates

Author: nmorasb

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>gov.cms.madie</groupId>
   <artifactId>madie-java-models</artifactId>
-  <version>0.7.4-SNAPSHOT</version>
+  <version>0.8.0-SNAPSHOT</version>
   <name>madie-java-models</name>
   <description>Java based models for MADiE microservices</description>
   <properties>

src/main/java/gov/cms/madie/models/measure/Component.java

@@ -0,0 +1,16 @@
+package gov.cms.madie.models.measure;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class Component {
+  private String measureId;
+  private String groupId;
+  private Double weight;
+}

src/main/java/gov/cms/madie/models/measure/CompositeMeasureScoring.java

@@ -0,0 +1,36 @@
+package gov.cms.madie.models.measure;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Arrays;
+
+public enum CompositeMeasureScoring {
+  @JsonProperty("All-or-nothing")
+  ALL_OR_NOTHING("All-or-nothing"),
+  @JsonProperty("Opportunity")
+  OPPORTUNITY("Opportunity"),
+  @JsonProperty("Linear")
+  LINEAR("Linear");
+
+  private final String text;
+
+  CompositeMeasureScoring(String text) {
+    this.text = text;
+  }
+
+  @Override
+  public String toString() {
+    return this.text;
+  }
+
+  public String toCode() {
+    return this.text.toLowerCase();
+  }
+
+  public static CompositeMeasureScoring valueOfText(String text) {
+    return Arrays.stream(CompositeMeasureScoring.values())
+        .filter(s -> s.text.equals(text))
+        .findFirst()
+        .orElse(null);
+  }
+}

src/main/java/gov/cms/madie/models/measure/Group.java

@@ -27,7 +27,7 @@ public class Group implements GroupScoringPopulation, Serializable {
 
   @NotNull(
       message = "Scoring is required.",
-      groups = {Measure.ValidationOrder5.class})
+      groups = {Measure.ValidationOrder4.class})
   @EnumValidator(
       enumClass = MeasureScoring.class,
       message = "Scoring must be a valid MADiE scoring type",
@@ -59,4 +59,14 @@ public class Group implements GroupScoringPopulation, Serializable {
   private Integer scoringPrecision;
 
   private String displayId;
+
+  // Composite attributes
+  @EnumValidator(
+      enumClass = CompositeMeasureScoring.class,
+      message = "Composite Scoring must be a valid MADiE Composite scoring type",
+      allowNull = true,
+      groups = {Measure.ValidationOrder5.class})
+  private String compositeScoring;
+
+  private List<Component> components;
 }

src/main/java/gov/cms/madie/models/measure/Measure.java

@@ -7,8 +7,7 @@
 import java.util.Set;
 
 import gov.cms.madie.models.common.IncludedLibrary;
-import gov.cms.madie.models.validators.ValidIntendedVenue;
-import gov.cms.madie.models.validators.ValidPurpose;
+import gov.cms.madie.models.validators.*;
 import jakarta.validation.GroupSequence;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
@@ -31,8 +30,6 @@
 import gov.cms.madie.models.common.ModelType;
 import gov.cms.madie.models.common.Version;
 import gov.cms.madie.models.utils.VersionJsonSerializer;
-import gov.cms.madie.models.validators.EnumValidator;
-import gov.cms.madie.models.validators.ValidLibraryName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -56,6 +53,7 @@
 @ValidLibraryName
 @ValidIntendedVenue
 @ValidPurpose
+@ValidComposite
 public class Measure implements Serializable, Cloneable {
 
   @Id private String id;

src/main/java/gov/cms/madie/models/measure/MeasureMetaData.java

@@ -36,6 +36,7 @@ public class MeasureMetaData implements Serializable {
   private CqlMetaData cqlMetaData;
   private CodeConcept intendedVenue;
   private String purpose;
+  private boolean composite;
 
   @Valid private List<MeasureDefinition> measureDefinitions;
 }

src/main/java/gov/cms/madie/models/measure/MeasureScoring.java

@@ -12,7 +12,9 @@ public enum MeasureScoring {
   @JsonProperty("Proportion")
   PROPORTION("Proportion"),
   @JsonProperty("Ratio")
-  RATIO("Ratio");
+  RATIO("Ratio"),
+  @JsonProperty("Composite")
+  COMPOSITE("Composite");
 
   private final String text;
 

src/main/java/gov/cms/madie/models/validators/EnumValidator.java

@@ -3,14 +3,13 @@
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 import jakarta.validation.ReportAsSingleViolation;
-import jakarta.validation.constraints.NotNull;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@NotNull(message = "Value cannot be null")
 @ReportAsSingleViolation
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -25,4 +24,6 @@
   Class<?>[] groups() default {};
 
   Class<? extends Payload>[] payload() default {};
+
+  boolean allowNull() default false;
 }

src/main/java/gov/cms/madie/models/validators/EnumValidatorImpl.java

@@ -2,24 +2,30 @@
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class EnumValidatorImpl implements ConstraintValidator<EnumValidator, String> {
 
   private List<String> acceptedValues;
+  private boolean allowNull;
 
   @Override
   public void initialize(EnumValidator annotation) {
     acceptedValues =
         Stream.of(annotation.enumClass().getEnumConstants())
             .map(Enum::toString)
             .collect(Collectors.toList());
+    allowNull = annotation.allowNull();
   }
 
   @Override
   public boolean isValid(String value, ConstraintValidatorContext context) {
+    if (value == null) {
+      return allowNull;
+    }
     return acceptedValues.contains(value);
   }
 }

src/main/java/gov/cms/madie/models/validators/MeasureScoringValidator.java

@@ -12,7 +12,11 @@ public class MeasureScoringValidator
   @Override
   public boolean isValid(QdmMeasure measure, ConstraintValidatorContext context) {
     if (measure != null && measure.getScoring() != null) {
-      return MeasureScoring.valueOfText(measure.getScoring()) == null ? false : true;
+      MeasureScoring scoring = MeasureScoring.valueOfText(measure.getScoring());
+      if (scoring == MeasureScoring.COMPOSITE) {
+        return false;
+      }
+      return scoring != null;
     }
     return true;
   }