auscvdrisk_inferno 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcbe60d262e2e5db84dbd5d0c5dd5d89ecbe1a80ce5a30db952f7c1c96c60a29
-  data.tar.gz: 9938beb41fa23bf852e852f31d7015506b17b9a559853a01396b00357863c0f7
+  metadata.gz: af0e1c12464e7a600252f0ae14e61e5f7f0e3684d70c5e0fb7a013fbe28bd4b0
+  data.tar.gz: 368b1e767db1d8a1645ea6f62e7d79ce71377f51940aebc281bb038054cc7615
 SHA512:
-  metadata.gz: bef956f3427cef93e9b595018a7d74e028d27705dd7e6aec017769fc75d0ed49c9806cb2ef3dd2fe7f6aa67179451546cdf0af32b1edadd51deb76e44c112539
-  data.tar.gz: 06adbbce609d183edb91bd6e2d450f34f86b80b6178f5746324f21bff229ffea58a830c0246188fcf40fc55507433b9acd65eac48a18dfeb85f460e0977622f6
+  metadata.gz: 7abc3d9f30144276281d695463190a2a9df924892fdd97ed0300ba9469b9c3e116155f94caedc0649b19f246277657464338b191876bb1f8027ca66e8d41cf07
+  data.tar.gz: 6b2a7a22035af48f5ff43b8830ad49a962f40fe25da07991130ece8126dd6e1788b69d08fc0a08d985e9a057c0ab4d0ecb1072bff9abf753cdf7d32a1273dfae

data/lib/auscvdrisk/prepop/diagnoses.rb

@@ -38,7 +38,6 @@ module AusCVDRisk
       end
 
       test do
-        optional
         title 'Server declares support for Condition patient search parameter'
         description %(
         The server should declare support for the Condition patient search parameter
@@ -141,11 +140,37 @@ module AusCVDRisk
         end
       end
 
+      test do
+        title 'Server declares support for Condition patient+category search parameters'
+        description %(
+        The server SHALL declare support for the combined Condition search parameters
+        (patient+category) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
+      )
+
+        run do
+          fhir_get_capability_statement
+
+          assert_response_status(200)
+          assert_resource_type(:capability_statement)
+          capability_statement = resource
+
+          resource_type = 'Condition'
+          required_params = %w[patient category]
+          combined_params = 'patient+category'
+
+          if check_search_combination_support(capability_statement, resource_type, required_params)
+            pass "Server declares support for combined Condition search parameters: #{combined_params}"
+          else
+            assert false, "Server does not declare support for required combined Condition search parameters: #{combined_params}"
+          end
+        end
+      end
+
       test do
         optional
-        title 'Server declares support for Condition combined search parameters'
+        title 'Server declares support for Condition patient+clinical-status+category+_sort search parameters'
         description %(
-        The server should declare support for the combined Condition search parameters
+        The server MAY declare support for the combined Condition search parameters
         (patient+clinical-status+category+_sort) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
       )
 
@@ -163,7 +188,7 @@ module AusCVDRisk
           if check_search_combination_support(capability_statement, resource_type, required_params)
             pass "Server declares support for combined Condition search parameters: #{combined_params}"
           else
-            assert false, "Server does not declare support for combined Condition search parameters: #{combined_params}"
+            warning "Server does not declare support for optional combined Condition search parameters: #{combined_params}"
           end
         end
       end

data/lib/auscvdrisk/prepop/medications.rb

@@ -113,11 +113,64 @@ module AusCVDRisk
         end
       end
 
+      test do
+        title 'Server declares support for MedicationRequest patient+status search parameters'
+        description %(
+        The server SHALL declare support for the combined MedicationRequest search parameters
+        (patient+status) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
+      )
+
+        run do
+          fhir_get_capability_statement
+
+          assert_response_status(200)
+          assert_resource_type(:capability_statement)
+          capability_statement = resource
+
+          resource_type = 'MedicationRequest'
+          required_params = %w[patient status]
+          combined_params = 'patient+status'
+
+          if check_search_combination_support(capability_statement, resource_type, required_params)
+            pass "Server declares support for combined MedicationRequest search parameters: #{combined_params}"
+          else
+            assert false, "Server does not declare support for required combined MedicationRequest search parameters: #{combined_params}"
+          end
+        end
+      end
+
+      test do
+        optional
+        title 'Server declares support for MedicationRequest patient+status+_include search parameters'
+        description %(
+        The server SHOULD declare support for the combined MedicationRequest search parameters
+        (patient+status+_include) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
+      )
+
+        run do
+          fhir_get_capability_statement
+
+          assert_response_status(200)
+          assert_resource_type(:capability_statement)
+          capability_statement = resource
+
+          resource_type = 'MedicationRequest'
+          required_params = %w[patient status _include]
+          combined_params = 'patient+status+_include'
+
+          if check_search_combination_support(capability_statement, resource_type, required_params)
+            pass "Server declares support for combined MedicationRequest search parameters: #{combined_params}"
+          else
+            warning "Server does not declare support for recommended combined MedicationRequest search parameters: #{combined_params}"
+          end
+        end
+      end
+
       test do
         optional
-        title 'Server declares support for MedicationRequest basic combined search parameters'
+        title 'Server declares support for MedicationRequest patient+status+intent search parameters'
         description %(
-        The server should declare support for the combined MedicationRequest search parameters
+        The server MAY declare support for the combined MedicationRequest search parameters
         (patient+status+intent) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
       )
 
@@ -135,16 +188,16 @@ module AusCVDRisk
           if check_search_combination_support(capability_statement, resource_type, required_params)
             pass "Server declares support for combined MedicationRequest search parameters: #{combined_params}"
           else
-            assert false, "Server does not declare support for combined MedicationRequest search parameters: #{combined_params}"
+            warning "Server does not declare support for optional combined MedicationRequest search parameters: #{combined_params}"
           end
         end
       end
 
       test do
         optional
-        title 'Server declares support for MedicationRequest combined search parameters with _include'
+        title 'Server declares support for MedicationRequest patient+status+intent+_include search parameters'
         description %(
-        The server should declare support for the combined MedicationRequest search parameters with _include
+        The server MAY declare support for the combined MedicationRequest search parameters
         (patient+status+intent+_include) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
       )
 
@@ -160,9 +213,9 @@ module AusCVDRisk
           combined_params = 'patient+status+intent+_include'
 
           if check_search_combination_support(capability_statement, resource_type, required_params)
-            pass "Server declares support for combined MedicationRequest search parameters with _include: #{combined_params}"
+            pass "Server declares support for combined MedicationRequest search parameters: #{combined_params}"
           else
-            assert false, "Server does not declare support for combined MedicationRequest search parameters with _include: #{combined_params}"
+            warning "Server does not declare support for optional combined MedicationRequest search parameters: #{combined_params}"
           end
         end
       end
@@ -260,9 +313,61 @@ module AusCVDRisk
         end
       end
 
+      test do
+        title 'MedicationRequest search with patient+status parameters is successful'
+
+        run do
+          fhir_read(:patient, patient_id)
+          assert_response_status(200)
+
+          search_params = "status=active,completed&patient=#{patient_id}"
+
+          fhir_search(:medication_request, params: {
+            status: 'active,completed',
+            patient: patient_id
+          })
+
+          assert_response_status(200)
+          bundle = JSON.parse(response[:body])
+          verify_search_parameters_in_self_link(bundle, search_params)
+          pass 'Successfully searched for MedicationRequests with patient+status parameters'
+        end
+      end
+
+      test do
+        optional
+        title 'MedicationRequest search with patient+status+_include parameters is successful'
+
+        run do
+          fhir_read(:patient, patient_id)
+          assert_response_status(200)
+
+          search_params = "_include=MedicationRequest:medication&status=active,completed&patient=#{patient_id}"
+
+          fhir_search(:medication_request, params: {
+            _include: 'MedicationRequest:medication',
+            status: 'active,completed',
+            patient: patient_id
+          })
+
+          assert_response_status(200)
+          bundle = JSON.parse(response[:body])
+          verify_search_parameters_in_self_link(bundle, search_params)
+
+          # Check if any Medication resources are included in the bundle
+          medication_entries = bundle['entry']&.select { |entry| entry['resource']['resourceType'] == 'Medication' }
+
+          if medication_entries&.any?
+            pass 'Successfully searched for MedicationRequests with patient+status+_include parameters and found included Medication resources'
+          else
+            warning 'Successfully searched with patient+status+_include parameters but no Medication resources were included in the response'
+          end
+        end
+      end
+
       test do
         optional
-        title 'MedicationRequest search with combined parameters is successful'
+        title 'MedicationRequest search with patient+status+intent parameters is successful'
 
         run do
           fhir_read(:patient, patient_id)
@@ -279,13 +384,13 @@ module AusCVDRisk
           assert_response_status(200)
           bundle = JSON.parse(response[:body])
           verify_search_parameters_in_self_link(bundle, search_params)
-          pass 'Successfully searched for MedicationRequests with combined parameters'
+          pass 'Successfully searched for MedicationRequests with patient+status+intent parameters'
         end
       end
 
       test do
         optional
-        title 'MedicationRequest search with combined parameters and _include is successful'
+        title 'MedicationRequest search with patient+status+intent+_include parameters is successful'
 
         run do
           fhir_read(:patient, patient_id)
@@ -308,9 +413,9 @@ module AusCVDRisk
           medication_entries = bundle['entry']&.select { |entry| entry['resource']['resourceType'] == 'Medication' }
 
           if medication_entries&.any?
-            pass 'Successfully searched for MedicationRequests with combined parameters and _include, and found included Medication resources'
+            pass 'Successfully searched for MedicationRequests with patient+status+intent+_include parameters and found included Medication resources'
           else
-            assert false, 'Successfully searched with combined parameters and _include but no Medication resources were included in the response'
+            warning 'Successfully searched with patient+status+intent+_include parameters but no Medication resources were included in the response'
           end
         end
       end

data/lib/auscvdrisk/prepop/observations.rb

@@ -130,9 +130,39 @@ module AusCVDRisk
         end
       end
 
+      test do
+        title 'Server declares support for Observation patient+code search parameters'
+        description %(
+        The server SHALL declare support for the combined Observation search parameters
+        (patient+code) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
+      )
+
+        run do
+          fhir_get_capability_statement
+
+          assert_response_status(200)
+          assert_resource_type(:capability_statement)
+          capability_statement = resource
+
+          resource_type = 'Observation'
+          required_params = %w[patient code]
+          combined_params = 'patient+code'
+
+          if check_search_combination_support(capability_statement, resource_type, required_params)
+            pass "Server declares support for combined Observation search parameters: #{combined_params}"
+          else
+            assert false, "Server does not declare support for required combined Observation search parameters: #{combined_params}"
+          end
+        end
+      end
+
       test do
         optional
-        title 'Server declares support for Observation combined search parameters'
+        title 'Server declares support for Observation patient+code+status+_count+_sort search parameters'
+        description %(
+        The server MAY declare support for the combined Observation search parameters
+        (patient+code+status+_count+_sort) as specified in the Aus CVD Risk Calculator Launch Server CapabilityStatement.
+      )
 
         run do
           fhir_get_capability_statement
@@ -148,7 +178,7 @@ module AusCVDRisk
           if check_search_combination_support(capability_statement, resource_type, required_params)
             pass "Server declares support for combined Observation search parameters: #{combined_params}"
           else
-            assert false, "Server does not declare support for combined Observation search parameters: #{combined_params}"
+            warning "Server does not declare support for optional combined Observation search parameters: #{combined_params}"
           end
         end
       end
@@ -302,9 +332,37 @@ module AusCVDRisk
         end
       end
 
+      test do
+        title 'Observation search with patient+code parameters is successful'
+
+        input :patient_id,
+              title: 'Patient ID',
+              description: 'ID of a patient resource on the server'
+
+        run do
+          skip_if patient_id.blank?, 'No patient ID provided'
+
+          # Using LOINC code for total cholesterol as an example
+          code = 'http://loinc.org|2093-3'
+
+          search_params = "code=#{code}&patient=#{patient_id}"
+
+          fhir_search(:observation, params: {
+            code: code,
+            patient: patient_id
+          })
+
+          assert_response_status(200)
+          bundle = JSON.parse(response[:body])
+          verify_search_parameters_in_self_link(bundle, search_params)
+
+          pass 'Successfully searched for Observations with patient+code parameters'
+        end
+      end
+
       test do
         optional
-        title 'Observation search with combined parameters is successful'
+        title 'Observation search with patient+code+status+_count+_sort parameters is successful'
 
         input :patient_id,
               title: 'Patient ID',
@@ -353,7 +411,7 @@ module AusCVDRisk
             end
           end
 
-          pass 'Successfully searched for Observations with combined parameters'
+          pass 'Successfully searched for Observations with patient+code+status+_count+_sort parameters'
         end
       end
 

data/lib/auscvdrisk/version.rb

@@ -1,3 +1,3 @@
 module AusCVDRisk
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auscvdrisk_inferno
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Australian e-Health Research Centre, CSIRO
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -23,6 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,9 +45,11 @@ files:
 - lib/auscvdrisk/suite.rb
 - lib/auscvdrisk/version.rb
 - lib/auscvdrisk/write_back.rb
+homepage:
 licenses: []
 metadata:
   inferno_test_kit: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -59,7 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Aus CVD Risk-i Test Kit
 test_files: []