service_base_url_test_kit 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 638bed4317d3630a7ffdfbc9cef4be2dc266ab285de017d890a1ceadec4858fc
-  data.tar.gz: fab6cb020b68f87db82348891f3b80eb0d5e3bc9181639c9bf1b5a9505611de4
+  metadata.gz: 748b6e8e1419df212293e1e3c50cca2f5667b5452b8028af463795cd7ec9e3a0
+  data.tar.gz: c3f9455cc98c71b0cd2594942dfaff8be0f473964810c996f1bb8d8435e83414
 SHA512:
-  metadata.gz: 61b58536e24b25039953dc99cc4a507202c08297a8be0f70edb0d340ec0fa77824dbaee0de8be5bb548306eaf5c0e5b47dc143405882ebb5f91537bd258ccb68
-  data.tar.gz: 1fccec1d67cb3642771fa89360e90b3ad9f157bed70d35ee5beb09324cc5b649f74554638df4202834ffba3ca43c1578751477df79eb7c626707371ace21d205
+  metadata.gz: 84bac767ad36fa3ec2ef0364187dfb05f69702ff03ac6ab7cb1319e4a6d0ba5dfd5b1e7cd50dc00c84266ae2ccd44ca12ade440c8775308f8167a6e6d8a3a3c3
+  data.tar.gz: e268c09aeaf98dc7003aceed782ae98a438407637e35c0ff0b670abf1459c829884bca8a370afdc69a52abb9af3957faab4f145c0c421e6427159a13746f186e

data/lib/service_base_url_test_kit/service_base_url_test_group.rb

@@ -6,22 +6,19 @@ module ServiceBaseURLTestKit
     id :service_base_url_test_group
     title 'Validate Service Base URL Publication'
     description %(
-      Verify that the developer makes its Service Base URL publication publicly available
-      in the Bundle resource format with valid Endpoint and Organization entries.
-      This test group will issue a HTTP GET request against the supplied URL to
-      retrieve the developer's Service Base URL publication and ensure the list is
-      publicly accessible. It will then ensure that the returned service base URL
-      publication is in the Bundle resource format containing its service base URLs and
-      related organizational details in valid Endpoint and Organization resources
-      that follow the specifications detailed in the HTI-1 rule and the API
-      Condition and Maintenance of Certification.
+      Verify that the developer makes its Service Base URL publication publicly available in the Bundle resource format
+      with valid Endpoint and Organization entries. This test group will issue a HTTP GET request against the supplied
+      URL to retrieve the developer's Service Base URL publication and ensure the list is publicly accessible. It will
+      then ensure that the returned service base URL publication is in the Bundle resource format containing its service
+      base URLs and related organizational details in valid Endpoint and Organization resources that follow the
+      specifications detailed in the HTI-1 rule and the API Condition and Maintenance of Certification.
 
       For systems that provide the service base URL Bundle at a URL, please run
       this test with the Service Base URL Publication URL input populated and the Service Base URL Publication Bundle
-      input left blank. While it is the expectation of the specification for the service base URL Bundle to be served at a
-      public-facing endpoint, testers can validate a Service Base URL Bundle not served at a public endpoint by running
-      these tests with the Service Base URL Publication Bundle input populated and the Service Base URL Publication URL
-      input left blank.
+      input left blank. While it is the expectation of the specification for the service base URL Bundle to be served at
+      a public-facing endpoint, testers can validate a Service Base URL Bundle not served at a public endpoint by
+      running these tests with the Service Base URL Publication Bundle input populated and the Service Base URL
+      Publication URL input left blank.
     )
 
     input_instructions <<~INSTRUCTIONS

data/lib/service_base_url_test_kit/service_base_url_validate_group.rb

@@ -76,6 +76,14 @@ module ServiceBaseURLTestKit
         .select { |endpoint_id| endpoint_id_ref.include? endpoint_id }
     end
 
