davinci_us_drug_formulary_test_kit 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abd8fe1d3bdfce993a7460f65b63e69584d1ef1f6a415cccd6a64d150cd1a7f
-  data.tar.gz: 550ca3c64266d29a125c9eb714603e1e2cca9f951bf082a7f5d87f5f4ddb6aeb
+  metadata.gz: 5da16d423c118156da150fd9a6ad67fdedda6c3bd154377fb7794b074419edbc
+  data.tar.gz: e6ac77c4fdde8b3c1c457339e7c5c077c3c0ae1c4562152ac0853d7a62577bd2
 SHA512:
-  metadata.gz: ed4d70d9d928c43f50de47544cbf064493abf2fcb28040e36a3710c633614dd382661d8f199e77d4f0fc49207c827548e579ed16cf352e41079e961c44eed09e
-  data.tar.gz: 69103a6ff42f900a02a36c2bbd4a0ab12bd948ee3dacb9741033c444a546cf5da175c68c10564836f93fa1cdbeeea1c7e8643c9e3108681f4637cfe3d1e573ce
+  metadata.gz: 67974be7b9cccf56fbcd507c348b46df10cf90ed96b0777b977e10b1b6e0771d4d768a6ec24ae8e730ea6d17f65bbbf6d0e5e77ffefcd1ffb22ea0504a0939b9
+  data.tar.gz: 0f54db7b6131970356a2086f18eda574d379f2c4f1f673ac876b26d128d3254dea38ec032f156a82c19c227c0e939a06367e1063943099f547bde62de58264ea

data/config/presets/formulary_ri.json

@@ -0,0 +1,28 @@
+{
+  "title": "Drug Formulary Reference Implementation",
+  "id": "drug-formulary-ri",
+  "test_suite_id": "davinci_us_drug_formulary_v201",
+  "inputs": [
+    {
+      "name": "url",
+      "value": "https://drug-formulary-ri.davinci.hl7.org/fhir",
+      "_title": "FHIR Endpoint",
+      "_description": "URL of the FHIR endpoint",
+      "_type": "text"
+    },
+    {
+      "name": "smart_credentials",
+      "value": null,
+      "_title": "OAuth Credentials",
+      "_type": "oauth_credentials",
+      "_optional": true
+    },
+    {
+      "name": "input_ids",
+      "value": "StateOfCTLocation,UnitedStatesLocation",
+      "_title": "Location IDs",
+      "_description": "Comma separated list of Location IDs that in sum contain all MUST SUPPORT elements",
+      "_type": "text"
+    }
+  ]
+}

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/usdf_test_suite.rb

@@ -45,7 +45,6 @@ module DaVinciUSDrugFormularyTestKit
           - Multiple And
           - Comparators
       )
-      version VERSION
 
       id :davinci_us_drug_formulary_v201
 
@@ -85,9 +84,13 @@ module DaVinciUSDrugFormularyTestKit
           url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit/issues'
         },
         {
-          label: 'Source Code',
+          label: 'Open Source',
           url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit'
         },
+        {
+          label: 'Download',
+          url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit/releases'
+        },
         {
           label: 'Implementation Guide',
           url: 'https://hl7.org/fhir/us/davinci-drug-formulary/STU2.0.1/'

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/group.rb.erb

@@ -0,0 +1,24 @@
+<% test_file_list.each do |file_name| %>require_relative '<%= file_name %>'
+<% end %>
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::TestGroup
+      title '<%= title %> Tests'
+      short_description '<%= short_description %>'
+      description %(
+<%= description %>
+      )
+
+      id :<%= group_id %>
+      run_as_group<% if optional? %>
+      optional
+      <% end %>
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, '<%= profile_identifier %>', 'metadata.yml'), aliases: true))
+      end
+  <% test_id_list.each do |id| %>
+      test from: :<%= id %><% end %>
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/include_search.rb.erb

@@ -0,0 +1,38 @@
+require_relative '../../../search_test'
+require_relative '../../../generator/group_metadata'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::SearchTest
+
+      title 'Server returns <%= include_param_resource %> resources from <%= resource_type %> search by <%= include_param_string %>'
+      description %(
+        A server SHALL be capable of supporting _includes for <%= include_param %>.
+
+        This test will perform a search using <%= include_param_string %> and
+        will pass if the referenced <%= include_param_resource %> is included in the response.
+      )
+
+      id :<%= test_id %>
+
+      def self.properties
+        @properties ||= SearchTestProperties.new(
+<%= search_test_properties_string %>
+        )
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml')))
+      end
+
+      def self.include_metadata
+        @include_metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, '..', '<%= include_param_resource %>', 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_include_search_test
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/must_support.rb.erb

