onc_certification_g10_test_kit 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d1384f7d5a0ae29a25db2bef10d89572ef5112298a21ddc9ec8a7316947a62
-  data.tar.gz: 5c4b63d1d7a45c65fc3af1e8d56b466fd99a811a06baedbdf6cd558b1085e3b2
+  metadata.gz: 9bb1416b5f4a895760df48a2c49468074e882651237b8b76ebc81434b16df44d
+  data.tar.gz: '09d90f9db1f4c5be41a8e7705c5b2809f81da0bb377bcc4c4bde14e5d168943e'
 SHA512:
-  metadata.gz: 6a9bc19aa48b0b24bb045368b08e5de4dd1256258a4f17b0ef810a0c02653049ba4b5c300ccb24f1d47f300cca274f816a5d7c8a9e274e8ab7a8d69371885a74
-  data.tar.gz: 3bfcbb63b923db092d12cd148911ee7993161799ea6bf25a60b187676ecf923e53935ea7546c7052e4489ff337f0b17c0dcd3078fde3a68dc2033039f7b9a214
+  metadata.gz: 3bc7515b56f5680e57f7ef716b34ecf77b04abfdba314bc12d9c8a51a85b31da9a4da8895a32093431d52a18af36f7ca0cb9bb6fa2b2ff2f597f45e42442b151
+  data.tar.gz: d37b1c5641703be96934aeaa96444be227c7eab3653c888dcc37dfd70a41f9b44383a19efb3898337f73a93552ad48c1166b9ddffcef9eb10b8a0f87a493823f

data/lib/inferno/terminology/terminology_validation.rb

@@ -4,27 +4,30 @@ require_relative '../terminology/bcp_13'
 module Inferno
   module Terminology
     module TerminologyValidation
-      # Code systems to "preprocess" prior to validation, and the function to use
+      # CodeSystems/ValueSets to "preprocess" prior to validation, and the
+      # function to use
       PREPROCESS_FUNCS = {
-        'urn:ietf:bcp:13' => BCP13.method(:preprocess_code)
+        'urn:ietf:bcp:13' => BCP13.method(:preprocess_code),
+        'http://hl7.org/fhir/ValueSet/mimetypes' => BCP13.method(:preprocess_code)
       }.freeze
 
       def validators_repo
         @validators_repo ||= Repositories::Validators.new
       end
 
-      # This function accepts a valueset URL, code, and optional system, and returns true
-      # if the code or code/system combination is valid for the valueset
-      # represented by that URL
+      # This function accepts a valueset URL, code, and optional system, and
+      # returns true if the code or code/system combination is valid for the
+      # valueset represented by that URL
       #
       # @param String value_set_url the URL for the valueset to validate against
       # @param String code the code to validate against the valueset
-      # @param String system an optional codesystem to validate against. Defaults to nil
+      # @param String system an optional codesystem to validate against.
       # @return Boolean whether the code or code/system is in the valueset
       def validate_code(code:, value_set_url: nil, system: nil)
         # Before we validate the code, see if there's any preprocessing steps we have to do
         # To get the code "ready" for validation
         code = PREPROCESS_FUNCS[system].call(code) if PREPROCESS_FUNCS[system]
+        code = PREPROCESS_FUNCS[value_set_url].call(code) if PREPROCESS_FUNCS[value_set_url]
 
         # Get the valueset from the url. Redundant if the 'system' is not nil,
         # but allows us to throw a better error if the valueset isn't known by Inferno

data/lib/onc_certification_g10_test_kit/profile_selector.rb

@@ -38,7 +38,7 @@ module ONCCertificationG10TestKit
             extract_profile('ConditionEncounterDiagnosis')
           elsif resource_contains_category(resource, 'problem-list-item',
                                            'http://terminology.hl7.org/CodeSystem/condition-category') ||
