us_core_test_kit 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7582755a94412bbb3ec0b8a270897af3f388565d958d81142d6bb8bda8807b
-  data.tar.gz: fa11f769e3df77aeded50dd43a1131980818cda097185630105f07b45233f73c
+  metadata.gz: e2165ec13e4df3f34f052db84ac66517f2c05287f7337a262419c67c35e8b166
+  data.tar.gz: f05531ac89796f43c6199889370741b1f2f78e187169f7c5153df2264fa87dbc
 SHA512:
-  metadata.gz: 5f8b612193ffc30eea51d859618fb82a452ae7b1d967e8c460a43f3f1dedf3afdfc93b5395274be42312e42550816b327f70c0cb377b7010cb2718ee68513389
-  data.tar.gz: eae33ba2a29f0242203eea93ca967e00b93ec767f218ea83c80e28eb1144b45d36563416149435a5d0c224a6d26dcb26de826e94f2745c8e52fc41915c34f7cf
+  metadata.gz: 81d0e3b1eb27d76f15855b378fe50596f9c75dc639f3a824ed4871e7b7a102ebc4a500a56773d818ac1ec19bb148d0c9fc9ddc4a8270e38c6827b31f2e5454de
+  data.tar.gz: 2960026760e8b35b815016a76388125d5730b2074d4b10155b5eeb654f3b40028df7311ac241b3706c58541f8140cac59ed23d6f9a9bb2a346696c40ef37a72b

data/lib/us_core_test_kit/generated/v3.1.1/document_reference/document_reference_must_support_test.rb

@@ -22,7 +22,6 @@ module USCoreTestKit
         * DocumentReference.context
         * DocumentReference.context.encounter
         * DocumentReference.context.period
-        * DocumentReference.custodian
         * DocumentReference.date
         * DocumentReference.identifier
         * DocumentReference.status

data/lib/us_core_test_kit/generated/v3.1.1/document_reference/document_reference_reference_resolution_test.rb

@@ -15,7 +15,6 @@ module USCoreTestKit
 
         * DocumentReference.author
         * DocumentReference.context.encounter
-        * DocumentReference.custodian
         * DocumentReference.subject
       )
 

data/lib/us_core_test_kit/generated/v3.1.1/document_reference/metadata.yml

@@ -233,9 +233,6 @@
   - :path: author
     :types:
     - Reference
-  - :path: custodian
-    :types:
-    - Reference
   - :path: content
   - :path: content.attachment
   - :path: content.attachment.contentType

data/lib/us_core_test_kit/generated/v3.1.1/goal/metadata.yml

@@ -155,7 +155,7 @@
   :path: target.measure
 - :type: Quantity
   :strength: example
-  :system: 
+  :system:
   :path: target.detail
 - :type: CodeableConcept
   :strength: example

data/lib/us_core_test_kit/generated/v3.1.1/metadata.yml

@@ -4645,9 +4645,6 @@
     - :path: author
       :types:
       - Reference
-    - :path: custodian
-      :types:
-      - Reference
     - :path: content
     - :path: content.attachment
     - :path: content.attachment.contentType
@@ -5279,7 +5276,7 @@
     :path: target.measure
   - :type: Quantity
     :strength: example
-    :system: 
+    :system:
     :path: target.detail
   - :type: CodeableConcept
     :strength: example

data/lib/us_core_test_kit/generated/v4.0.0/goal/metadata.yml

@@ -152,7 +152,7 @@
   :path: target.measure
 - :type: Quantity
   :strength: example
-  :system: 
+  :system:
   :path: target.detail
 - :type: CodeableConcept
   :strength: example

data/lib/us_core_test_kit/generated/v4.0.0/metadata.yml

@@ -5317,7 +5317,7 @@
     :path: target.measure
   - :type: Quantity
     :strength: example
-    :system: 
+    :system:
     :path: target.detail
   - :type: CodeableConcept
     :strength: example

