davinci_us_drug_formulary_test_kit 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd0f61ee522c225815fd46063c993665f84b80784833cd2e2da8fde9f53c0f5
-  data.tar.gz: 766f0d7bba4138d26c50a6f1e7ce2a15818b06847006419c2ef68b5f11320aec
+  metadata.gz: c1d80f365197a7b85d33e06ac063779f8f9ee3a96ce65fec1755bca0e268a997
+  data.tar.gz: cdf090825199aa640c155ba2059759b516efedddfb62996ee4adfda3fa31c74c
 SHA512:
-  metadata.gz: c2d5625ffe7dcb3e9e1e762274fba92f32e55a70d49bc762c3f8eb12590888ea203ee8403ba64817a294f3f1c708bc6a65f72733244675f8ba8f2dfe0d59a1cc
-  data.tar.gz: 232f99718005a113b9f86d64ca5f21df1bf9eb6571ed92649db9e65cd41d3a78f09b2095bae85b4a12b80c8445ec8afbeb4065dfa0b600d65c5df306775dbc33
+  metadata.gz: e16f6ae0f5f5dc1eeb20d0bad1e5a21e16dac1c15bf188b77bd3eed62bb509640bfc17bedf9d0c9b41a033b5928f432b98dcdd2a19678460dcf8524743e6942f
+  data.tar.gz: 98eeb731bfda89af7d039609558f8ce40a4ce96bee3f278b25ea6dd77a11a4459d42c68844aefbe6a63ae75d2a7ad2cfcab4be756d00f5dda3b19ad292bd04b4

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/basic/basic_formulary_include_search_test.rb

@@ -6,11 +6,11 @@ module DaVinciUSDrugFormularyTestKit
     class BasicFormularyIncludeSearchTest < Inferno::Test
       include DaVinciUSDrugFormularyTestKit::SearchTest
 
-      title 'Server returns InsurancePlan resources from Basic search by _include=formulary'
+      title 'Server returns InsurancePlan resources from Basic search by _include=Basic:formulary'
       description %(
-        A server SHALL be capable of supporting _includes for formulary.
+        A server SHALL be capable of supporting _includes for Basic:formulary.
 
-        This test will perform a search using _include=formulary and
+        This test will perform a search using _include=Basic:formulary and
         will pass if the referenced InsurancePlan is included in the response.
       )
 
@@ -20,7 +20,8 @@ module DaVinciUSDrugFormularyTestKit
         @properties ||= SearchTestProperties.new(
           resource_type: 'Basic',
           search_param_names: ["code"],
-          include_param: 'formulary'
+          include_param: 'Basic:formulary',
+          include_search_look_up_param: 'formulary'
         )
       end
 

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/basic/basic_subject_include_search_test.rb

@@ -6,11 +6,11 @@ module DaVinciUSDrugFormularyTestKit
     class BasicSubjectIncludeSearchTest < Inferno::Test
       include DaVinciUSDrugFormularyTestKit::SearchTest
 
-      title 'Server returns MedicationKnowledge resources from Basic search by _include=subject'
+      title 'Server returns MedicationKnowledge resources from Basic search by _include=Basic:subject'
       description %(
-        A server SHALL be capable of supporting _includes for subject.
+        A server SHALL be capable of supporting _includes for Basic:subject.
 
-        This test will perform a search using _include=subject and
+        This test will perform a search using _include=Basic:subject and
         will pass if the referenced MedicationKnowledge is included in the response.
       )
 
@@ -20,7 +20,8 @@ module DaVinciUSDrugFormularyTestKit
         @properties ||= SearchTestProperties.new(
           resource_type: 'Basic',
           search_param_names: ["code"],
-          include_param: 'subject'
+          include_param: 'Basic:subject',
+          include_search_look_up_param: 'subject'
         )
       end
 

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/basic/metadata.yml

@@ -205,8 +205,8 @@
     :contains_multiple: false
     :multiple_or: true
 :include_params:
-- subject
-- formulary
+- Basic:subject
+- Basic:formulary
 :must_supports:
   :extensions:
   - :id: Basic.extension:usdf-FormularyReference-extension

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/formulary/metadata.yml

@@ -205,7 +205,7 @@
     :contains_multiple: true
     :multiple_or: true
 :include_params:
-- formulary-coverage
+- InsurancePlan:formulary-coverage
 :must_supports:
   :extensions: []
   :slices: []

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/metadata.yml

@@ -215,7 +215,7 @@
       :contains_multiple: true
       :multiple_or: true
   :include_params: &1
-  - formulary-coverage
+  - InsurancePlan:formulary-coverage
   :must_supports:
     :extensions:
     - :id: InsurancePlan.coverage:drug-coverage.extension:usdf-FormularyReference-extension
@@ -791,8 +791,8 @@
       :contains_multiple: false
       :multiple_or: true
   :include_params:
-  - subject
-  - formulary
+  - Basic:subject
+  - Basic:formulary
   :must_supports:
     :extensions:
     - :id: Basic.extension:usdf-FormularyReference-extension

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/payer_insurance_plan/metadata.yml

@@ -213,7 +213,7 @@
     :contains_multiple: true
     :multiple_or: true
 :include_params:
