Merge pull request #1539 from CMSgov/QPPA-10470

QPPA-10470: support appPlus program submission

Author: chetanmunegowda

converter/src/main/java/gov/cms/qpp/conversion/decode/ClinicalDocumentDecoder.java

@@ -246,15 +246,15 @@ private Pair<String, String> getProgramNameEntityPair(String name) {
 				break;
 
 			case APP_PLUS_INDIVIDUAL:
-				pair = new ImmutablePair<>(APP_PLUS_INDIVIDUAL, ENTITY_INDIVIDUAL);
+				pair = new ImmutablePair<>(APP_PLUS_PROGRAM_NAME, ENTITY_INDIVIDUAL);
 				break;
 
 			case APP_PLUS_GROUP:
-				pair = new ImmutablePair<>(APP_PLUS_GROUP, ENTITY_GROUP);
+				pair = new ImmutablePair<>(APP_PLUS_PROGRAM_NAME, ENTITY_GROUP);
 				break;
 
 			case APP_PLUS_APM:
-				pair = new ImmutablePair<>(APP_PLUS_APM, ENTITY_APM);
+				pair = new ImmutablePair<>(APP_PLUS_PROGRAM_NAME, ENTITY_APM);
 				break;
 
 			case SSP_PI_INDIVIDUAL:

converter/src/main/java/gov/cms/qpp/conversion/encode/ClinicalDocumentEncoder.java

@@ -79,7 +79,7 @@ private void encodeToplevel(JsonWrapper wrapper, Node thisNode) {
 			wrapper.put(ENTITY_ID, thisNode.getValue(ENTITY_ID));
 		}
 
-		if ((Program.isApp(thisNode) || Program.isMips(thisNode))
+		if ((Program.isApp(thisNode) || Program.isMips(thisNode) || Program.isAppPlus(thisNode))
 				&& ENTITY_APM.equalsIgnoreCase(entityType)) {
 			wrapper.put(ENTITY_ID, thisNode.getValue(ENTITY_ID));
 		}
@@ -118,7 +118,7 @@ private JsonWrapper encodeMeasurementSets(
 			Node currentNode
 	) {
 		JsonWrapper measurementSetsWrapper = new JsonWrapper();
-		JsonWrapper childWrapper;
+		String measureRoot = TemplateId.MEASURE_SECTION_V5.getRoot();
 
 		for (Node child : childMapByTemplateId.values()) {
 			if (child == null) {
@@ -133,23 +133,31 @@ private JsonWrapper encodeMeasurementSets(
 			}
 
 			try {
-				childWrapper = new JsonWrapper();
+				JsonWrapper childWrapper = new JsonWrapper();
 				sectionEncoder.encode(childWrapper, child);
 				childWrapper.put("source", "qrda3");
 
-				String mvpId = currentNode.getValue(MVP_ID);
-				if (TemplateId.MEASURE_SECTION_V5.getRoot().equalsIgnoreCase(childType.getRoot())
-					&& !StringUtils.isEmpty(mvpId)) {
-					childWrapper.put(PROGRAM_NAME, mvpId);
-				}
-				else if (TemplateId.MEASURE_SECTION_V5.getRoot().equalsIgnoreCase(childType.getRoot())
-					&& MIPS_APM.equalsIgnoreCase(
-						currentNode.getValue(RAW_PROGRAM_NAME))) {
-					childWrapper.put(PROGRAM_NAME, MIPS.toLowerCase(Locale.getDefault()));
-				} else if (TemplateId.MEASURE_SECTION_V5.getRoot().equalsIgnoreCase(childType.getRoot())
-						&& APP_APM.equalsIgnoreCase(
-						currentNode.getValue(RAW_PROGRAM_NAME))) {
-					childWrapper.put(PROGRAM_NAME, APP_PROGRAM_NAME.toLowerCase(Locale.getDefault()));
+				if (measureRoot.equalsIgnoreCase(childType.getRoot())) {
+					String mvpId = currentNode.getValue(MVP_ID);
+					if (!StringUtils.isEmpty(mvpId)) {
+						childWrapper.put(PROGRAM_NAME, mvpId);
+					} else {
+						String raw = currentNode.getValue(RAW_PROGRAM_NAME);
+						String key = (raw != null ? raw.toUpperCase(Locale.ROOT) : "");
+
+						switch (key) {
+							case MIPS_APM:
+								childWrapper.put(PROGRAM_NAME,
+										MIPS.toLowerCase(Locale.getDefault()));
+								break;
+							case APP_APM:
+								childWrapper.put(PROGRAM_NAME,
+										APP_PROGRAM_NAME.toLowerCase(Locale.getDefault()));
+								break;
+							default:
+								// no matching program
+						}
+					}
 				}
 
 				measurementSetsWrapper.put(childWrapper);

converter/src/main/java/gov/cms/qpp/conversion/model/Program.java

@@ -16,6 +16,7 @@ public enum Program {
 	MIPS("MIPS_GROUP", "MIPS_INDIV", "MIPS_VIRTUALGROUP", "MIPS", "MIPS_APMENTITY", "MIPS_SUBGROUP"),
 	PCF("PCF"),
 	APP("MIPS_APP1_INDIV", "MIPS_APP1_GROUP", "MIPS_APP1_APMENTITY"),
+	APP_PLUS("APP_PLUS_INDIV", "APP_PLUS_GROUP", "APP_PLUS_APMENTITY"),
 	ALL;
 
 	private final Set<String> aliases;
@@ -59,6 +60,16 @@ public static boolean isApp(Node node) {
 		return extractProgram(node) == Program.APP;
 	}
 
+	/**
+	 * Checks if a node is using the appPlus program
+	 *
+	 * @param node
+	 * @return
+	 */
+	public static boolean isAppPlus(Node node) {
+		return extractProgram(node) == Program.APP_PLUS;
+	}
+
 	/**
 	 * Extracts a program type from a node
 	 *

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

@@ -53,7 +53,7 @@ protected void performValidation(final Node node) {
 			String entityType = Optional.ofNullable(node.getValue(ENTITY_TYPE)).orElse("<missing>");
 
 			forceCheckErrors(node).valueIn(ProblemCode.CLINICAL_DOCUMENT_INCORRECT_PROGRAM_NAME.format(VALID_PROGRAM_NAMES, programName),
-				PROGRAM_NAME, MIPS_PROGRAM_NAME, PCF, APP_PROGRAM_NAME);
+				PROGRAM_NAME, MIPS_PROGRAM_NAME, PCF, APP_PROGRAM_NAME, APP_PLUS_PROGRAM_NAME);
 
 			if (ENTITY_VIRTUAL_GROUP.equals(entityType)) {
 				forceCheckErrors(node).value(ProblemCode.VIRTUAL_GROUP_ID_REQUIRED, ENTITY_ID);

converter/src/test/java/gov/cms/qpp/conversion/model/ProgramTest.java

@@ -115,6 +115,27 @@ void testSetOfProgramNames() {
 		assertThat(actual).containsAtLeastElementsIn(expected);
 	}
 
+	@Test
+	void testIsAppPlusIndividualIsTrue() {
+		Node node = new Node();
+		node.putValue(RAW_PROGRAM_NAME, "APP_PLUS_INDIV");
+		assertThat(Program.isAppPlus(node)).isTrue();
+	}
+
+	@Test
+	void testIsAppPlusGroupIsTrue() {
+		Node node = new Node();
+		node.putValue(RAW_PROGRAM_NAME, "APP_PLUS_GROUP");
+		assertThat(Program.isAppPlus(node)).isTrue();
+	}
+
+	@Test
+	void testIsAppPlusAppEntityIsTrue() {
+		Node node = new Node();
+		node.putValue(RAW_PROGRAM_NAME, "APP_PLUS_APMENTITY");
+		assertThat(Program.isAppPlus(node)).isTrue();
+	}
+
 	@Override
 	public Class<? extends Enum<?>> getEnumType() {
 		return Program.class;