data/lib/us_core_test_kit/generated/v5.0.1/goal/metadata.yml

@@ -1168,7 +1168,7 @@
   :path: target.measure
 - :type: Quantity
   :strength: example
-  :system: 
+  :system:
   :path: target.detail
 - :type: CodeableConcept
   :strength: example

data/lib/us_core_test_kit/generated/v5.0.1/medication_request/metadata.yml

@@ -148,7 +148,11 @@
     :discriminator:
       :type: requiredBinding
       :path: ''
-      :values: []
+      :values:
+      - inpatient
+      - outpatient
+      - community
+      - discharge
   :elements:
   - :path: status
   - :path: intent

data/lib/us_core_test_kit/generated/v5.0.1/metadata.yml

@@ -6904,7 +6904,7 @@
     :path: target.measure
   - :type: Quantity
     :strength: example
-    :system: 
+    :system:
     :path: target.detail
   - :type: CodeableConcept
     :strength: example
@@ -7534,7 +7534,11 @@
       :discriminator:
         :type: requiredBinding
         :path: ''
-        :values: []
+        :values:
+        - inpatient
+        - outpatient
+        - community
+        - discharge
     :elements:
     - :path: status
     - :path: intent

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -1,3 +1,5 @@
+require_relative 'value_extractor'
+
 module USCoreTestKit
   class Generator
     class MustSupportMetadataExtractor
@@ -97,13 +99,10 @@ module USCoreTestKit
               elsif pattern_element.binding&.strength == 'required' &&
                     pattern_element.binding&.valueSet.present?
 
-                value_set = ig_resources.value_set_by_url(pattern_element.binding.valueSet)
-                bound_systems = value_set&.compose&.include&.reject { |code| code.concept.blank? }
-                values = []
+                value_extractor = ValueExactor.new(ig_resources, resource)
 
-                if bound_systems.present?
-                  values = bound_systems&.flat_map { |system| system.concept.map { |code| code.code } }.uniq
-                end
+                values = value_extractor.values_from_value_set_binding(pattern_element).presence ||
+                         value_extractor.values_from_resource_metadata([metadata[:path]]).presence || []
 
                 {
                   type: 'requiredBinding',
@@ -292,6 +291,8 @@ module USCoreTestKit
         add_must_support_choices
 
         case profile.version
+        when '3.1.1'
+          remove_document_reference_custodian
         when '4.0.0'
           add_device_distinct_identifier
           add_patient_uscdi_elements
@@ -354,6 +355,15 @@ module USCoreTestKit
         end
       end
 
+      # US Core clarified that server implmentation is not required to support DocumentReference.custodian (FHIR-28393)
+      def remove_document_reference_custodian
+        if profile.type == 'DocumentReference'
+          @must_supports[:elements].delete_if do |element|
+            element[:path] == 'custodian'
+          end
+        end
+      end
+
       def remove_document_reference_attachment_data_url
         if profile.type == 'DocumentReference'
           @must_supports[:elements].delete_if do |element|
@@ -482,7 +492,7 @@ module USCoreTestKit
 
         slice = @must_supports[:slices].find{|slice| slice[:path] == 'category'}
 
-        slice[:discriminator][:values] << 'clinical-note' if slice.present?
+        slice[:discriminator][:values] = ['clinical-note'] if slice.present?
       end
 
       # FHIR-37794 Server systems are not required to support US Core QuestionnaireResponse

data/lib/us_core_test_kit/generator/search_definition_metadata_extractor.rb

@@ -1,3 +1,5 @@
+require_relative 'value_extractor'
+
 module USCoreTestKit
   class Generator
     class SearchDefinitionMetadataExtractor
@@ -113,14 +115,15 @@ module USCoreTestKit
 
       def values
         values = (
-          (
             values_from_pattern_codeable_concept_slices +
             values_from_required_binding_slices +
             values_from_fixed_codes +
             values_from_pattern_coding +
             values_from_pattern_codeable_concept
-          ).uniq.presence || values_from_value_set_binding(profile_element)
-        ).presence || values_from_resource_metadata
+          ).uniq.presence ||
+          value_extractor.values_from_value_set_binding(profile_element).presence ||
+          value_extractor.values_from_resource_metadata(paths).presence || []
+
         values
       end
 