@@ -0,0 +1,41 @@
+require_relative '../../../must_support_test'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::MustSupportTest
+
+      title 'All must support elements are provided in the <%= resource_type %> resources returned'
+      description %(
+        US Drug Formulary Responders SHALL be capable of populating all data elements as
+        part of the query results as specified by the US Drug Formulary Capability
+        Statement. This test will look through the <%= resource_type %> resources
+        found previously for the following must support elements:
+
+<%= must_support_list_string %><% if uscdi_list_string.present? %>
+
+        For ONC USCDI requirements, each <%= resource_type %> must support the following additional elements:
+
+<%= uscdi_list_string %><% end %>
+      )
+
+      id :<%= test_id %>
+
+      def resource_type
+        '<%= resource_type %>'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      run do
+        perform_must_support_test(<%= resource_collection_string %>)
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/provenance_revinclude_search.rb.erb

@@ -0,0 +1,50 @@
+require_relative '../../../search_test'
+require_relative '../../../generator/group_metadata'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::SearchTest
+
+      title 'Server returns Provenance resources from <%= resource_type %> search by <%= search_param_name_string %>'
+      description %(
+        A server SHALL be capable of supporting _revIncludes:Provenance:target.
+
+        This test will perform a search by <%= search_param_name_string %> and
+        will pass if a Provenance resource is found in the response.
+      %)
+
+      id :<%= test_id %>
+  <% if needs_patient_id? %>
+      input :patient_ids,
+        title: 'Patient IDs',
+        description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements'
+  <% end %>
+      def properties
+        @properties ||= SearchTestProperties.new(
+  <%= search_test_properties_string %>
+        )
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml')))
+      end
+
+      def self.provenance_metadata
+        @provenance_metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, '..', 'provenance', 'metadata.yml'), aliases: true))
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      def scratch_provenance_resources
+        scratch[:provenance_resources] ||= {}
+      end
+
+      run do
+        run_provenance_revinclude_search_test
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/read.rb.erb

@@ -0,0 +1,26 @@
+require_relative '../../../read_test'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::ReadTest
+
+      title 'Server returns correct <%= resource_type %> resource from <%= resource_type %> read interaction'
+      description 'A server <%= conformance_expectation %> support the <%= resource_type %> read interaction.'
+
+      id :<%= test_id %>
+
+      def resource_type
+        '<%= resource_type %>'
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      run do
+        perform_read_test(<%= resource_collection_string %>)
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/reference_resolution.rb.erb

@@ -0,0 +1,40 @@
+require_relative '../../../reference_resolution_test'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::ReferenceResolutionTest
+
+      title 'MustSupport references within <%= resource_type %> resources are valid'
+      description %(
+        This test will attempt to read external references provided within elements
+        marked as 'MustSupport', if any are available.
+
+        It verifies that at least one external reference for each MustSupport Reference element
+        can be accessed by the test client, and conforms to corresponding US Core profile.
+
+        Elements which may provide external references include:
+
+<%= must_support_reference_list_string %>
+      )
+
+      id :<%= test_id %>
+
+      def resource_type
+        '<%= resource_type %>'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      run do
+        perform_reference_resolution_test(<%= resource_collection_string %>)
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/search.rb.erb

@@ -0,0 +1,41 @@
+require_relative '../../../search_test'
+require_relative '../../../generator/group_metadata'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::SearchTest
+
+      title 'Server returns valid results for <%= resource_type %> search by <%= search_param_name_string %>'
+      description %(
+<%= description %>
+      )
+
+      id :<%= test_id %><% if optional? %>
+      optional
+  <% end %>
+  <% if needs_id? %>
+      input :input_ids,
+        title: '<%= resource_type %> IDs',
+        description: 'Comma separated list of <%= resource_type %> IDs that in sum contain all MUST SUPPORT elements'
+  <% end %>
+      def self.properties
+        @properties ||= SearchTestProperties.new(
+<%= search_test_properties_string %>
+        )
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      run do
+        run_search_test 
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/suite.rb.erb

