Merge pull request #618 from CMSgov/bug/stratifier-uuid-insensitivity

saquino0827 · web-flow · commit c3888f330c58 · 2018-02-14T15:41:21.000-06:00
Merge stratifier hot fix into master
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/commandline/pom.xml b/commandline/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/converter/pom.xml b/converter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/validate/CpcQualityMeasureIdValidator.java b/converter/src/main/java/gov/cms/qpp/conversion/validate/CpcQualityMeasureIdValidator.java
@@ -123,7 +123,7 @@ protected void followUpHook(Node node, SubPopulation sub) {
 
 		sub.getStrata().forEach(stratum -> {
 			Predicate<Node> seek = child ->
-					child.getValue(StratifierDecoder.STRATIFIER_ID).equals(stratum);
+					child.getValue(StratifierDecoder.STRATIFIER_ID).equalsIgnoreCase(stratum);
 
 			if (strataNodes.stream().noneMatch(seek)) {
 				LocalizedError error = ErrorCode.CPC_QUALITY_MEASURE_ID_MISSING_STRATA.format(stratum,
diff --git a/converter/src/test/resources/fixtures/qppct298/cms137v5.xml b/converter/src/test/resources/fixtures/qppct298/cms137v5.xml
@@ -687,6 +687,7 @@
                     </observation>
                 </entryRelationship>
                 <!-- Stratifier for EFB5B088-CE10-43DE-ACCD-9913B7AC12A2-->
+                <!-- Includes lower and uppercase characters -->
                 <entryRelationship typeCode="COMP">
                     <observation classCode="OBS" moodCode="EVN">
                         <templateId root="2.16.840.1.113883.10.20.27.3.20"/>
@@ -718,12 +719,13 @@
                         </entryRelationship>
                         <reference typeCode="REFR">
                             <externalObservation>
-                                <id root="EFB5B088-CE10-43DE-ACCD-9913B7AC12A2"/>
+                                <id root="efb5b088-ce10-43de-accd-9913b7ac12a2"/>
                             </externalObservation>
                         </reference>
                     </observation>
                 </entryRelationship>
                 <!-- Stratifier for 94B9555F-8700-45EF-B69F-433EBEDE8051-->
+                <!--Includes lower and uppercase characters-->
                 <entryRelationship typeCode="COMP">
                     <observation classCode="OBS" moodCode="EVN">
                         <templateId root="2.16.840.1.113883.10.20.27.3.20"/>
@@ -755,7 +757,7 @@
                         </entryRelationship>
                         <reference typeCode="REFR">
                             <externalObservation>
-                                <id root="94B9555F-8700-45EF-B69F-433EBEDE8051"/>
+                                <id root="94B9555F-8700-45eF-B69F-433eBEdE8051"/>
                             </externalObservation>
                         </reference>
                     </observation>
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "qpp-conversion-frontend",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
diff --git a/generate/pom.xml b/generate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>qpp-conversion-tool-parent</artifactId>
         <groupId>gov.cms.qpp.conversion</groupId>
-        <version>1.2.2-RELEASE</version>
+        <version>1.2.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>gov.cms.qpp.conversion</groupId>
 	<artifactId>qpp-conversion-tool-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2.2-RELEASE</version>
+	<version>1.2.3-RELEASE</version>
 	<name>QPP Conversion Tool</name>
 
 	<properties>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/test-commons/pom.xml b/test-commons/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>1.2.2-RELEASE</version>
+		<version>1.2.3-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "qpp-conversion-frontend",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "1.2.3",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"ng": "ng",`