@@ -146,7 +149,7 @@ module USCoreTestKit
       def values_from_required_binding_slices
         slices.map do |slice|
           if slice.binding.present? && slice.binding.strength == 'required'
-            values_from_value_set_binding(slice)
+            value_extractor.values_from_value_set_binding(slice)
           end
         end.flatten.compact
       end
@@ -173,42 +176,8 @@ module USCoreTestKit
         [profile_element.patternCodeableConcept.coding.first.code]
       end
 
-      def value_set_binding(the_element)
-        the_element&.binding
-      end
-
-      def value_set(the_element)
-        ig_resources.value_set_by_url(value_set_binding(the_element)&.valueSet)
-      end
-
-      def bound_systems(the_element)
-        value_set(the_element)&.compose&.include&.reject { |code| code.concept.nil? }
-      end
-
-      def values_from_value_set_binding(the_element)
-        bound_systems = bound_systems(the_element)
-
-        return [] if bound_systems.blank?
-
-        bound_systems.flat_map { |system| system.concept.map { |code| code.code } }.uniq
-      end
-
-      def fhir_metadata(current_path)
-        FHIR.const_get(resource)::METADATA[current_path]
-      end
-
-      def values_from_resource_metadata
-        values = []
-
-        paths.each do |current_path|
-          current_metadata = fhir_metadata(current_path)
-
-          if current_metadata&.dig('valid_codes').present?
-            values = values + current_metadata['valid_codes'].values.flatten
-          end
-        end
-
-        values
+      def value_extractor
+        @value_extractor ||= ValueExactor.new(ig_resources, resource)
       end
     end
   end

data/lib/us_core_test_kit/generator/value_extractor.rb

@@ -0,0 +1,50 @@
+module USCoreTestKit
+  class Generator
+    class ValueExactor
+      attr_accessor :ig_resources, :resource
+
+      def initialize(ig_resources, resource)
+        self.ig_resources = ig_resources
+        self.resource = resource
+      end
+
+      def value_set_binding(the_element)
+        the_element&.binding
+      end
+
+      def value_set(the_element)
+        ig_resources.value_set_by_url(value_set_binding(the_element)&.valueSet)
+      end
+
+      def bound_systems(the_element)
+        value_set(the_element)&.compose&.include&.reject { |code| code.concept.nil? }
+      end
+
+      def values_from_value_set_binding(the_element)
+        bound_systems = bound_systems(the_element)
+
+        return [] if bound_systems.blank?
+
+        bound_systems.flat_map { |system| system.concept.map { |code| code.code } }.uniq
+      end
+
+      def fhir_metadata(current_path)
+        FHIR.const_get(resource)::METADATA[current_path]
+      end
+
+      def values_from_resource_metadata(paths)
+        values = []
+
+        paths.each do |current_path|
+          current_metadata = fhir_metadata(current_path)
+
+          if current_metadata&.dig('valid_codes').present?
+            values = values + current_metadata['valid_codes'].values.flatten
+          end
+        end
+
+        values
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -1292,6 +1292,7 @@ files:
 - lib/us_core_test_kit/generator/suite_generator.rb
 - lib/us_core_test_kit/generator/terminology_binding_metadata_extractor.rb
 - lib/us_core_test_kit/generator/validation_test_generator.rb
+- lib/us_core_test_kit/generator/value_extractor.rb
 - lib/us_core_test_kit/igs/us_core_311.tgz
 - lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodyheight.json
 - lib/us_core_test_kit/igs/us_core_311/StructureDefinition-bodytemp.json