@@ -0,0 +1,115 @@
+require 'inferno/dsl/oauth_credentials'
+require_relative '../../version'
+require_relative '<%= capability_statement_file_name %>'
+<% group_file_list.each do |file_name| %>require_relative '<%= file_name %>'
+<% end %>
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::TestSuite
+      title '<%= title %>'
+      short_title '<%= short_title %>'
+      description %(
+        The DaVinci US Drug Formulary Test Kit tests systems for their
+        conformance to the [US Drug Formulary Implementation Guide](<%=ig_link
+        %>).
+
+        ## Instructions
+        In order to run the tests, provide the base URL of the FHIR server to
+        test, along with the IDs of Insurance Plan Location resources.
+        Credentials may optionally be provided if testing against a system which
+        requires authorization.
+
+        ## Scope
+        These tests check the following behaviors as defined in the IG:
+        - FHIR Interactions
+          - Conformance
+          - Read
+          - Search
+            - Individual search parameters
+            - _include searches
+        - FHIR Data
+          - Validation against IG profiles
+          - Presence of all Must Support fields
+            - Resolution of Must Support references
+
+        **Known Issues**
+        - Must Support checks are not performed for all elements of Formulary
+          Drug resources due to the use of an intensional value set for slicing
+          `MedicationKnowledge.code.coding` elements.
+        - The following search features are not tested:
+          - Combination searches
+          - Multiple Or
+          - Multiple And
+          - Comparators
+      )
+
+      id :<%= suite_id %>
+
+      VALIDATION_MESSAGE_FILTERS = [
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
+        /\A\S+: \S+: URL value '.*' does not resolve/,
+      ].freeze
+
+      VERSION_SPECIFIC_MESSAGE_FILTERS = <%=version_specific_message_filters%>.freeze
+
+      def self.metadata
+        @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
+            Generator::GroupMetadata.new(raw_metadata)
+          end
+      end
+
+      fhir_resource_validator do
+        igs '<%= ig_identifier %>'
+
+        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
+        exclude_message do |message|
+
+          message_filters.any? { |filter| filter.match? message.message }
+        end
+
+        perform_additional_validation do |resource, profile_url|
+          ProvenanceValidator.validate(resource) if resource.instance_of?(FHIR::Provenance)
+        end
+      end
+
+      links [
+        {
+          label: 'Report Issue',
+          url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit/issues'
+        },
+        {
+          label: 'Open Source',
+          url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit'
+        },
+        {
+          label: 'Download',
+          url: 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit/releases'
+        },
+        {
+          label: 'Implementation Guide',
+          url: '<%=ig_link%>'
+        }
+      ]
+
+      input :url,
+        title: 'FHIR Endpoint',
+        description: 'URL of the FHIR endpoint'
+      input :smart_credentials,
+        title: 'OAuth Credentials',
+        type: :oauth_credentials,
+        optional: true
+
+      fhir_client do
+        url :url
+        oauth_credentials :smart_credentials
+      end
+
+      group from: :<%= capability_statement_group_id %>
+  <% group_id_list.each do |id| %>
+      group from: :<%= id %><% end %>
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/generator/templates/validation.rb.erb

@@ -0,0 +1,30 @@
+require_relative '../../../validation_test'
+
+module DaVinciUSDrugFormularyTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include DaVinciUSDrugFormularyTestKit::ValidationTest
+
+      id :<%= test_id %>
+      title '<%= resource_type %> resources returned during previous tests conform to the <%= profile_name %> profile'
+      description %(
+<%= description %>
+      )
+      output :dar_code_found, :dar_extension_found
+
+      def resource_type
+        '<%= resource_type %>'
+      end
+
+      def scratch_resources
+        scratch[:<%= profile_identifier %>_resources] ||= {}
+      end
+
+      run do
+        perform_validation_test(scratch_resources[:all] || [],
+                                '<%= profile_url %>',
+                                '<%= profile_version %>')
+      end
+    end
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/igs/README.md