+    def find_parent_organization(bundle_resource, org_reference)
+      bundle_resource
+        .entry
+        .map(&:resource)
+        .select { |resource| resource.resourceType == 'Organization' }
+        .find { |parent_org| org_reference.include? parent_org.id }
+    end
+
     def skip_message
       %(
         No Service Base URL request was made in the previous test, and no Service Base URL Publication Bundle
@@ -274,10 +282,13 @@ module ServiceBaseURLTestKit
             - active
             - name
           - Include the organization's name, location, and facility identifier
-          - Use the endpoint field to reference Endpoints associated with the Organization:
-            - Must reference only Endpoint resources in the endpoint field
-            - Must reference at least one Endpoint resource in the endpoint field
-            - Must reference only Endpoints that are contained in the Service Base URL Bundle
+          - For Endpoint information, the Organization must either:
+            - Use the endpoint field to reference Endpoints associated with the Organization
+              - Must reference only Endpoint resources in the endpoint field
+              - Must reference at least one Endpoint resource in the endpoint field
+              - Must reference only Endpoints that are contained in the Service Base URL Bundle
+            - Use the partOf field to reference a parent Organization that already contains the applicable endpoint
+            information in its own "Organization.endpoint" element
       )
 
       run do
@@ -313,18 +324,31 @@ module ServiceBaseURLTestKit
         end
 
         organization_resources.each do |organization|
-          assert !organization.endpoint.empty?,
-                 "Organization with id: #{organization.id} does not have the endpoint field populated"
           assert !organization.address.empty?,
                  "Organization with id: #{organization.id} does not have the address field populated"
 
-          endpoint_references = organization.endpoint.map(&:reference)
+          if organization.endpoint.empty?
+            assert organization.partOf.present?, %(
+                    Organization with id: #{organization.id} does not have the endpoint or partOf field populated
+                  )
+            parent_organization = find_parent_organization(bundle_resource, organization.partOf.reference)
+            assert(parent_organization.present?, %(
+              Organization with id: #{organization.id} references parent Organization not found in the Bundle:
+              #{organization.partOf.reference}
+            ))
+            assert(!parent_organization.endpoint.empty?, %(
+              Organization with id: #{organization.id} has parent Organization with id: #{parent_organization.id} that
+              does not have the `endpoint` field populated.
+            ))
+          else
+            endpoint_references = organization.endpoint.map(&:reference)
 
-          endpoint_references.each do |endpoint_id_ref|
-            organization_referenced_endpts = find_referenced_endpoint(bundle_resource, endpoint_id_ref)
-            assert !organization_referenced_endpts.empty?,
-                   "Organization with id: #{organization.id} references an Endpoint that is not contained in this
-                   bundle."
+            endpoint_references.each do |endpoint_id_ref|
+              organization_referenced_endpts = find_referenced_endpoint(bundle_resource, endpoint_id_ref)
+              assert !organization_referenced_endpts.empty?,
+                     "Organization with id: #{organization.id} references an Endpoint that is not contained in this
+                    bundle."
+            end
           end
         end
       end

data/lib/service_base_url_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ServiceBaseURLTestKit
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/lib/service_base_url_test_kit.rb

@@ -47,14 +47,16 @@ module ServiceBaseURLTestKit
        - Organization details for each service base URL must be publicly published in Organization
          resource format according to the standard adopted in § 170.215(a) (FHIR v4.0.1). Each
          Organization resource must contain:
-          - A reference, in the Organization endpoint element, to the Endpoint
-            resources containing service base URLs managed by this organization.
           - The organization's name, location, and facility identifier.
+          - Either:
+            - A reference, in the Organization endpoint element, to the Endpoint
+            resources containing service base URLs managed by this organization
+            - A reference, in the Organization partOf element, to the parent Organization that contains the applicable
+            endpoint information in its own "Organization.endpoint" element
        - Endpoint and Organization resources must be:
          - Collected into a Bundle resource formatted according to the standard
-            adopted in § 170.215(a) (FHIR v4.0.1) for publication;
-         - and Reviewed quarterly and, as
-            necessary, updated.
+            adopted in § 170.215(a) (FHIR v4.0.1) for publication
+         - Reviewed quarterly and, as necessary, updated.
 
 
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_base_url_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Inferno Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-11-06 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.37
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.37
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ files:
 - LICENSE
 - lib/service_base_url_test_kit.rb
 - lib/service_base_url_test_kit/examples/CapabilityStatement.json
