us_core_test_kit 0.6.0 → 0.6.1

data/lib/us_core_test_kit/generated/v6.1.0/specimen/specimen_reference_resolution_test.rb

@@ -1,11 +1,9 @@
 require_relative '../../../reference_resolution_test'
-require_relative '../resource_list'
 
 module USCoreTestKit
   module USCoreV610
     class SpecimenReferenceResolutionTest < Inferno::Test
       include USCoreTestKit::ReferenceResolutionTest
-      include ResourceList
 
       title 'MustSupport references within Specimen resources are valid'
       description %(

data/lib/us_core_test_kit/generator/group_metadata_extractor.rb

@@ -187,7 +187,6 @@ module USCoreTestKit
       end
 
       def profile_name
-        binding.pry if profile.nil?
         profile.title.gsub('  ', ' ')
       end
 

data/lib/us_core_test_kit/generator/ig_loader.rb

@@ -33,6 +33,8 @@ module USCoreTestKit
 
           file_name = entry.full_name.split('/').last
 
+          next if file_name.end_with? 'openapi.json'
+
           next unless file_name.end_with? '.json'
 
           next unless entry.full_name.start_with? 'package/'

data/lib/us_core_test_kit/generator/search_test_generator.rb

@@ -257,9 +257,9 @@ module USCoreTestKit
         return '' unless test_medication_inclusion?
 
         <<~MEDICATION_INCLUSION_DESCRIPTION
-        If any MedicationRequest resources use external references to
+        If any #{resource_type} resources use external references to
         Medications, the search will be repeated with
-        `_include=MedicationRequest:medication`.
+        `_include=#{resource_type}:medication`.
         MEDICATION_INCLUSION_DESCRIPTION
       end
 

data/lib/us_core_test_kit/generator.rb

@@ -8,7 +8,6 @@ require_relative 'generator/must_support_test_generator'
 require_relative 'generator/provenance_revinclude_search_test_generator'
 require_relative 'generator/read_test_generator'
 require_relative 'generator/reference_resolution_test_generator'
-require_relative 'generator/resource_list_generator'
 require_relative 'generator/search_test_generator'
 require_relative 'generator/suite_generator'
 require_relative 'generator/validation_test_generator'
@@ -33,7 +32,6 @@ module USCoreTestKit
       puts "Generating tests for IG #{File.basename(ig_file_name)}"
       load_ig_package
       extract_metadata
-      generate_resource_list
       generate_search_tests
       generate_read_tests
       # TODO: generate_vread_tests
@@ -66,10 +64,6 @@ module USCoreTestKit
       self.ig_resources = IGLoader.new(ig_file_name).load
     end
 
-    def generate_resource_list
-      ResourceListGenerator.generate(ig_metadata, base_output_dir)
-    end
-
     def generate_reference_resolution_tests
       ReferenceResolutionTestGenerator.generate(ig_metadata, base_output_dir)
     end

data/lib/us_core_test_kit/search_test.rb

@@ -373,7 +373,7 @@ module USCoreTestKit
       end
     end
 
-    def test_medication_inclusion(medication_requests, params, patient_id)
+    def test_medication_inclusion(base_resources, params, patient_id)
       return if search_variant_test_records[:medication_inclusion]
 
       scratch[:medication_resources] ||= {}
@@ -381,13 +381,13 @@ module USCoreTestKit
       scratch[:medication_resources][patient_id] ||= []
       scratch[:medication_resources][:contained] ||= []
 
-      requests_with_external_references =
-        medication_requests
+      base_resources_with_external_reference =
+        base_resources
           .select { |request| request&.medicationReference&.present? }
           .reject { |request| request&.medicationReference&.reference&.start_with? '#' }
 
       contained_medications =
-        medication_requests
+        base_resources
           .select { |request| request&.medicationReference&.reference&.start_with? '#' }
           .flat_map(&:contained)
           .select { |resource| resource.resourceType == 'Medication' }
@@ -396,15 +396,32 @@ module USCoreTestKit
       scratch[:medication_resources][patient_id] += contained_medications
       scratch[:medication_resources][:contained] += contained_medications
 
-      return if requests_with_external_references.blank?
+      return if base_resources_with_external_reference.blank?
 
-      search_params = params.merge(_include: 'MedicationRequest:medication')
+      search_params = params.merge(_include: "#{resource_type}:medication")
 
       search_and_check_response(search_params)
 
       medications = fetch_all_bundled_resources.select { |resource| resource.resourceType == 'Medication' }
       assert medications.present?, 'No Medications were included in the search results'
 
+      included_medications = medications.map { |medication| "#{medication.resourceType}/#{medication.id}" }
+
+      matched_base_resources = base_resources_with_external_reference.select do |base_resource|
+        included_medications.any? do |medication_reference|
+          is_reference_match?(base_resource.medicationReference.reference, medication_reference)
+        end
+      end
+
+      not_matched_included_medications = included_medications.select do |medication_reference|
+        matched_base_resources.none? do |base_resource|
+          is_reference_match?(base_resource.medicationReference.reference, medication_reference)
+        end
+      end
+
+      not_matched_included_medications_string = not_matched_included_medications.join(',')
+      assert not_matched_included_medications.empty?, "No #{resource_type} references #{not_matched_included_medications_string} in the search result."
+
       medications.uniq!(&:id)
 
       scratch[:medication_resources][:all] += medications
@@ -413,6 +430,11 @@ module USCoreTestKit
       search_variant_test_records[:medication_inclusion] = true
     end
 
+    def is_reference_match? (reference, local_reference)
+      regex_pattern = /^(#{Regexp.escape(local_reference)}|\S+\/#{Regexp.escape(local_reference)}(?:[\/|]\S+)*)$/
+      reference.match?(regex_pattern)
+    end
+
     def all_scratch_resources
       scratch_resources[:all] ||= []
     end
@@ -547,7 +569,7 @@ module USCoreTestKit
       end
 
       valid_resource_types = [resource_type, 'OperationOutcome'].concat(additional_resource_types)
-      valid_resource_types << 'Medication' if resource_type == 'MedicationRequest'
+      valid_resource_types << 'Medication' if ['MedicationRequest', 'MedicationDispense'].include?(resource_type)
 
       invalid_resource_types =
         resources.reject { |entry| valid_resource_types.include? entry.resourceType }

data/lib/us_core_test_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -113,6 +113,7 @@ files:
 - lib/us_core_test_kit/custom_groups/data_absent_reason_group.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/clinical_notes_guidance_group.rb
+- lib/us_core_test_kit/custom_groups/v3.1.1/profile_support_test.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/clinical_notes_guidance_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb
@@ -420,7 +421,6 @@ files:
 - lib/us_core_test_kit/generated/v3.1.1/pulse_oximetry/pulse_oximetry_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v3.1.1/pulse_oximetry/pulse_oximetry_validation_test.rb
 - lib/us_core_test_kit/generated/v3.1.1/pulse_oximetry_group.rb
-- lib/us_core_test_kit/generated/v3.1.1/resource_list.rb
 - lib/us_core_test_kit/generated/v3.1.1/resprate/metadata.yml
 - lib/us_core_test_kit/generated/v3.1.1/resprate/resprate_must_support_test.rb
 - lib/us_core_test_kit/generated/v3.1.1/resprate/resprate_patient_category_date_search_test.rb
@@ -770,7 +770,6 @@ files:
 - lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry/pulse_oximetry_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry/pulse_oximetry_validation_test.rb
 - lib/us_core_test_kit/generated/v4.0.0/pulse_oximetry_group.rb
-- lib/us_core_test_kit/generated/v4.0.0/resource_list.rb
 - lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/metadata.yml
 - lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/respiratory_rate_must_support_test.rb
 - lib/us_core_test_kit/generated/v4.0.0/respiratory_rate/respiratory_rate_patient_category_date_search_test.rb
@@ -1229,7 +1228,6 @@ files:
 - lib/us_core_test_kit/generated/v5.0.1/related_person/related_person_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/related_person/related_person_validation_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/related_person_group.rb
-- lib/us_core_test_kit/generated/v5.0.1/resource_list.rb
 - lib/us_core_test_kit/generated/v5.0.1/respiratory_rate/metadata.yml
 - lib/us_core_test_kit/generated/v5.0.1/respiratory_rate/respiratory_rate_must_support_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/respiratory_rate/respiratory_rate_patient_category_date_search_test.rb
@@ -1736,7 +1734,6 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/related_person/related_person_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/related_person/related_person_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/related_person_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/resource_list.rb
 - lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/respiratory_rate_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/respiratory_rate_patient_category_date_search_test.rb
@@ -1814,7 +1811,6 @@ files:
 - lib/us_core_test_kit/generator/provenance_revinclude_search_test_generator.rb
 - lib/us_core_test_kit/generator/read_test_generator.rb
 - lib/us_core_test_kit/generator/reference_resolution_test_generator.rb
-- lib/us_core_test_kit/generator/resource_list_generator.rb
 - lib/us_core_test_kit/generator/search_definition_metadata_extractor.rb
 - lib/us_core_test_kit/generator/search_metadata_extractor.rb
 - lib/us_core_test_kit/generator/search_test_generator.rb

data/lib/us_core_test_kit/generated/v3.1.1/resource_list.rb

@@ -1,28 +0,0 @@
-module USCoreTestKit
-  module USCoreV311
-    module ResourceList
-      RESOURCE_LIST = [
-        'AllergyIntolerance',
-      'CarePlan',
-      'CareTeam',
-      'Condition',
-      'Device',
-      'DiagnosticReport',
-      'DocumentReference',
-      'Encounter',
-      'Goal',
-      'Immunization',
-      'Location',
-      'Medication',
-      'MedicationRequest',
-      'Observation',
-      'Organization',
-      'Patient',
-      'Practitioner',
-      'PractitionerRole',
-      'Procedure',
-      'Provenance'
-      ].freeze
-    end
-  end
-end

data/lib/us_core_test_kit/generated/v4.0.0/resource_list.rb

@@ -1,28 +0,0 @@
-module USCoreTestKit
-  module USCoreV400
-    module ResourceList
-      RESOURCE_LIST = [
-        'AllergyIntolerance',
-      'CarePlan',
-      'CareTeam',
-      'Condition',
-      'Device',
-      'DiagnosticReport',
-      'DocumentReference',
-      'Encounter',
-      'Goal',
-      'Immunization',
-      'Location',
-      'Medication',
-      'MedicationRequest',
-      'Observation',
-      'Organization',
-      'Patient',
-      'Practitioner',
-      'PractitionerRole',
-      'Procedure',
-      'Provenance'
-      ].freeze
-    end
-  end
-end

data/lib/us_core_test_kit/generated/v5.0.1/resource_list.rb

@@ -1,31 +0,0 @@
-module USCoreTestKit
-  module USCoreV501
-    module ResourceList
-      RESOURCE_LIST = [
-        'AllergyIntolerance',
-      'CarePlan',
-      'CareTeam',
-      'Condition',
-      'Device',
-      'DiagnosticReport',
-      'DocumentReference',
-      'Encounter',
-      'Goal',
-      'Immunization',
-      'Location',
-      'Medication',
-      'MedicationRequest',
-      'Observation',
-      'Organization',
-      'Patient',
-      'Practitioner',
-      'PractitionerRole',
-      'Procedure',
-      'Provenance',
-      'QuestionnaireResponse',
-      'RelatedPerson',
-      'ServiceRequest'
-      ].freeze
-    end
-  end
-end

data/lib/us_core_test_kit/generated/v6.1.0/resource_list.rb

@@ -1,34 +0,0 @@
-module USCoreTestKit
-  module USCoreV610
-    module ResourceList
-      RESOURCE_LIST = [
-        'AllergyIntolerance',
-      'CarePlan',
-      'CareTeam',
-      'Condition',
-      'Coverage',
-      'Device',
-      'DiagnosticReport',
-      'DocumentReference',
-      'Encounter',
-      'Goal',
-      'Immunization',
-      'Location',
-      'Medication',
-      'MedicationDispense',
-      'MedicationRequest',
-      'Observation',
-      'Organization',
-      'Patient',
-      'Practitioner',
-      'PractitionerRole',
-      'Procedure',
-      'Provenance',
-      'QuestionnaireResponse',
-      'RelatedPerson',
-      'ServiceRequest',
-      'Specimen'
-      ].freeze
-    end
-  end
-end

data/lib/us_core_test_kit/generator/resource_list_generator.rb

@@ -1,42 +0,0 @@
-module USCoreTestKit
-  class Generator
-    class ResourceListGenerator
-      class << self
-        def generate(ig_metadata, base_output_dir)
-          @ig_metadata = ig_metadata
-
-          FileUtils.mkdir_p(base_output_dir)
-          File.open(File.join(base_output_dir, base_output_file_name), 'w') { |f| f.write(output) }
-        end
-
-        def resource_list          
-          @ig_metadata.groups.map(&:resource).uniq
-        end
-
-        def resource_list_string
-          resource_list.map { |resource| "      '#{resource}'" }.join(",\n")
-        end
-
-        def module_name
-          "USCore#{@ig_metadata.reformatted_version.upcase}"
-        end
-
-        def read_interaction(group_metadata)
-          group_metadata.interactions.find { |interaction| interaction[:code] == 'read' }
-        end
-
-        def template
-          @template ||= File.read(File.join(__dir__, 'templates', 'resource_list.rb.erb'))
-        end
-
-        def output
-          ERB.new(template).result(binding)
-        end
-
-        def base_output_file_name
-          "resource_list.rb"
-        end
-      end
-    end
-  end
-end