-- formulary-coverage
+- InsurancePlan:formulary-coverage
 :must_supports:
   :extensions:
   - :id: InsurancePlan.coverage:drug-coverage.extension:usdf-FormularyReference-extension

data/lib/davinci_us_drug_formulary_test_kit/generated/v2.0.1/payer_insurance_plan/payer_insurance_plan_formulary_coverage_include_search_test.rb

@@ -6,11 +6,11 @@ module DaVinciUSDrugFormularyTestKit
     class PayerInsurancePlanFormularyCoverageIncludeSearchTest < Inferno::Test
       include DaVinciUSDrugFormularyTestKit::SearchTest
 
-      title 'Server returns InsurancePlan resources from InsurancePlan search by _include=formulary-coverage'
+      title 'Server returns InsurancePlan resources from InsurancePlan search by _include=InsurancePlan:formulary-coverage'
       description %(
-        A server SHALL be capable of supporting _includes for formulary-coverage.
+        A server SHALL be capable of supporting _includes for InsurancePlan:formulary-coverage.
 
-        This test will perform a search using _include=formulary-coverage and
+        This test will perform a search using _include=InsurancePlan:formulary-coverage and
         will pass if the referenced InsurancePlan is included in the response.
       )
 
@@ -20,7 +20,8 @@ module DaVinciUSDrugFormularyTestKit
         @properties ||= SearchTestProperties.new(
           resource_type: 'InsurancePlan',
           search_param_names: ["coverage-type"],
-          include_param: 'formulary-coverage'
+          include_param: 'InsurancePlan:formulary-coverage',
+          include_search_look_up_param: 'formulary-coverage'
         )
       end
 

data/lib/davinci_us_drug_formulary_test_kit/generator/ig_loader.rb

@@ -19,11 +19,18 @@ module DaVinciUSDrugFormularyTestKit
       end
 
       def load
+        # `IGResources` uses the first resource it finds for a resource type.
+        # To "supercede" resources, load them first. Any duplicate resources will
+        # be accessed instead of the IG resources because they are "first."
+        # To "supplement" resources, load them last. Any duplicate resources will
+        # be ignored because the IG resources are "first."
+        load_supersede_resources
         load_ig
-        load_standalone_resources
+        load_supplement_resources
       end
 
       def load_ig
+
         tar = Gem::Package::TarReader.new(
           Zlib::GzipReader.open(ig_file_name)
         )
@@ -51,8 +58,16 @@ module DaVinciUSDrugFormularyTestKit
         ig_resources
       end
 
-      def load_standalone_resources
-        ig_directory = ig_file_name.chomp('.tgz')
+      def load_supersede_resources
+        load_standalone_resources('_supersede')
+      end
+
+      def load_supplement_resources
+        load_standalone_resources('_supplement')
+      end
+
+      def load_standalone_resources(appendage = '')
+        ig_directory = "#{ig_file_name.chomp('.tgz')}#{appendage}"
 
         Dir.glob(File.join(ig_directory, '*.json')).each do |file_path|
           resource = FHIR.from_contents(File.read(file_path))
@@ -63,6 +78,8 @@ module DaVinciUSDrugFormularyTestKit
             resource_arr.each do |entry|
               ig_resources.add(entry.resource)
             end
+          else
+            ig_resources.add(resource)
           end
         rescue StandardError
           file_name = file_path.split('/').last

data/lib/davinci_us_drug_formulary_test_kit/generator/include_search_test_generator.rb

@@ -39,7 +39,7 @@ module DaVinciUSDrugFormularyTestKit
       end
 
       def search_identifier
-        include_param.gsub(/[-:]/, '_').underscore
+        include_search_look_up_param.gsub(/[-:]/, '_').underscore
       end
 
       def class_name
@@ -51,16 +51,28 @@ module DaVinciUSDrugFormularyTestKit
           properties[:resource_type] = "'#{resource_type}'"
           properties[:search_param_names] = search_param_names
           properties[:include_param] = "'#{include_param}'"
+          properties[:include_search_look_up_param] = "'#{include_search_look_up_param}'"
         end
       end
 
+      def include_search_look_up_param
+        # Returns the `searchParam` part of the `include_param` string, which should be
+        # formatted as `SourceType:searchParam(:targetType)`. See (https://hl7.org/fhir/R4/search.html#table)
+        # If the `include_param` is formatted incorrectly, returns `include_param`.
+        #
+        # The `searchParam` part of `include_param` is necessary for indexing dictionaries generated
+        # from the `searchParams` list in the Capability Statement.
+        params = include_param.split(':')
+        params.length > 1 ? params[1] : include_param
+      end
+
       def include_param_string
         "_include=#{include_param}"
       end
 
       def include_param_resource
-        res_type = group_metadata.search_definitions[:"#{include_param}"][:type]
-        res_type = group_metadata.search_definitions[:"#{include_param}"][:target] if res_type == 'Reference'
+        res_type = group_metadata.search_definitions[:"#{include_search_look_up_param}"][:type]
+        res_type = group_metadata.search_definitions[:"#{include_search_look_up_param}"][:target] if res_type == 'Reference'
         res_type
       end
     end