Merge pull request #448 from CMSgov/feature/QPPCT-328_CPC_ecqm_breakdown

QPPCT-328: cpc ecqm breakdown

Author: clydet

ERROR_MESSAGES.md

@@ -72,4 +72,5 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 61 : A Performance Rate must contain a single Performance Rate UUID
 * 62 : The Alternative Payment Model (APM) Entity Identifier must not be empty
 * 63 : The Alternative Payment Model (APM) Entity Identifier is not valid
- 
+* 64 : CPC+ Submissions must have at least `(CPC+ measure group minimum)` of the following `(CPC+ measure group label)` measures: `(Listing of valid measure ids)`
+* 65 : CPC+ Submissions must have at least `(Overall CPC+ measure minimum)` of the following measures: `(Listing of all CPC+ measure ids)`.

converter/src/main/java/gov/cms/qpp/conversion/model/error/ErrorCode.java

@@ -97,7 +97,12 @@ public enum ErrorCode implements LocalizedError {
 	QUALITY_MEASURE_ID_INCORRECT_PERFORMANCE_UUID(60, "The eCQM (electronic measure id: %s) has a %s with an "
 			+ "incorrect UUID of %s", true),
 	QUALITY_MEASURE_ID_MISSING_SINGLE_PERFORMANCE_RATE(61, "A Performance Rate must contain a single "
-			+ "Performance Rate UUID");
+			+ "Performance Rate UUID"),
+	CPC_PLUS_TOO_FEW_QUALITY_MEASURE_CATEGORY(64,
+			"CPC+ Submissions must have at least %d of the following %s measures: %s.", true),
+	CPC_PLUS_TOO_FEW_QUALITY_MEASURES(65,
+			"CPC+ Submissions must have at least %d of the following measures: %s.", true);
+
 
 	private static final Map<Integer, ErrorCode> CODE_TO_VALUE = Arrays.stream(values())
 			.collect(Collectors.toMap(ErrorCode::getCode, Function.identity()));
@@ -106,7 +111,7 @@ public enum ErrorCode implements LocalizedError {
 	private final String message;
 	private final boolean hasFormat;
 
-	ErrorCode(int code,String message) {
+	ErrorCode(int code, String message) {
 		this(code, message, false);
 	}
 

converter/src/main/java/gov/cms/qpp/conversion/model/validation/MeasureConfig.java

@@ -31,6 +31,7 @@ public class MeasureConfig {
 
 	@JsonProperty("eMeasureUuid")
 	private String electronicMeasureVerUuid;
+	private String cpcPlusGroup;
 
 	private List<Strata> strata;
 
@@ -138,6 +139,14 @@ public void setElectronicMeasureId(String electronicMeasureId) {
 		this.electronicMeasureId = electronicMeasureId;
 	}
 
+	public String getCpcPlusGroup() {
+		return cpcPlusGroup;
+	}
+
+	public void setCpcPlusGroup(String cpcPlusGroup) {
+		this.cpcPlusGroup = cpcPlusGroup;
+	}
+
 	public String getElectronicMeasureVerUuid() {
 		return electronicMeasureVerUuid;
 	}

converter/src/main/java/gov/cms/qpp/conversion/model/validation/MeasureConfigs.java

@@ -8,6 +8,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -19,6 +21,7 @@ public class MeasureConfigs {
 
 	private static String measureDataFileName = DEFAULT_MEASURE_DATA_FILE_NAME;
 	private static Map<String, MeasureConfig> configurationMap;
+	private static Map<String, List<MeasureConfig>> cpcPlusGroups;
 
 	/**
 	 * Static initialization
@@ -39,6 +42,11 @@ private MeasureConfigs() {
 	 */
 	private static void initMeasureConfigs() {
 		configurationMap = grabConfiguration(measureDataFileName);
+		cpcPlusGroups = new HashMap<>();
+		getMeasureConfigs().stream()
+				.filter(config -> config.getCpcPlusGroup() != null)
+				.forEach(config -> cpcPlusGroups.computeIfAbsent(
+						config.getCpcPlusGroup(), key -> new ArrayList<>()).add(config));
 	}
 
 	public static Map<String, MeasureConfig> grabConfiguration(String fileName) {
@@ -94,13 +102,22 @@ public static Map<String, MeasureConfig> getConfigurationMap() {
 		return configurationMap;
 	}
 
+	/**
+	 * Retrieves a mapping of CPC+ measure groups
+	 *
+	 * @return mapped CPC+ measure groups
+	 */
+	public static Map<String, List<MeasureConfig>> getCpcPlusGroups() {
+		return cpcPlusGroups;
+	}
+
 	/**
 	 * Retrieves a list of required mappings for any given section
 	 *
 	 * @param section Specified section for measures required
 	 * @return The list of required measures
 	 */
-	public static List<String> requiredMeasuresForSection(String section) {
+	static List<String> requiredMeasuresForSection(String section) {
 
 		return configurationMap.values().stream()
 			.filter(measureConfig -> measureConfig.isRequired() && section.equals(measureConfig.getCategory()))

converter/src/main/java/gov/cms/qpp/conversion/validate/Checker.java

@@ -1,5 +1,13 @@
 package gov.cms.qpp.conversion.validate;
 
+import com.google.common.base.Strings;
+import gov.cms.qpp.conversion.model.Node;
+import gov.cms.qpp.conversion.model.TemplateId;
+import gov.cms.qpp.conversion.model.error.Detail;
+import gov.cms.qpp.conversion.model.error.LocalizedError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -10,16 +18,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Strings;
-
-import gov.cms.qpp.conversion.model.Node;
-import gov.cms.qpp.conversion.model.TemplateId;
-import gov.cms.qpp.conversion.model.error.Detail;
-import gov.cms.qpp.conversion.model.error.LocalizedError;
-
 /**
  * Node checker DSL to help abbreviate / simplify single node validations
  */
@@ -77,7 +75,7 @@ private boolean shouldShortcut() {
 	/**
 	 * checks target node for the existence of a value with the given name key
 	 *
-	 * @param message error message if searched value is not found
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @return The checker, for chaining method calls.
 	 */
@@ -92,11 +90,11 @@ public Checker value(LocalizedError code, String name) {
 	/**
 	 * checks target node to ensure a value is retrieved with given name key
 	 *
-	 * @param message error message if value is empty
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker valueIsNotEmpty(LocalizedError code, String name) {
+	Checker valueIsNotEmpty(LocalizedError code, String name) {
 		lastAppraised = node.getValue(name);
 		if (!shouldShortcut() && Strings.isNullOrEmpty((String) lastAppraised)) {
 			details.add(detail(code));
@@ -107,7 +105,7 @@ public Checker valueIsNotEmpty(LocalizedError code, String name) {
 	/**
 	 * checks target node for the existence of a single value with the given name key
 	 *
-	 * @param message error message if searched value is not found
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @return The checker, for chaining method calls.
 	 */
@@ -124,25 +122,25 @@ public Checker singleValue(LocalizedError code, String name) {
 	 * checks target node for the existence of a value with the given name key
 	 * and matches that value with one of the supplied values.
 	 *
-	 * @param message error message if searched value is not found
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @param expected the expected value
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker valueIs(LocalizedError code, String name, String expected) {
+	Checker valueIs(LocalizedError code, String name, String expected) {
 		return valueIn(code, name, expected);
 	}
 
 	/**
 	 * checks target node for the existence of a value with the given name key
 	 * and matches that value with one of the supplied values.
 	 *
-	 * @param message error message if searched value is not found
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @param values List of strings to check for the existence of.
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker valueIn(LocalizedError code, String name, String... values) {
+	Checker valueIn(LocalizedError code, String name, String... values) {
 		boolean contains = false;
 		if (name == null) {
 			details.add(detail(code));
@@ -168,11 +166,11 @@ public Checker valueIn(LocalizedError code, String name, String... values) {
 	/**
 	 * Checks target node for the existence of an integer value with the given name key.
 	 *
-	 * @param message error message if searched value is not found or is not appropriately typed
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker intValue(LocalizedError code, String name) {
+	Checker intValue(LocalizedError code, String name) {
 		if (!shouldShortcut()) {
 			try {
 				lastAppraised = Integer.parseInt(node.getValue(name));
@@ -187,12 +185,12 @@ public Checker intValue(LocalizedError code, String name) {
 	/**
 	 * Allow for compound comparisons of Node values.
 	 *
-	 * @param message error message should comparison fail
+	 * @param code that identifies the error
 	 * @param value to be compared against
 	 * @return The checker, for chaining method calls.
 	 */
 	@SuppressWarnings("unchecked")
-	public Checker greaterThan(LocalizedError code, Comparable<?> value) {
+	Checker greaterThan(LocalizedError code, Comparable<?> value) {
 		if (!shouldShortcut() && lastAppraised != null && ((Comparable<Object>) lastAppraised).compareTo(value) <= 0) {
 			details.add(detail(code));
 		}
@@ -203,12 +201,12 @@ public Checker greaterThan(LocalizedError code, Comparable<?> value) {
 	/**
 	 * Allow for compound comparisons of Node values.
 	 *
-	 * @param message error message should comparison fail
+	 * @param code that identifies the error
 	 * @param value to be compared against
 	 * @return The checker, for chaining method calls.
 	 */
 	@SuppressWarnings("unchecked")
-	public Checker lessThanOrEqualTo(LocalizedError code, Comparable<?> value) {
+	Checker lessThanOrEqualTo(LocalizedError code, Comparable<?> value) {
 		if (!shouldShortcut() && lastAppraised != null && ((Comparable<Object>) lastAppraised).compareTo(value) > 0) {
 			details.add(detail(code));
 		}
@@ -219,14 +217,14 @@ public Checker lessThanOrEqualTo(LocalizedError code, Comparable<?> value) {
 	/**
 	 * Checks target node value to be between a specific range
 	 *
-	 * @param message error message should comparison fail
+	 * @param code that identifies the error
 	 * @param name key of expected value
 	 * @param startValue starting value for range
 	 * @param endValue ending value for range
 	 * @return The checker, for chaining method calls
 	 */
 	@SuppressWarnings("unchecked")
-	public Checker inDecimalRangeOf(LocalizedError code, String name, float startValue, float endValue) {
+	Checker inDecimalRangeOf(LocalizedError code, String name, float startValue, float endValue) {
 		if (!shouldShortcut()) {
 			try {
 				lastAppraised = Float.parseFloat(node.getValue(name));
@@ -245,10 +243,10 @@ public Checker inDecimalRangeOf(LocalizedError code, String name, float startVal
 	/**
 	 * Checks target node for the existence of a specified parent.
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker hasParent(LocalizedError code, TemplateId type) {
+	Checker hasParent(LocalizedError code, TemplateId type) {
 		if (!shouldShortcut()) {
 			TemplateId parentType = Optional.ofNullable(node.getParent())
 					.orElse(new Node()).getType();
@@ -262,10 +260,10 @@ public Checker hasParent(LocalizedError code, TemplateId type) {
 	/**
 	 * Checks target node for the existence of any child nodes.
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker hasChildren(LocalizedError code) {
+	Checker hasChildren(LocalizedError code) {
 		if (!shouldShortcut() && node.getChildNodes().isEmpty()) {
 			details.add(detail(code));
 		}
@@ -275,7 +273,7 @@ public Checker hasChildren(LocalizedError code) {
 	/**
 	 * Verifies that the target node has at least the given minimum or more of the given {@link TemplateId}s.
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @param minimum minimum required children of specified types
 	 * @param types types of children to filter by
 	 * @return The checker, for chaining method calls.
@@ -293,7 +291,7 @@ public Checker childMinimum(LocalizedError code, int minimum, TemplateId... type
 	/**
 	 * Verifies that the target node has less than the given maximum of the given {@link TemplateId}s.
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @param maximum maximum required children of specified types
 	 * @param types types of children to filter by
 	 * @return The checker, for chaining method calls.
@@ -311,13 +309,16 @@ public Checker childMaximum(LocalizedError code, int maximum, TemplateId... type
 	/**
 	 * Verifies that the measures specified are contained within the current node's children
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @param measureIds measures specified for given node
 	 * @return The checker, for chaining method calls
 	 */
-	public Checker hasMeasures(LocalizedError code, String... measureIds) {
+	Checker hasMeasures(LocalizedError code, String... measureIds) {
+		return hasMeasures(code, measureIds.length, measureIds);
+	}
+
+	Checker hasMeasures(LocalizedError code, int numberOfMeasuresRequired, String... measureIds) {
 		if (!shouldShortcut()) {
-			int numberOfMeasuresRequired = Arrays.asList(measureIds).size();
 
 			long numNodesWithWantedMeasureIds = node.getChildNodes(currentNode -> {
 				String measureIdOfNode = currentNode.getValue("measureId");
@@ -332,7 +333,7 @@ public Checker hasMeasures(LocalizedError code, String... measureIds) {
 				return false;
 			}).count();
 
-			if (numberOfMeasuresRequired != numNodesWithWantedMeasureIds) {
+			if (numNodesWithWantedMeasureIds < numberOfMeasuresRequired) {
 				details.add(detail(code));
 			}
 		}
@@ -342,11 +343,11 @@ public Checker hasMeasures(LocalizedError code, String... measureIds) {
 	/**
 	 * Verifies that the target node contains only children of specified template ids
 	 *
-	 * @param message validation error message
+	 * @param code that identifies the error
 	 * @param types types of template ids to filter
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker onlyHasChildren(LocalizedError code, TemplateId... types) {
+	Checker onlyHasChildren(LocalizedError code, TemplateId... types) {
 		if (!shouldShortcut()) {
 			Set<TemplateId> templateIds = EnumSet.noneOf(TemplateId.class);
 			for (TemplateId templateId : types) {
@@ -368,7 +369,7 @@ public Checker onlyHasChildren(LocalizedError code, TemplateId... types) {
 	 *
 	 * @return The checker, for chaining method calls.
 	 */
-	public Checker incompleteValidation() {
+	Checker incompleteValidation() {
 		node.setValidated(false);
 		return this;
 	}