Merge branch 'develop' into MAT-6651

MeasureAuthoringTool · Feb 5, 2024 · fdc937c · fdc937c
2 parents 1f16ab5 + 1e934e5
commit fdc937c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/constants/UriConstants.java b/src/main/java/gov/cms/madie/madiefhirservice/constants/UriConstants.java
@@ -91,6 +91,6 @@ public static final class QiCore {
   public static final class MadieMeasure {
     public static final String CMS_ID = "https://madie.cms.gov/measure/cmsId";
     public static final String SHORT_NAME = "https://madie.cms.gov/measure/shortName";
-    public static final String NQF_ID = "https://madie.cms.gov/measure/nqfId";
+    public static final String CBE_ID = "https://madie.cms.gov/measure/cbeId";
   }
 }
diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java
@@ -152,7 +152,7 @@ public List<Identifier> buildMeasureIdentifiers(Measure madieMeasure) {
         identifiers.add(
             buildIdentifier(
                     IdentifierUse.OFFICIAL,
-                    UriConstants.MadieMeasure.NQF_ID,
+                    UriConstants.MadieMeasure.CBE_ID,
                     endorsement.getEndorsementId(),
                     ValueConstants.CODE_ENDORSER)
                 .setAssigner(

diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java
@@ -738,7 +738,7 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersForMeasure() {
                 MeasureMetaData.builder()
                     .endorsements(
                         List.of(
-                            Endorsement.builder().endorsementId("NQF1234").endorser("NQF").build()))
+                            Endorsement.builder().endorsementId("CBE1234").endorser("CBE").build()))
                     .build())
             .build();
     List<Identifier> output = measureTranslatorService.buildMeasureIdentifiers(madieMeasure);
@@ -777,18 +777,18 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersForMeasure() {
         is(equalTo(CODE_SYSTEM_IDENTIFIER_TYPE_URI)));
     assertThat(
         output.get(2).getType().getCodingFirstRep().getCode(), is(equalTo(CODE_VERSION_SPECIFIC)));
-    // NQF ID
+    // CBE ID
     assertThat(output.get(3), is(notNullValue()));
     assertThat(output.get(3).getUse(), is(equalTo(Identifier.IdentifierUse.OFFICIAL)));
-    assertThat(output.get(3).getSystem(), is(equalTo(UriConstants.MadieMeasure.NQF_ID)));
-    assertThat(output.get(3).getValue(), is(equalTo("NQF1234")));
+    assertThat(output.get(3).getSystem(), is(equalTo(UriConstants.MadieMeasure.CBE_ID)));
+    assertThat(output.get(3).getValue(), is(equalTo("CBE1234")));
     assertThat(output.get(3).getType(), is(notNullValue()));
     assertThat(
         output.get(3).getType().getCodingFirstRep().getSystem(),
         is(equalTo(CODE_SYSTEM_IDENTIFIER_TYPE_URI)));
     assertThat(output.get(3).getType().getCodingFirstRep().getCode(), is(equalTo(CODE_ENDORSER)));
     assertThat(output.get(3).getAssigner(), is(notNullValue()));
-    assertThat(output.get(3).getAssigner().getDisplay(), is(equalTo("NQF")));
+    assertThat(output.get(3).getAssigner().getDisplay(), is(equalTo("CBE")));
     // CMS ID
     assertThat(output.get(4), is(notNullValue()));
     assertThat(output.get(4).getUse(), is(equalTo(Identifier.IdentifierUse.OFFICIAL)));
@@ -804,7 +804,7 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersForMeasure() {
   }
 
   @Test
-  public void testBuildMeasureIdentifiersReturnsIdentifiersWithCmsIdWithoutNqfForMeasure() {
+  public void testBuildMeasureIdentifiersReturnsIdentifiersWithCmsIdWithoutCbeForMeasure() {
     final Measure madieMeasure =
         Measure.builder()
             .id("MEASURE_ID_1")
@@ -831,7 +831,7 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersWithCmsIdWithoutNqfForM
   }
 
   @Test
-  public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutCmsIdWithNqfForMeasure() {
+  public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutCmsIdWithCbeForMeasure() {
     final Measure madieMeasure =
         Measure.builder()
             .id("MEASURE_ID_1")
@@ -842,7 +842,7 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutCmsIdWithNqfForM
                 MeasureMetaData.builder()
                     .endorsements(
                         List.of(
-                            Endorsement.builder().endorsementId("NQF1234").endorser("NQF").build()))
+                            Endorsement.builder().endorsementId("CBE1234").endorser("CBE").build()))
                     .build())
             .build();
     List<Identifier> output = measureTranslatorService.buildMeasureIdentifiers(madieMeasure);
@@ -857,13 +857,13 @@ public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutCmsIdWithNqfForM
     // Measure ID
     assertThat(output.get(2), is(notNullValue()));
     assertThat(output.get(2).getValue(), is(equalTo(URN_UUID_PREFIX + "UUID_1")));
-    // NQF ID
+    // CBE ID
     assertThat(output.get(3), is(notNullValue()));
-    assertThat(output.get(3).getValue(), is(equalTo("NQF1234")));
+    assertThat(output.get(3).getValue(), is(equalTo("CBE1234")));
   }
 
   @Test
-  public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutNqfForMeasure() {
+  public void testBuildMeasureIdentifiersReturnsIdentifiersWithoutCbeForMeasure() {
     final Measure madieMeasure =
         Measure.builder()
             .id("MEASURE_ID_1")