-- lib/service_base_url_test_kit/examples/SmartAccessBrand.json.erb
 - lib/service_base_url_test_kit/examples/testBundleValid.json.erb
 - lib/service_base_url_test_kit/service_base_url_retrieve_group.rb
 - lib/service_base_url_test_kit/service_base_url_test_group.rb

data/lib/service_base_url_test_kit/examples/SmartAccessBrand.json.erb

@@ -1,105 +0,0 @@
-{
-    "resourceType" : "Bundle",
-    "id" : "example1",
-    "type" : "collection",
-    "timestamp" : "2023-09-05T20:00:43.241070-07:00",
-    "entry" : [{
-      "fullUrl" : "https://fhir.labs.example.com/Organization/examplelabs",
-      "resource" : {
-        "resourceType" : "Organization",
-        "id" : "examplelabs",
-        "extension" : [{
-          "extension" : [{
-            "url" : "brandLogo",
-            "valueUrl" : "https://labs.example.com/images/logo.svg"
-          }],
-          "url" : "http://hl7.org/fhir/StructureDefinition/organization-brand"
-        },
-        {
-          "extension" : [{
-            "url" : "portalName",
-            "valueString" : "Example Labs HealthCentral Portal"
-          },
-          {
-            "url" : "portalUrl",
-            "valueUrl" : "https://healthcentral.labs.example.com"
-          },
-          {
-            "url" : "portalLogo",
-            "valueUrl" : "https://healthcentral.labs.example.com/logo.png"
-          },
-          {
-            "url" : "portalEndpoint",
-            "valueReference" : {
-              "reference" : "Endpoint/examplelabs",
-              "display" : "FHIR R4 Endpoint for ExampleLabs Brand"
-            }
-          }],
-          "url" : "http://hl7.org/fhir/StructureDefinition/organization-portal"
-        }],
-        "identifier" : [{
-          "system" : "urn:ietf:rfc:3986",
-          "value" : "https://examplelabs.org"
-        }],
-        "active" : true,
-        "type" : [{
-          "coding" : [{
-            "system" : "http://hl7.org/fhir/smart-app-launch/CodeSystem/patient-access-category",
-            "code" : "laboratory",
-            "display" : "Laboratory"
-          }]
-        }],
-        "name" : "ExampleLabs",
-        "alias" : ["ExampleLabs Alaska",
-        "...(more here)...",
-        "ExampleLabs Wisconsin"],
-        "telecom" : [{
-          "system" : "url",
-          "value" : "https://labs.example.com"
-        }],
-        "address" : [{
-          "line" : ["4015 Lake Otis Pkwy"],
-          "city" : "Anchorage",
-          "state" : "AK",
-          "postalCode" : "99508"
-        },
-        {
-          "state" : "...(more here)..."
-        },
-        {
-          "line" : ["123 Main St"],
-          "city" : "Madison",
-          "state" : "WI",
-          "postalCode" : "53726"
-        }]
-      }
-    },
-    {
-      "fullUrl" : "https://fhir.labs.example.com/Endpoint/examplelabs",
-      "resource" : {
-        "resourceType" : "Endpoint",
-        "id" : "examplelabs",
-        "extension" : [{
-          "url" : "http://hl7.org/fhir/StructureDefinition/endpoint-fhir-version",
-          "valueCode" : "4.0.1"
-        }],
-        "status" : "active",
-        "connectionType" : {
-          "system" : "http://terminology.hl7.org/CodeSystem/endpoint-connection-type",
-          "code" : "hl7-fhir-rest"
-        },
-        "name" : "FHIR R4 Endpoint for ExampleLabs",
-        "contact" : [{
-          "system" : "url",
-          "value" : "https://dev-portal.labs.example.com"
-        }],
-        "payloadType" : [{
-          "coding" : [{
-            "system" : "http://terminology.hl7.org/CodeSystem/endpoint-payload-type",
-            "code" : "none"
-          }]
-        }],
-        "address" : "<%= ENV['INFERNO_HOST'] %>/custom/service_base_url_test_kit_suite/examples/CapabilityStatement"
-      }
-    }]
-  }