us_core_test_kit 0.7.2 → 0.8.1

data/lib/us_core_test_kit/generator/special_cases.rb

@@ -3,7 +3,7 @@ module USCoreTestKit
     module SpecialCases
       RESOURCES_TO_EXCLUDE = {
         'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
+        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700'],
         'PractitionerRole' => ['v311', 'v400']
       }.freeze
 
@@ -24,15 +24,15 @@ module USCoreTestKit
       NON_USCDI_RESOURCES = {
         'Encounter' => ['v311', 'v400'],
         'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'RelatedPerson' => ['v501', 'v610', 'v700_ballot']
+        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'RelatedPerson' => ['v501', 'v610', 'v700']
       }.freeze
 
       SEARCHABLE_DELAYED_RESOURCES = {
-        'Location' => ['v700_ballot']
+        'Location' => ['v700']
       }.freeze
 
       ALL_VERSION_CATEGORY_FIRST_PROFILES = [
@@ -51,13 +51,14 @@ module USCoreTestKit
       ].freeze
 
       VERSION_SPECIFIC_CATEGORY_FIRST_PROFILES = {
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700_ballot'],
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610', 'v700_ballot']
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700'],
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610', 'v700']
       }.freeze
 
       class << self
         def exclude_group?(group)
-          RESOURCES_TO_EXCLUDE.key?(group.resource) && RESOURCES_TO_EXCLUDE[group.resource].include?(group.reformatted_version)
+          RESOURCES_TO_EXCLUDE.key?(group.resource) &&
+            RESOURCES_TO_EXCLUDE[group.resource].include?(group.reformatted_version)
         end
       end
     end

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -30,11 +30,11 @@ module USCoreTestKit
       end
 
       def base_output_file_name
-        "us_core_test_suite.rb"
+        'us_core_test_suite.rb'
       end
 
       def class_name
-        "USCoreTestSuite"
+        'USCoreTestSuite'
       end
 
       def module_name
@@ -63,22 +63,17 @@ module USCoreTestKit
       end
 
       def ig_link
-        case ig_metadata.ig_version
-        when 'v6.1.0'
-          'http://hl7.org/fhir/us/core/STU6'
-        when 'v5.0.1'
-          'http://hl7.org/fhir/us/core/STU5.0.1'
-        when 'v4.0.0'
-          'http://hl7.org/fhir/us/core/STU4'
-        when 'v3.1.1'
-          'http://hl7.org/fhir/us/core/STU3.1.1'
-        end
+        Naming.ig_link(ig_metadata.ig_version)
       end
 
       def us_core_6_and_above?
         ig_metadata.ig_version[1].to_i > 5
       end
 
+      def us_core_7_and_above?
+        ig_metadata.ig_version[1].to_i > 6
+      end
+
       def generate
         File.open(output_file_name, 'w') { |f| f.write(output) }
       end
@@ -137,6 +132,18 @@ module USCoreTestKit
       def screening_assessment_id
         "us_core_#{ig_metadata.reformatted_version}_screening_assessment"
       end
+
+      def smart_app_launch_file_name
+        "../../custom_groups/#{ig_metadata.ig_version}/smart_app_launch_group"
+      end
+
+      def smart_app_launch_id
+        if us_core_7_and_above?
+          "us_core_#{ig_metadata.reformatted_version}_smart_app_launch"
+        else
+          'us_core_smart_app_launch'
+        end
+      end
     end
   end
 end

data/lib/us_core_test_kit/generator/value_extractor.rb

@@ -9,46 +9,34 @@ module USCoreTestKit
         self.profile_elements = profile_elements
       end
 
-
-      def values_from_required_binding(profile_element)
-        return [] unless profile_element&.max == '*'
-
-        profile_elements
-          .select do |element|
-            element.path == profile_element.path && element.binding&.strength == 'required'
-          end
-          .map { |element| values_from_value_set_binding(element) }
-          .flatten.compact
-      end
-
       def values_from_fixed_codes(profile_element, type)
         return [] unless type == 'CodeableConcept'
 
-        profile_elements
-          .select do
-            |element| element.path == "#{profile_element.path}.coding.code" && element.fixedCode.present?
-          end
-          .map { |element| element.fixedCode }
+        elements = profile_elements.select do |element|
+          element.path == "#{profile_element.path}.coding.code" && element.fixedCode.present?
+        end
+
+        elements.map(&:fixedCode)
       end
 
       def values_from_pattern_coding(profile_element, type)
         return [] unless type == 'CodeableConcept'
 
-        profile_elements
-          .select do |element|
-            element.path == "#{profile_element.path}.coding" && element.patternCoding.present?
-          end
-          .map { |element| element.patternCoding.code }
+        elements = profile_elements.select do |element|
+          element.path == "#{profile_element.path}.coding" && element.patternCoding.present?
+        end
+
+        elements.map { |element| element.patternCoding.code }
       end
 
       def values_from_pattern_codeable_concept(profile_element, type)
         return [] unless type == 'CodeableConcept'
 
-        profile_elements
-          .select do |element|
-            element.path == profile_element.path && element.patternCodeableConcept.present? && element.min > 0
-          end
-          .map { |element| element.patternCodeableConcept.coding.first.code }
+        elements = profile_elements.select do |element|
+          element.path == profile_element.path && element.patternCodeableConcept.present? && element.min.positive?
+        end
+
+        elements.map { |element| element.patternCodeableConcept.coding.first.code }
       end
 
       def value_set_binding(the_element)
@@ -64,28 +52,60 @@ module USCoreTestKit
       end
 
       def bound_systems_from_valueset(value_set)
-        systems = value_set&.compose&.include&.map do |include|
-          if include.concept.present?
-            include
-          elsif include.system.present? && include.filter&.empty? # Cannot process intensional value set with filters
-            ig_resources.code_system_by_url(include.system)
-          elsif include.valueSet.present?
-            include.valueSet.map do |vs|
+        value_set&.compose&.include&.map do |include_element|
+          if include_element.concept.present?
+            include_element
+          elsif include_element.system.present? && include_element.filter&.empty?
+            # Cannot process intensional value set with filters
+            ig_resources.code_system_by_url(include_element.system)
+          elsif include_element.valueSet.present?
+            include_element.valueSet.map do |vs|
               a_value_set = ig_resources.value_set_by_url(vs)
               bound_systems_from_valueset(a_value_set)
             end
           end
         end&.flatten&.compact
+      end
+
+      def codes_from_value_set_binding(the_element)
+        codes_from_system_code_pair(codings_from_value_set_binding(the_element))
+      end
 
-        systems
+      def codes_from_system_code_pair(codings)
+        codings.present? ? codings.map { |coding| coding[:code] }.compact.uniq : []
       end
 
-      def values_from_value_set_binding(the_element)
+      def codings_from_value_set_binding(the_element)
+        return [] if the_element.nil?
+
         bound_systems = bound_systems(the_element)
 
-        return [] if bound_systems.blank?
+        return codings_from_bound_systems(bound_systems) if bound_systems.present?
+
+        expansion_contains = value_set_expansion_contains(the_element)
+
+        return [] if expansion_contains.blank?
 
-        bound_systems.flat_map { |system| system.concept.map { |code| code.code } }.uniq
+        expansion_contains.map { |contains| { system: contains.system, code: contains.code } }.compact.uniq
+      end
+
+      def codings_from_bound_systems(bound_systems)
+        return [] unless bound_systems.present?
+
+        bound_systems.flat_map do |bound_system|
+          case bound_system
+          when FHIR::ValueSet::Compose::Include
+            bound_system.concept.map { |concept| { system: bound_system.system, code: concept.code } }
+          when FHIR::CodeSystem
+            bound_system.concept.map { |concept| { system: bound_system.url, code: concept.code } }
+          else
+            []
+          end
+        end.uniq
+      end
+
+      def value_set_expansion_contains(element)
+        value_set(element)&.expansion&.contains
       end
 
       def fhir_metadata(current_path)
@@ -98,8 +118,10 @@ module USCoreTestKit
         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
+          next unless current_metadata&.dig('valid_codes').present?
+
+          values += current_metadata['valid_codes'].flat_map do |system, codes|
+            codes.map { |code| { system:, code: } }
           end
         end
 
@@ -107,4 +129,4 @@ module USCoreTestKit
       end
     end
   end
-end
+end

data/lib/us_core_test_kit/granular_scope_read_test.rb

@@ -25,8 +25,8 @@ module USCoreTestKit
       resource_specific_granular_scope_search_params.each do |scope| 
         current_scope = granular_scopes.find {|granular| granular.include?(scope[:name]) && granular.include?(scope[:value])}
 
-        resource_matching_scope = previous_resources_for_reads.find do |prev_resource| 
-          resource_matches_param?(prev_resource, scope[:name], scope[:value])
+        resource_matching_scope = previous_resources_for_reads.find do |prev_resource|
+          resource_matches_param?(prev_resource, scope[:name], current_scope.split('=').last)
         end
         skip_if resource_matching_scope.nil?, "Unable to find any resources to match scope #{current_scope}"
 

data/lib/us_core_test_kit/granular_scope_search_test.rb

@@ -28,7 +28,7 @@ module USCoreTestKit
           if request.status != 200
             []
           else
-            fetch_all_bundled_resources
+            fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
           end
 
         mismatched_ids = mismatched_resource_ids(found_resources)
@@ -78,6 +78,7 @@ module USCoreTestKit
 
     def expected_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .select do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])
@@ -88,6 +89,7 @@ module USCoreTestKit
 
     def mismatched_resource_ids(resources)
       resources
+        .select { |resource| resource.resourceType == resource_type }
         .reject do |resource|
           granular_scope_search_params.any? do |param|
             resource_matches_param?(resource, param[:name], param[:value])

data/lib/us_core_test_kit/igs/us_core_700/Resource-lastUpdated.json

@@ -0,0 +1,43 @@
+{
+  "resourceType" : "SearchParameter",
+  "id" : "Resource-lastUpdated",
+  "extension" : [{
+    "url" : "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status",
+    "valueCode" : "trial-use"
+  }],
+  "url" : "http://hl7.org/fhir/SearchParameter/Resource-lastUpdated",
+  "version" : "4.0.1",
+  "name" : "_lastUpdated",
+  "status" : "draft",
+  "experimental" : false,
+  "date" : "2019-11-01T09:29:23+11:00",
+  "publisher" : "Health Level Seven International (FHIR Infrastructure)",
+  "contact" : [{
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://hl7.org/fhir"
+    }]
+  },
+  {
+    "telecom" : [{
+      "system" : "url",
+      "value" : "http://www.hl7.org/Special/committees/fiwg/index.cfm"
+    }]
+  }],
+  "description" : "When the resource version last changed",
+  "code" : "_lastUpdated",
+  "base" : ["Resource"],
+  "type" : "date",
+  "expression" : "Resource.meta.lastUpdated",
+  "xpath" : "f:Resource/f:meta/f:lastUpdated",
+  "xpathUsage" : "normal",
+  "comparator" : ["eq",
+  "ne",
+  "gt",
+  "ge",
+  "lt",
+  "le",
+  "sa",
+  "eb",
+  "ap"]
+}

data/lib/us_core_test_kit/igs/us_core_700/ValueSet-SmokingStatusType.json

@@ -0,0 +1,74 @@
+{
+  "resourceType": "ValueSet",
+  "id": "2.16.840.1.113762.1.4.1267.6",
+  "meta": {
+    "versionId": "5",
+    "lastUpdated": "2024-02-27T16:29:13.000-05:00",
+    "profile": [
+      "http://hl7.org/fhir/StructureDefinition/shareablevalueset",
+      "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/computable-valueset-cqfm",
+      "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/publishable-valueset-cqfm"
+    ]
+  },
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/valueset-effectiveDate",
+      "valueDate": "2024-02-22"
+    }
+  ],
+  "url": "http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1267.6",
+  "identifier": [
+    {
+      "system": "urn:ietf:rfc:3986",
+      "value": "urn:oid:2.16.840.1.113762.1.4.1267.6"
+    }
+  ],
+  "version": "20240222",
+  "name": "SmokingStatusType",
+  "title": "Smoking Status Type",
+  "status": "active",
+  "date": "2024-02-22T01:11:38-05:00",
+  "publisher": "HL7 US Realm Program Management Steward",
+  "expansion": {
+    "identifier": "urn:uuid:4846dfb3-7d88-40a1-a541-64a4faa5fb25",
+    "timestamp": "2024-06-04T17:17:43-04:00",
+    "total": 4,
+    "offset": 0,
+    "parameter": [
+      {
+        "name": "count",
+        "valueInteger": 1000
+      },
+      {
+        "name": "offset",
+        "valueInteger": 0
+      }
+    ],
+    "contains": [
+      {
+        "system": "http://loinc.org",
+        "version": "2.77",
+        "code": "11367-0",
+        "display": "History of Tobacco use"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "version": "http://snomed.info/sct/731000124108/version/20240301",
+        "code": "401201003",
+        "display": "Cigarette pack-years (observable entity)"
+      },
+      {
+        "system": "http://loinc.org",
+        "version": "2.77",
+        "code": "72166-2",
+        "display": "Tobacco smoking status"
+      },
+      {
+        "system": "http://snomed.info/sct",
+        "version": "http://snomed.info/sct/731000124108/version/20240301",
+        "code": "782516008",
+        "display": "Number of calculated pack years for cumulative lifetime tobacco exposure (observable entity)"
+      }
+    ]
+  }
+}

data/lib/us_core_test_kit/must_support_test.rb

@@ -193,7 +193,10 @@ module USCoreTestKit
           end
         when 'requiredBinding'
           coding_path = discriminator[:path].present? ? "#{discriminator[:path]}.coding" : 'coding'
-          find_a_value_at(element, coding_path) {|coding| discriminator[:values].include?(coding.code) }
+
+          find_a_value_at(element, coding_path) do |coding|
+            discriminator[:values].any? { |value| value[:system] == coding.system && value[:code] == coding.code }
+          end
         end
       end
     end

data/lib/us_core_test_kit/search_test.rb

@@ -737,16 +737,19 @@ module USCoreTestKit
 
       paths.each do |path|
         type = metadata.search_definitions[search_param_name.to_sym][:type]
-        values_found =
-          resolve_path(resource, path)
-            .map do |value|
-          if value.is_a? FHIR::Reference
-            value.reference
-          else
-            value
-          end
+
+        resolve_path(resource, path).each do |value|
+          values_found <<
+            if value.is_a? FHIR::Reference
+              value.reference
+            elsif value.is_a? USCoreTestKit::PrimitiveType
+              value.value
+            else
+              value
+            end
         end
 
+        values_found.compact!
         match_found =
           case type
           when 'Period', 'date', 'instant', 'dateTime'

data/lib/us_core_test_kit/version.rb

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

data/lib/us_core_test_kit.rb

@@ -2,5 +2,5 @@ require_relative 'us_core_test_kit/generated/v3.1.1/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v4.0.0/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v5.0.1/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v6.1.0/us_core_test_suite'
-require_relative 'us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite'
+require_relative 'us_core_test_kit/generated/v7.0.0/us_core_test_suite'