onc_certification_g10_test_kit 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93ef6f9961fac5bf26fba0ba18e8a67d8f5399e8dbdb7e2fd9fa73099d49592
-  data.tar.gz: 42c2e1b9ee25f29e36b2b700e7251a5db4b88cf2861dbc7fc82785a418523db6
+  metadata.gz: 1f80a148fd28accafc4b6112cf435bff19443c7422c5a92b2a6be485568839da
+  data.tar.gz: '0138f1ac5453800b58f5f4f3eb3cf4c83a84668e9ecf606ad747c50bef591e6b'
 SHA512:
-  metadata.gz: 264e96462f811d278b10533198b20abb7c466ca7c3f588fbd94ffb54d375cf66876dae8c71273a03f3e01a286e349695fdae108f8a43bf142c97ed9721eed4e0
-  data.tar.gz: 8340fafaa42fe18013f1cf568fdd8d78830a90386999a064600f621f70f491df510c2bfa6452741a569282a0bb9475050e8ec76cc4e977ba62458dadda20f47e
+  metadata.gz: 6643638bc0088397befc86627839508823c42ae59a9b0be6a80968dfe3c0f6b15390351001771593d8d33dd0231bcdcc3d18e88ed74cbd922d21398e9ece49c9
+  data.tar.gz: 1615506d4dc00c6d3a76929be7847318480a83a419fc57e72eb1df6e1d19ebd5c612841b375d00946075092b2aff29c0a75c774117c67e1bcbe15886ada0340a

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -200,6 +200,7 @@ module ONCCertificationG10TestKit
 
         wait_time = 1
         start = Time.now
+        used_time = 0
 
         loop do
           get(polling_url, headers: { authorization: "Bearer #{bearer_token}", accept: 'application/json' })
@@ -208,14 +209,21 @@ module ONCCertificationG10TestKit
 
           wait_time = retry_after_val.positive? ? retry_after_val : wait_time *= 2
 
-          seconds_used = Time.now - start + wait_time
+          used_time = Time.now - start
 
-          break if response[:status] != 202 || seconds_used > timeout
+          total_time_to_next_poll = Time.now - start + wait_time
+
+          break if response[:status] != 202 || total_time_to_next_poll > timeout
 
           sleep wait_time
         end
 
-        skip "Server took more than #{timeout} seconds to process the request." if response[:status] == 202
+        if response[:status] == 202
+          skip "Server already used #{used_time} seconds processing this request, " \
+               "and next poll is #{wait_time} seconds after. " \
+               "The total wait time for next poll is more than #{timeout} seconds time out setting."
+        end
+
         assert_response_status(200)
 
         assert request.response_header('content-type')&.value&.include?('application/json'),

data/lib/onc_certification_g10_test_kit/smart_scopes_test.rb

@@ -116,9 +116,9 @@ module ONCCertificationG10TestKit
         end
     end
 
-    def bad_format_message(scope)
+    def bad_format_message(scope, scope_direction = 'Requested')
       %(
-        Requested scope `#{scope}` does not follow the format:
+        #{scope_direction} scope `#{scope}` does not follow the format:
         `#{required_scope_type}/[ <ResourceType> | * ].[ #{read_format} ]`
       )
     end
@@ -131,12 +131,12 @@ module ONCCertificationG10TestKit
       end
     end
 
-    def assert_correct_scope_type(scope, scope_type, resource_type)
+    def assert_correct_scope_type(scope, scope_type, resource_type, scope_direction)
       if required_scope_type == 'patient' && patient_compartment_resource_types.exclude?(resource_type)
         assert ['user', 'patient'].include?(scope_type),
-               "Requested scope '#{scope}' must begin with either 'user/' or 'patient/'"
+               "#{scope_direction} scope '#{scope}' must begin with either 'user/' or 'patient/'"
       else
-        assert scope_type == required_scope_type, bad_format_message(scope)
+        assert scope_type == required_scope_type, bad_format_message(scope, scope_direction)
       end
     end
 
@@ -157,7 +157,7 @@ module ONCCertificationG10TestKit
         resource_type, access_level = resource_scope_parts
         assert access_level =~ access_level_regex, bad_format_message(scope)
 
-        assert_correct_scope_type(scope, scope_type, resource_type)
+        assert_correct_scope_type(scope, scope_type, resource_type, 'Requested')
 
         assert valid_resource_types.include?(resource_type),
                "'#{resource_type}' must be either a permitted resource type or '*'"
@@ -189,7 +189,7 @@ module ONCCertificationG10TestKit
 
         next unless ['patient', 'user', 'system'].include?(scope_type)
 
-        assert_correct_scope_type(scope, scope_type, resource_type)
+        assert_correct_scope_type(scope, scope_type, resource_type, 'Received')
 
         granted_resource_types << resource_type
       end

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '3.7.0'.freeze
+  VERSION = '3.7.2'.freeze
 end

data/lib/onc_certification_g10_test_kit.rb

@@ -61,63 +61,80 @@ module ONCCertificationG10TestKit
       /Unknown ValueSet/
     ].freeze
 
-    validator do
-      url ENV.fetch('G10_VALIDATOR_URL', 'http://validator_service:4567')
-
-      exclude_message do |message|
-        us_core_message_filters = USCoreTestKit::USCoreV311::USCoreTestSuite::VALIDATION_MESSAGE_FILTERS
-        if message.type == 'info' ||
-           (message.type == 'warning' && WARNING_INCLUSION_FILTERS.none? { |filter| filter.match? message.message }) ||
-           us_core_message_filters.any? { |filter| filter.match? message.message } ||
-           (
-             message.type == 'error' && (
-               message.message.match?(/\A\S+: \S+: Unknown Code/) ||
-               message.message.match?(/\A\S+: \S+: None of the codings provided are in the value set/) ||
-               message.message.match?(/\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/)
+    [
+      G10Options::US_CORE_3_REQUIREMENT,
+      G10Options::US_CORE_4_REQUIREMENT,
+      G10Options::US_CORE_5_REQUIREMENT
+    ].each do |us_core_version_requirement|
+      validator :default, required_suite_options: us_core_version_requirement do
+        url ENV.fetch('G10_VALIDATOR_URL', 'http://validator_service:4567')
+
+        us_core_message_filters =
+          case (us_core_version_requirement[:us_core_version])
+          when G10Options::US_CORE_3
+            USCoreTestKit::USCoreV311::USCoreTestSuite::VALIDATION_MESSAGE_FILTERS
+          when G10Options::US_CORE_4
+            USCoreTestKit::USCoreV400::USCoreTestSuite::VALIDATION_MESSAGE_FILTERS
+          when G10Options::US_CORE_5
+            USCoreTestKit::USCoreV501::USCoreTestSuite::VALIDATION_MESSAGE_FILTERS
+          end
+
+        exclude_message do |message|
+          if message.type == 'info' ||
+             (message.type == 'warning' && WARNING_INCLUSION_FILTERS.none? do |filter|
+                filter.match? message.message
+              end) ||
+             us_core_message_filters.any? { |filter| filter.match? message.message } ||
+             (
+               message.type == 'error' && (
+                 message.message.match?(/\A\S+: \S+: Unknown Code/) ||
+                 message.message.match?(/\A\S+: \S+: None of the codings provided are in the value set/) ||
+                 message.message.match?(/\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/)
+               )
              )
-           )
-          true
-        else
-          false
+            true
+          else
+            false
+          end
         end
-      end
 
-      perform_additional_validation do |resource, profile_url|
-        versionless_profile_url, profile_version = profile_url.split('|')
-        profile_version = case profile_version
-                          when '4.0.0'
-                            '400'
-                          when '5.0.1'
-                            '501'
-                          else
-                            # This open-ended else is primarily for Vital Signs profiles in v3.1.1, which are tagged
-                            # with the base FHIR version (4.0.1).  The profiles were migrated to US Core in later
-                            # versions.
-                            '311'
-                          end
-
-        us_core_suite = USCoreTestKit.const_get("USCoreV#{profile_version}")::USCoreTestSuite
-        metadata = us_core_suite.metadata.find do |metadata_candidate|
-          metadata_candidate.profile_url == versionless_profile_url
+        perform_additional_validation do |resource, profile_url|
+          versionless_profile_url, profile_version = profile_url.split('|')
+          profile_version = case profile_version
+                            when '4.0.0'
+                              '400'
+                            when '5.0.1'
+                              '501'
+                            else
+                              # This open-ended else is primarily for Vital Signs profiles in v3.1.1, which are tagged
+                              # with the base FHIR version (4.0.1).  The profiles were migrated to US Core in later
+                              # versions.
+                              '311'
+                            end
+
+          us_core_suite = USCoreTestKit.const_get("USCoreV#{profile_version}")::USCoreTestSuite
+          metadata = us_core_suite.metadata.find do |metadata_candidate|
+            metadata_candidate.profile_url == versionless_profile_url
+          end
+          next if metadata.nil?
+
+          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 }
+            end.compact
+
+          validation_messages.concat(terminology_validation_messages)
+          validation_messages
         end
-        next if metadata.nil?
-
-        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 }
-          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.7.0
+  version: 3.7.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-06-13 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.7
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement