Merge pull request #1107 from CMSgov/feature/QPPSF-8127_Y5_CPCPlus

QPPSF-8127: 2021 CPC+ Updates

Author: saquino0827

ERROR_MESSAGES.md

@@ -88,3 +88,4 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 101 : CT - Denominator count must be equal to Initial Population count for CPC Plus measure population `(measure population id)`.
 * 102 : CT - A PI section cannot contain PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2
 * 103 : CT - PCF Submissions must have at least `(PCF Measure minimum)` of the following measures: `(Listing of valid measure ids)`
+* 104 : CT - The file contains Promoting Interoperability (PI) data; PI data must not be reported for CPC+

commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java

@@ -189,7 +189,8 @@ public enum ProblemCode implements LocalizedProblem {
 	CPC_PCF_PLUS_DENOMINATOR_COUNT_INVALID(101, "Denominator count must be equal to Initial Population count for CPC Plus measure population `(measure population id)`.", true),
 	PI_RESTRICTED_MEASURES(102, "A PI section cannot contain PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2", false),
 	PCF_TOO_FEW_QUALITY_MEASURE_CATEGORY(103, "PCF Submissions must have at least `(PCF Measure minimum)` "
-		+ "of the following measures: `(Listing of valid measure ids)`", true);
+		+ "of the following measures: `(Listing of valid measure ids)`", true),
+	CPC_PLUS_NO_PI(104, "The file contains Promoting Interoperability (PI) data; PI data must not be reported for CPC+");
 
 
 	private static final Map<Integer, ProblemCode> CODE_TO_VALUE = Arrays.stream(values())

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

@@ -88,13 +88,17 @@ protected void performValidation(Node node) {
 
 
 		if (Program.isCpc(node)) {
-			checkErrors(node)
+			forceCheckErrors(node)
 				.singleValue(ProblemCode.CPC_PCF_CLINICAL_DOCUMENT_ONLY_ONE_APM_ALLOWED, ClinicalDocumentDecoder.PRACTICE_ID)
-				.valueIsNotEmpty(ProblemCode.CPC_PCF_CLINICAL_DOCUMENT_EMPTY_APM, ClinicalDocumentDecoder.PRACTICE_ID);
+				.valueIsNotEmpty(ProblemCode.CPC_PCF_CLINICAL_DOCUMENT_EMPTY_APM, ClinicalDocumentDecoder.PRACTICE_ID)
+				.doesNotHaveChildren(ProblemCode.CPC_PLUS_NO_PI, TemplateId.PI_SECTION_V2);
+			checkWarnings(node)
+				.doesNotHaveChildren(ProblemCode.CPC_PCF_PLUS_NO_IA_OR_PI, TemplateId.IA_SECTION);
 			validateApmEntityId(node, ClinicalDocumentDecoder.PRACTICE_ID);
+		} else {
+			checkWarnings(node)
+				.doesNotHaveChildren(ProblemCode.CPC_PCF_PLUS_NO_IA_OR_PI, TemplateId.IA_SECTION, TemplateId.PI_SECTION_V2);
 		}
-		checkWarnings(node)
-			.doesNotHaveChildren(ProblemCode.CPC_PCF_PLUS_NO_IA_OR_PI, TemplateId.IA_SECTION, TemplateId.PI_SECTION_V2);
 
 		if (hasTinAndNpi(node)) {
 			validateNumberOfTinsAndNpis(node);

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

@@ -8,7 +8,7 @@
 import gov.cms.qpp.conversion.model.error.ProblemCode;
 
 /**
- * Validates a measure groupings for a CPC+ Quality Measure Section node.
+ * Validates a measure groupings for a PCF Quality Measure Section node.
  */
 @Validator(value = TemplateId.MEASURE_SECTION_V4, program = Program.PCF)
 public class PcfQualityMeasureSectionValidator extends NodeValidator {
@@ -33,7 +33,7 @@ protected void performValidation(Node node) {
 	}
 
 	/**
-	 * Verify that CPC+ measurement group minimums are met.
+	 * Verify that PCF measurement group minimums are met.
 	 * @param checker node validator helper
 	 */
 	void checkGroupMinimum(Checker checker) {

converter/src/test/java/gov/cms/qpp/acceptance/cpc/CpcPlus2021AcceptanceTest.java

@@ -0,0 +1,84 @@
+package gov.cms.qpp.acceptance.cpc;
+
+import gov.cms.qpp.conversion.Context;
+import gov.cms.qpp.conversion.Converter;
+import gov.cms.qpp.conversion.PathSource;
+import gov.cms.qpp.conversion.model.error.AllErrors;
+import gov.cms.qpp.conversion.model.error.Detail;
+import gov.cms.qpp.conversion.model.error.TransformException;
+import gov.cms.qpp.conversion.model.validation.ApmEntityIds;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static com.google.common.truth.Truth.assertThat;
+import static gov.cms.qpp.acceptance.Util.getXml;
+
+public class CpcPlus2021AcceptanceTest {
+    private static final Path BASE = Paths.get("src/test/resources/cpc_plus/acceptance2021");
+    private static final Path SUCCESS = BASE.resolve("success");
+    private static final Path SUCCESS_WARNING = BASE.resolve("warning");
+    private static final Path FAILURE = BASE.resolve("failure");
+    private final ApmEntityIds apmEntityIds = new ApmEntityIds("test_apm_entity_ids.json");
+
+    static Stream<Path> successData() {
+        return getXml(SUCCESS);
+    }
+
+    static Stream<Path> failureData() {
+        return getXml(FAILURE);
+    }
+
+    static Stream<Path> successWithWarningsData() {
+        return getXml(SUCCESS_WARNING);
+    }
+
+    @ParameterizedTest
+    @MethodSource("failureData")
+    void failure(Path entry) {
+        Converter converter = new Converter(new PathSource(entry), new Context(apmEntityIds));
+        Assertions.assertThrows(TransformException.class, converter::transform);
+    }
+
+    @ParameterizedTest
+    @MethodSource("successData")
+    void success(Path entry) {
+        AllErrors errors = null;
+        List<Detail> warnings = null;
+
+        Converter converter = new Converter(new PathSource(entry), new Context(apmEntityIds));
+
+        try {
+            converter.transform();
+        } catch (TransformException failure) {
+            errors = failure.getDetails();
+            warnings = failure.getConversionReport().getWarnings();
+        }
+
+        assertThat(errors).isNull();
+        assertThat(warnings).isNull();
+    }
+
+    @ParameterizedTest
+    @MethodSource("successWithWarningsData")
+    void warning(Path entry) {
+        AllErrors errors = null;
+
+        Converter converter = new Converter(new PathSource(entry), new Context(apmEntityIds));
+
+        try {
+            converter.transform();
+        } catch (TransformException failure) {
+            errors = failure.getDetails();
+        }
+
+        assertThat(errors).isNull();
+        assertThat(converter.getReport().getWarnings()).isNotNull();
+        assertThat(converter.getReport().getWarnings()).isNotEmpty();
+    }
+}

converter/src/test/java/gov/cms/qpp/conversion/validate/CpcClinicalDocumentValidatorTest.java

@@ -202,15 +202,15 @@ void testWarnWhenContainsIa() {
 	}
 
 	@Test
-	void testWarnWhenContainsPi() {
+	void testErrorWhenContainsPi() {
 		Node clinicalDocumentNode = createCpcPlusClinicalDocument();
 		Node piSection = new Node(TemplateId.PI_SECTION_V2);
 		clinicalDocumentNode.addChildNode(piSection);
-		List<Detail> warnings = cpcValidator.validateSingleNode(clinicalDocumentNode).getWarnings();
+		List<Detail> errors = cpcValidator.validateSingleNode(clinicalDocumentNode).getErrors();
 
-		assertThat(warnings)
+		assertThat(errors)
 			.comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-			.contains(ProblemCode.CPC_PCF_PLUS_NO_IA_OR_PI);
+			.contains(ProblemCode.CPC_PLUS_NO_PI);
 	}
 
 	@Test