@@ -0,0 +1,25 @@
+# Note on this IGs folder
+
+There are three reasons why it would be necessary to put an IG package.tgz in this folder. If none of these apply, you do not need to put any files here, or can consider removing any existing files to make it clear they are unused.
+
+## 1. Generated Test Suites
+Some test kits use a "generator" to automatically generate the contents of a test suite for an IG. The IG files are required every time the test suites need to be regenerated. Examples of test kits that use this approach are the US Core Test Kit and CARIN IG for Blue Button® Test Kit.
+
+
+## 2. Non-published IG
+If your IG, or the specific version of the IG you want to test against, is not published, then the validator service needs to load the IG from file in order to be able to validate resources with it. The IG must be referenced in the `fhir_resource_validator` block in the test suite definition by filename, ie:
+
+```ruby
+      fhir_resource_validator do
+        igs 'igs/filename.tgz'
+
+        ...
+      end
+```
+
+## 3. Inferno Validator UI
+The Inferno Validator UI is configured to auto-load any IGs present in the igs folder and include them in all validations. The Inferno Validator UI is currently disabled by default, so this is only relevant if you choose to re-enable it. In general, the Inferno team is currently leaving IGs in this folder even if not otherwise necessary to make it easy to re-enable the validator UI.
+
+## 4. Overwriting or supplementing IG data
+In some instances, an IG may include errors or be missing resources. In these cases, you can correct individual resource files and put them in either the <ig package name>_supersede or <ig package name>_supplement directories.
+A README.md file in each directory explains why each file exists.

data/lib/davinci_us_drug_formulary_test_kit/igs/package_supersede/README.md

