davinci_pas_test_kit 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7207f98c62ccfb04612a2d98d93623e1d76fd8085527c7876aac18ac84682ac
-  data.tar.gz: 818e6468ac830e23ce7f060556d36a3f62ebf133af0604c6b0123e9afdd286f8
+  metadata.gz: e45ca8e36bad87d4e457eb2b49c26eb0170c7877e059e9a8cb8e5bda906972b9
+  data.tar.gz: 6dbf634eb8484ea7dc442a7bd9b016392ea70316e3635ae4fe7c2e2bd884772a
 SHA512:
-  metadata.gz: 822cbab62106199fd7d870ee149bba4a5d7303ae1937b2d4b6ef44d5b208f55fc2809dd373bc584b6562fa2908d113d4fd0164e0bd82a4cf87116433450ac36e
-  data.tar.gz: 8186c2bd0d8b3d407f220969d90f339725d8f09863f0d01172a95813ef5fd4dfd99790486ff826189b13d8d43aad353d6b43d5d04aba2a02bb7824a223f5add1
+  metadata.gz: 29e35d93edbabe076d85521e36829951c15ae73645c262a334a3abf3a1c1abaf6752ab7e56488c4edc519dfa95a2a228312e467a25f9b78822efa1f2abb96d7c
+  data.tar.gz: af2de00d7c19bc247f8834f185a702b942b939947e4aa2c16323ab044b67ccffcd9cd315fe6ec8d26cc98e410e05ed12548f8796e9d9d01da9da72c3d0b29410

data/lib/davinci_pas_test_kit/client_suite.rb

@@ -41,8 +41,8 @@ module DaVinciPASTestKit
       !test.config.options[:accepts_multiple_requests]
     end
 
-    validator do
-      url ENV.fetch('VALIDATOR_URL')
+    fhir_resource_validator do
+      igs 'hl7.fhir.us.davinci-pas#2.0.1'
 
       exclude_message do |message|
         # Messages expected of the form `<ResourceType>: <FHIRPath>: <message>`

data/lib/davinci_pas_test_kit/generated/v2.0.1/server_suite.rb

@@ -33,8 +33,8 @@ module DaVinciPASTestKit
         request.query_parameters['use_case']
       end
 
-      validator do
-        url ENV.fetch('VALIDATOR_URL')
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.davinci-pas#2.0.1'
 
         exclude_message do |message|
           # Messages expected of the form `<ResourceType>: <FHIRPath>: <message>`

data/lib/davinci_pas_test_kit/generator/suite_generator.rb

@@ -48,6 +48,11 @@ module DaVinciPASTestKit
         "Da Vinci PAS Server Suite #{ig_metadata.ig_version}"
       end
 
+      def ig_identifier
+        version = ig_metadata.ig_version[1..] # Remove leading 'v'
+        "hl7.fhir.us.davinci-pas##{version}"
+      end
+
       def ig_link
         case ig_metadata.ig_version
         when 'v2.0.1'

data/lib/davinci_pas_test_kit/igs/README.md

@@ -0,0 +1,21 @@
+# 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.

data/lib/davinci_pas_test_kit/pas_bundle_validation.rb

@@ -210,9 +210,11 @@ module DaVinciPASTestKit
     # @param version [String] The version of the IG.
     def validate_bundle_entries_against_profiles(version)
       bundle_resources_target_profile_map.each_value do |item|
+        resource = item[:resource]
+        base_profile = FHIR::Definitions.resource_definition(resource.resourceType).url
         success_profile = item[:profile_urls].find do |url|
-          profile_with_version = "#{url}|#{version}"
-          resource_is_valid?(resource: item[:resource], profile_url: profile_with_version)
+          profile_to_validate = url == base_profile ? url : "#{url}|#{version}"
+          resource_is_valid?(resource:, profile_url: profile_to_validate)
         end
 
         validation_error_messages << generate_non_conformance_message(item) unless success_profile
@@ -370,18 +372,20 @@ module DaVinciPASTestKit
 
       logger = Logger.new($stdout)
       begin
-        validator_url = ENV.fetch('VALIDATOR_URL') # 'https://inferno.healthit.gov/validatorapi/'
-        path = "#{validator_url}/evaluate?path=#{expression}"
+        fhirpath_url = ENV.fetch('FHIRPATH_URL')
+        path = "#{fhirpath_url}/evaluate?path=#{expression}"
 
         response = Faraday.post(path, resource.to_json, 'Content-Type' => 'application/json')
         if response.status.to_s.start_with? '2'
           result = JSON.parse(response.body)
           return result.map { |entry| entry.dig('element', 'reference') if entry['type'] == 'Reference' }.compact
         else
-          logger.error "External validator failed: #{response.status}"
+          logger.error "External FHIRPath service failed: #{response.status}"
+          raise 'FHIRPath service not available'
         end
       rescue Faraday::Error => e
         logger.error "HTTP request failed: #{e.message}"
+        raise 'FHIRPath service not available'
       end
 
       []

data/lib/davinci_pas_test_kit/validator_suppressions.rb

@@ -133,6 +133,8 @@ module DaVinciPASTestKit
       # no real content
       /Details for (.+) matching against profile/,
       ': All OK',
+      # This was ignored natively in the Inferno validator but needs to be ignored by the test kit with the HL7 validator
+      /URL value '.*' does not resolve/,
       # addition validator clean-up based on Bundle sub-validations where Inferno error supression doesn't
       # work. The test kit validates these instances individually as well, so they are still checked,
       # but in a way that Inferno can supress errors

data/lib/davinci_pas_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: truen
 
 module DaVinciPASTestKit
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: davinci_pas_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Inferno Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.34
+        version: 0.4.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.34
+        version: 0.4.37
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,7 @@ files:
 - lib/davinci_pas_test_kit/generator/terminology_binding_metadata_extractor.rb
 - lib/davinci_pas_test_kit/generator/validation_test_generator.rb
 - lib/davinci_pas_test_kit/generator/value_extractor.rb
+- lib/davinci_pas_test_kit/igs/README.md
 - lib/davinci_pas_test_kit/mock_server.rb
 - lib/davinci_pas_test_kit/must_support_test.rb
 - lib/davinci_pas_test_kit/pas_bundle_validation.rb