Merge pull request #462 from MeasureAuthoringTool/feature/MAT-10341-structure-def-ignore-version

MAT-10341: update config to match other toolchain order; update getStructureDefinitionById to ignore version (if present) for now

Author: nmorasb

src/main/java/gov/cms/madie/madiefhirservice/config/HapiFhirConfig.java

@@ -156,8 +156,8 @@ public IValidationSupport uscore6ValidationSupportChain(@Autowired FhirContext u
             validationConfig);
 
     return new ValidationSupportChain(
-        npmPackageSupport,
         vsesValidationSupport,
+        npmPackageSupport,
         new DefaultProfileValidationSupport(uscore6FhirContext),
         new CustomQiCoreInMemoryValidationSupport(uscore6FhirContext, validationConfig),
         new CommonCodeSystemsTerminologyService(uscore6FhirContext),
@@ -192,8 +192,8 @@ public IValidationSupport usqualitycore05ValidationSupportChain(
             validationConfig);
 
     return new ValidationSupportChain(
-        npmPackageSupport,
         vsesValidationSupport,
+        npmPackageSupport,
         new DefaultProfileValidationSupport(usqualitycore05FhirContext),
         new CustomQiCoreInMemoryValidationSupport(usqualitycore05FhirContext, validationConfig),
         new CommonCodeSystemsTerminologyService(usqualitycore05FhirContext),

src/main/java/gov/cms/madie/madiefhirservice/services/StructureDefinitionService.java

@@ -35,20 +35,21 @@ public class StructureDefinitionService {
    * Fetches the structure definition for the given resource
    *
    * @param modelType the model to fetch the structure definition for
-   * @param structureDefinitionId ID of the structure definition, as found in the
-   *     StructureDefinitions based on model and version. e.g. Patient, us-core-patient,
-   *     qicore-patient
+   * @param structureDefinitionId ID of the structure definition, optionally followed by a
+   *     pipe-delimited version, as found in the StructureDefinitions for the model. e.g. Patient,
+   *     us-core-patient, qicore-patient|6.0.0
    */
   public StructureDefinitionDto getStructureDefinitionById(
       ModelType modelType, String structureDefinitionId) {
     IValidationSupport chain = modelAwareFhirFactory.getValidationSupportForModel(modelType);
 
+    String unversionedId = structureDefinitionId.split("\\|", 2)[0];
+
     IBaseResource structureDefinition =
         Objects.requireNonNull(chain.fetchAllStructureDefinitions()).stream()
-            .filter(resource -> structureDefinitionId.equals(resource.getIdElement().getIdPart()))
+            .filter(resource -> unversionedId.equals(resource.getIdElement().getIdPart()))
             .findFirst()
-            .orElseThrow(
-                () -> new ResourceNotFoundException("StructureDefinition", structureDefinitionId));
+            .orElseThrow(() -> new ResourceNotFoundException("StructureDefinition", unversionedId));
 
     IParser parser =
         chain

src/test/java/gov/cms/madie/madiefhirservice/services/StructureDefinitionServiceTest.java

@@ -58,12 +58,14 @@ void testGetStructureDefinitionByIdThrowsNotFoundForNoDefinitions() {
     // given
     when(mockChain.fetchAllStructureDefinitions()).thenReturn(List.of());
 
-    // when / then
-    assertThrows(
-        ResourceNotFoundException.class,
+    // when
+    Executable action =
         () ->
             structureDefinitionService.getStructureDefinitionById(
-                ModelType.QI_CORE_6_0_0, "qicore-practitioner"));
+                ModelType.QI_CORE_6_0_0, "qicore-practitioner");
+
+    // then
+    assertThrows(ResourceNotFoundException.class, action);
   }
 
   @Test
@@ -79,12 +81,35 @@ void testGetStructureDefinitionByIdThrowsNotFoundForNoMatchingDefinitions() {
     def3.setId("us-core-practitioner");
     when(mockChain.fetchAllStructureDefinitions()).thenReturn(List.of(def1, def3));
 
-    // when / then
-    assertThrows(
-        ResourceNotFoundException.class,
+    // when
+    Executable action =
+        () ->
+            structureDefinitionService.getStructureDefinitionById(
+                ModelType.QI_CORE_6_0_0, "qicore-practitioner");
+
+    // then
+    assertThrows(ResourceNotFoundException.class, action);
+  }
+
+  @Test
+  void testGetStructureDefinitionByIdThrowsNotFoundForVersionedIdWithNoMatch() {
+    // given
+    when(mockChain.fetchAllStructureDefinitions()).thenReturn(List.of());
+
+    // when
+    Executable action =
         () ->
             structureDefinitionService.getStructureDefinitionById(
-                ModelType.QI_CORE_6_0_0, "qicore-practitioner"));
+                ModelType.QI_CORE_6_0_0, "qicore-practitioner|6.0.0");
+
+    // then
+    ResourceNotFoundException exception = assertThrows(ResourceNotFoundException.class, action);
+    assertThat(
+        exception.getMessage(),
+        is(
+            equalTo(
+                "Could not find StructureDefinition resource for measure: "
+                    + "qicore-practitioner")));
   }
 
   @Test
@@ -288,6 +313,29 @@ void testGetStructureDefinitionByIdReturnsQiCoreResourceStructureDefinitionDto()
         output.getDefinition().contains("\"resourceType\": \"StructureDefinition\""), is(true));
   }
 
+  @Test
+  void testGetStructureDefinitionByIdReturnsResourceForVersionedId() {
+    // given
+    StructureDefinition definition =
+        new StructureDefinition()
+            .setKind(StructureDefinition.StructureDefinitionKind.RESOURCE)
+            .setTitle("QICore Patient")
+            .setVersion("6.0.0");
+    definition.setId("qicore-patient");
+    when(mockChain.fetchAllStructureDefinitions()).thenReturn(List.of(definition));
+    when(mockChain.getFhirContext()).thenReturn(fhirContextQiCoreStu600);
+
+    // when
+    StructureDefinitionDto output =
+        structureDefinitionService.getStructureDefinitionById(
+            ModelType.QI_CORE_6_0_0, "qicore-patient|6.0.0");
+
+    // then
+    assertThat(output, is(notNullValue()));
+    assertThat(output.getDefinition().contains("\"id\": \"qicore-patient\""), is(true));
+    assertThat(output.getDefinition().contains("\"version\": \"6.0.0\""), is(true));
+  }
+
   @Test
   void testGetStructureDefinitionByIdReturnsComplexTypeStructureDefinitionDto() {
     // given