@@ -0,0 +1,44 @@
+# IG Supersede Files
+
+The files in this directory will supersede files in the <ig package>.tgz IG.
+Add files to this directory if you need to correct errors in the IG.
+
+## CapabilityStatement-usdf-server.json
+The original capability statement includes the following:
+
+``` json
+"searchInclude": [
+    "formulary-coverage"
+],
+...
+
+"searchInclude": [
+    "subject",
+    "formulary"
+],
+```
+
+The [FHIR documentation](https://hl7.org/fhir/r4/search.html#table) states that the allowable content for `_include` is `SourceType:searchParam(:targetType)`.
+
+
+
+This capability statement supersedes the original with the following:
+
+``` json
+"searchInclude": [
+    "InsurancePlan:formulary-coverage"
+],
+...
+
+"searchInclude": [
+    "Basic:subject",
+    "Basic:formulary"
+],
+```
+
+With this modification, the test generator can properly create tests for `_include`.
+
+### Notes:
+
+#### 06/19/2024
+This issue should be raised with the Da Vinci IG developers. Once this issue is resolved in the IG, this file should be removed.

data/lib/davinci_us_drug_formulary_test_kit/igs/package_supplement/README.md

@@ -0,0 +1,9 @@
+# IG Supplement Files
+
+The files in this directory will supplement files in the <ig package>.tgz IG.
+Add files to this directory if you need to add information that may be missing from the IG (e.g., adding in base definitions that are not defined in the IG).
+These files will not supersede the files in the IG.
+
+## r4_search-parameters.json
+
+The US Drug Formulary IG (v2.0.1) only includes definitions for parameters it changes from the base definitions. However, the code generator assumes all definitions are present in the IG. By adding in the `r4_search-parameters.json` file, we provide any missing definitions. However, we want to make sure we don't supersede any definitions in the IG, because those take precedence.

data/lib/davinci_us_drug_formulary_test_kit/metadata.rb

@@ -0,0 +1,60 @@
+require_relative 'version'
+
+module DaVinciUSDrugFormularyTestKit 
+  class Metadata < Inferno::TestKit
+    id :davinci_us_drug_formulary_test_kit
+    title 'Da Vinci US Drug Formulary Test Kit'
+    suite_ids ['davinci_us_drug_formulary_v201']
+    tags ['Da Vinci']
+    last_updated ::DaVinciUSDrugFormularyTestKit::LAST_UPDATED
+    version ::DaVinciUSDrugFormularyTestKit::VERSION
+    maturity 'Low'
+    authors ['Stephen MacVicar', 'Tom Strassner', 'Robert Passas']
+    repo 'https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit'
+    description <<~DESCRIPTION
+      The DaVinci US Drug Formulary Test Kit validates the conformance of a server
+      implementation to the
+      [DaVinci Payer Data Exchange (PDex) US Drug Formulary Implementation Guide v2.0.1](http://hl7.org/fhir/us/davinci-drug-formulary/STU2.0.1).
+
+      <!-- break -->
+  
+      These tests check the following behaviors as defined in the IG:
+  
+      - FHIR Interactions
+        + Capabilities
+        + Read
+        + Search
+          * Individual search parameters
+          * _include searches
+      - FHIR Data
+        + Validation against IG profiles
+        + Presence of all Must Support fields
+          * Resolution of Must Support references
+  
+      The DaVinci US Drug Formulary Test Kit is built using the
+      [Inferno Framework](https://inferno-framework.github.io/).
+      The Inferno Framework is designed for reuse and aims to make it easier to
+      build test kits for any FHIR-based data exchange.
+      
+      ### Known Limitations
+  
+      The following areas of the IG are not fully tested in this draft version
+      of the test kit:
+  
+      - Must Support checks are not performed for all elements of Formulary Drug
+        resources due to the use of an intensional value set for slicing
+        `MedicationKnowledge.code.coding` elements.
+      - The following search features are not tested:
+        + Combination searches
+        + Multiple Or
+        + Multiple And
+        + Comparators
+  
+      ## Reporting Issues
+  
+      Please report any issues with this set of tests in the
+      [GitHub Issues](https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit/issues)
+      section of this repository.
+    DESCRIPTION
+  end
+end

data/lib/davinci_us_drug_formulary_test_kit/search_test.rb

@@ -131,7 +131,7 @@ module DaVinciUSDrugFormularyTestKit
       check_search_response
 
       resources_returned =
-        fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+        select_all_bundled_resources
 
       return [] if resources_returned.blank?
 
@@ -166,7 +166,7 @@ module DaVinciUSDrugFormularyTestKit
 
       check_search_response
 
-      post_search_resources = fetch_all_bundled_resources.select { |resource| resource.resourceType == resource_type }
+      post_search_resources = select_all_bundled_resources
 
       filter_insurance_plan(post_search_resources) if resource_type == 'InsurancePlan'
 
@@ -272,7 +272,7 @@ module DaVinciUSDrugFormularyTestKit
 
           search_and_check_response(params_with_comparator)
 
-          fetch_all_bundled_resources.each do |resource|
+          fetch_all_bundled_resources(resource_type: resource_type, bundle: resource).each do |resource|
             check_resource_against_params(resource, params_with_comparator) if resource.resourceType == resource_type
           end
         end
@@ -304,9 +304,7 @@ module DaVinciUSDrugFormularyTestKit
 
       search_and_check_response(new_search_params)
 
-      reference_with_type_resources = fetch_all_bundled_resources.select do |resource|
-        resource.resourceType == resource_type
-      end
+      reference_with_type_resources = select_all_bundled_resources
 
       filter_insurance_plan(reference_with_type_resources) if resource_type == 'InsurancePlan'
 
@@ -329,9 +327,7 @@ module DaVinciUSDrugFormularyTestKit
       search_params = params.merge(new_search_params)
       search_and_check_response(search_params)
 
-      resources_returned =
-        fetch_all_bundled_resources
-          .select { |resource| resource.resourceType == resource_type }
+      resources_returned = select_all_bundled_resources
 
       assert resources_returned.present?, 'No resources were returned when searching by `system|code`'
 
@@ -378,9 +374,7 @@ module DaVinciUSDrugFormularyTestKit
 
         search_and_check_response(search_params)
 
-        resources_returned =
-          fetch_all_bundled_resources
-            .select { |resource| resource.resourceType == resource_type }
+        resources_returned = select_all_bundled_resources
 
         multiple_or_search_params.each do |param_name|
           missing_values[param_name.to_sym] =
@@ -508,51 +502,14 @@ module DaVinciUSDrugFormularyTestKit
       "#{msg}. Please use resources with more information"
     end
 
-    def fetch_all_bundled_resources(
-      reply_handler: nil,
-      max_pages: 20,
-      additional_resource_types: [],
-      resource_type: self.resource_type
-    )
-      page_count = 1
-      resources = []
-      bundle = resource
-
-      until bundle.nil? || page_count == max_pages
-        resources += bundle&.entry&.map { |entry| entry&.resource }
-        next_bundle_link = bundle&.link&.find { |link| link.relation == 'next' }&.url
-        reply_handler&.call(response)
-
-        break if next_bundle_link.blank?
-
-        reply = fhir_client.raw_read_url(next_bundle_link)
-
-        store_request('outgoing') { reply }
-        error_message = cant_resolve_next_bundle_message(next_bundle_link)
-
-        assert_response_status(200)
-        assert_valid_json(reply.body, error_message)
-
-        bundle = fhir_client.parse_reply(FHIR::Bundle, fhir_client.default_format, reply)
-
-        page_count += 1
-      end
-
-      valid_resource_types = [resource_type, 'OperationOutcome'].concat(additional_resource_types)
-      valid_resource_types << 'Medication' if resource_type == 'MedicationRequest'
-
-      invalid_resource_types =
-        resources.reject { |entry| valid_resource_types.include? entry.resourceType }
-          .map(&:resourceType)
-          .uniq
-
-      if invalid_resource_types.any?
-        info "Received resource type(s) #{invalid_resource_types.join(', ')} in search bundle, " \
-             "but only expected resource types #{valid_resource_types.join(', ')}. " \
-             'This is unusual but allowed if the server believes additional resource types are relevant.'
+    def select_all_bundled_resources
+      if resource_type == 'MedicationRequest'
+        fetch_all_bundled_resources(resource_type: resource_type, bundle: resource, additional_resource_types: ['Medication'])
+          .select{ |resource| resource.resourceType == resource_type }
+      else
+        fetch_all_bundled_resources(resource_type: resource_type, bundle: resource)
+          .select{ |resource| resource.resourceType == resource_type }
       end
-
-      resources
     end
 
     def cant_resolve_next_bundle_message(link)

data/lib/davinci_us_drug_formulary_test_kit/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module DaVinciUSDrugFormularyTestKit
-  VERSION = '0.10.4'
+  VERSION = '0.11.0'
+  LAST_UPDATED = '2025-02-25'
 end

data/lib/davinci_us_drug_formulary_test_kit.rb

@@ -1 +1,2 @@
+require_relative 'davinci_us_drug_formulary_test_kit/metadata.rb'
 require_relative 'davinci_us_drug_formulary_test_kit/generated/v2.0.1/usdf_test_suite'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: davinci_us_drug_formulary_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- config/presets/formulary_ri.json
 - lib/davinci_us_drug_formulary_test_kit.rb
 - lib/davinci_us_drug_formulary_test_kit/custom_groups/capability_statement/conformance_support_test.rb
 - lib/davinci_us_drug_formulary_test_kit/custom_groups/capability_statement/fhir_version_test.rb
@@ -204,12 +205,25 @@ files:
 - lib/davinci_us_drug_formulary_test_kit/generator/search_metadata_extractor.rb
 - lib/davinci_us_drug_formulary_test_kit/generator/search_test_generator.rb
 - lib/davinci_us_drug_formulary_test_kit/generator/suite_generator.rb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/group.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/include_search.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/must_support.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/provenance_revinclude_search.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/read.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/reference_resolution.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/search.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/suite.rb.erb
+- lib/davinci_us_drug_formulary_test_kit/generator/templates/validation.rb.erb
 - lib/davinci_us_drug_formulary_test_kit/generator/terminology_binding_metadata_extractor.rb
 - lib/davinci_us_drug_formulary_test_kit/generator/validation_test_generator.rb
 - lib/davinci_us_drug_formulary_test_kit/generator/value_extractor.rb
+- lib/davinci_us_drug_formulary_test_kit/igs/README.md
 - lib/davinci_us_drug_formulary_test_kit/igs/package.tgz
 - lib/davinci_us_drug_formulary_test_kit/igs/package_supersede/CapabilityStatement-usdf-server.json
+- lib/davinci_us_drug_formulary_test_kit/igs/package_supersede/README.md
+- lib/davinci_us_drug_formulary_test_kit/igs/package_supplement/README.md
 - lib/davinci_us_drug_formulary_test_kit/igs/package_supplement/r4_search-parameters.json
+- lib/davinci_us_drug_formulary_test_kit/metadata.rb
 - lib/davinci_us_drug_formulary_test_kit/must_support_test.rb
 - lib/davinci_us_drug_formulary_test_kit/read_test.rb
 - lib/davinci_us_drug_formulary_test_kit/reference_resolution_test.rb
@@ -224,6 +238,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit
   source_code_uri: https://github.com/inferno-framework/davinci-us-drug-formulary-test-kit
+  inferno_test_kit: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -232,14 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.2
+      version: 3.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: DaVinci US Drug Formulary Test Kit