-                resource_contains_category(resource, 'health-concern', 'http://terminology.hl7.org/CodeSystem/condition-category')
+                resource_contains_category(resource, 'health-concern', 'http://hl7.org/fhir/us/core/CodeSystem/condition-category')
             extract_profile('ConditionProblemsHealthConcerns')
           end
         else

data/lib/onc_certification_g10_test_kit/smart_scopes_test.rb

@@ -41,7 +41,7 @@ module ONCCertificationG10TestKit
     ].freeze
 
     V5_VALID_RESOURCE_TYPES =
-      (VALID_RESOURCE_TYPES + ['ServiceRequest', 'QuestionnaireResponse']).freeze
+      (VALID_RESOURCE_TYPES + ['ServiceRequest', 'QuestionnaireResponse', 'Media']).freeze
 
     PATIENT_COMPARTMENT_RESOURCE_TYPES = [
       '*',

data/lib/onc_certification_g10_test_kit/terminology_binding_validator.rb

@@ -18,15 +18,10 @@ module ONCCertificationG10TestKit
       @validation_messages = []
     end
 
-    def us_core_5_condition_category?
-      binding_definition[:path] == 'category' &&
-        binding_definition[:system] == 'http://hl7.org/fhir/us/core/ValueSet/us-core-problem-or-health-concern'
-    end
-
     def validate
       # Handle special case due to required binding on a slice
-      if us_core_5_condition_category?
-        validate_us_core_5_condition_category
+      if binding_definition[:required_binding_slice]
+        validate_required_binding_slice
       else
         add_error(element_with_invalid_binding) if element_with_invalid_binding.present? # rubocop:disable Style/IfInsideElse
       end
@@ -34,18 +29,19 @@ module ONCCertificationG10TestKit
       validation_messages
     end
 
-    def validate_us_core_5_condition_category
-      valid_category =
+    def validate_required_binding_slice
+      valid_binding =
         find_a_value_at(path_source, binding_definition[:path]) do |element|
           !invalid_binding?(element)
         end
 
-      return if valid_category.present?
+      return if valid_binding.present?
+
+      system = binding_definition[:system].presence || 'the declared Value Set'
 
       error_message = %(
-        #{resource_type}/#{resource.id} does not contain a `category` from the
-        `http://hl7.org/fhir/us/core/ValueSet/us-core-problem-or-health-concern`
-        ValueSet.
+        #{resource_type}/#{resource.id} at #{resource_type}.#{binding_definition[:path]}
+        does not contain a valid code from #{system}.
       )
 
       validation_messages << {

data/lib/onc_certification_g10_test_kit/token_revocation_group.rb

@@ -45,7 +45,7 @@ module ONCCertificationG10TestKit
 
       run do
         assert token_revocation_attestation == 'true',
-               'Health IT Module did not demonstrate support for application registration for single patients.'
+               'Health IT Module did not demonstrate the ability to revoke tokens.'
         pass token_revocation_notes if token_revocation_notes.present?
       end
     end

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '3.3.1'.freeze
+  VERSION = '3.3.2'.freeze
 end

data/lib/onc_certification_g10_test_kit.rb

@@ -102,13 +102,22 @@ module ONCCertificationG10TestKit
         end
         next if metadata.nil?
 
-        metadata.bindings
+        validation_messages = if resource.instance_of?(FHIR::Provenance)
+                                USCoreTestKit::ProvenanceValidator.validate(resource)
+                              else
+                                []
+                              end
+
+        terminology_validation_messages = metadata.bindings
           .select { |binding_definition| binding_definition[:strength] == 'required' }
           .flat_map do |binding_definition|
             TerminologyBindingValidator.validate(resource, binding_definition)
-          rescue Inferno::UnknownValueSetException, Inferno::UnknownCodeSystemException => e
-            { type: 'warning', message: e.message }
+        rescue Inferno::UnknownValueSetException, Inferno::UnknownCodeSystemException => e
+          { type: 'warning', message: e.message }
           end.compact
+
+        validation_messages.concat(terminology_validation_messages)
+        validation_messages
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onc_certification_g10_test_kit
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bloomer
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement