inferno_core 0.4.22 → 0.4.23

data/lib/inferno/repositories/requests.rb

@@ -1,19 +1,19 @@
 module Inferno
   module Repositories
     class Requests < Repository
-      include Import[headers_repo: 'inferno.repositories.headers']
+      include Import[
+                headers_repo: 'inferno.repositories.headers',
+                tags_repo: 'inferno.repositories.tags'
+              ]
 
       def create(params)
         request = self.class::Model.create(db_params(params))
 
-        request_headers = (params[:request_headers] || []).map do |header|
-          request.add_header(header.merge(request_id: request.index, type: 'request'))
-        end
-        response_headers = (params[:response_headers] || []).map do |header|
-          request.add_header(header.merge(request_id: request.index, type: 'response'))
-        end
+        headers = create_headers(request, params)
 
-        headers = (request_headers + response_headers).map { |header| headers_repo.build_entity(header.to_hash) }
+        params[:tags]&.each do |tag|
+          request.add_tag(tag)
+        end
 
         build_entity(
           request.to_hash
@@ -22,6 +22,17 @@ module Inferno
         )
       end
 
+      def create_headers(request, params)
+        request_headers = (params[:request_headers] || []).map do |header|
+          request.add_header(header.merge(request_id: request.index, type: 'request'))
+        end
+        response_headers = (params[:response_headers] || []).map do |header|
+          request.add_header(header.merge(request_id: request.index, type: 'response'))
+        end
+
+        (request_headers + response_headers).map { |header| headers_repo.build_entity(header.to_hash) }
+      end
+
       def find(id)
         result =
           self.class::Model
@@ -56,6 +67,19 @@ module Inferno
         build_entity(result)
       end
 
+      def tagged_requests(test_session_id, tags)
+        self.class::Model
+          .tagged_requests(test_session_id, tags)
+          .to_a
+          .map! do |request|
+            build_entity(
+              request
+                .to_json_data(json_serializer_options)
+                .deep_symbolize_keys!
+            )
+          end
+      end
+
       def requests_for_result(result_id)
         self.class::Model
           .order(:index)
@@ -68,14 +92,25 @@ module Inferno
 
       def json_serializer_options
         {
-          include: :headers
+          include: [:headers, :tags]
         }
       end
 
       class Model < Sequel::Model(db)
-        many_to_many :result, class: 'Inferno::Repositories::Results::Model', join_table: :requests_results,
-                              left_key: :request_id, right_key: :result_id
-        one_to_many :headers, class: 'Inferno::Repositories::Headers::Model', key: :request_id
+        many_to_many :result,
+                     class: 'Inferno::Repositories::Results::Model',
+                     join_table: :requests_results,
+                     left_key: :request_id,
+                     right_key: :result_id
+        many_to_many :tags,
+                     class: 'Inferno::Repositories::Tags::Model',
+                     join_table: :requests_tags,
+                     left_key: :requests_id,
+                     right_key: :tags_id,
+                     adder: :add_tag
+        one_to_many :headers,
+                    class: 'Inferno::Repositories::Headers::Model',
+                    key: :request_id
 
         def before_create
           self.id = SecureRandom.uuid
@@ -84,6 +119,57 @@ module Inferno
           self.updated_at ||= time
           super
         end
+
+        def add_tag(tag_name)
+          tag = Tags::Model.find_or_create(name: tag_name)
+
+          Inferno::Application['db.connection'][:requests_tags].insert(
+            tags_id: tag.id,
+            requests_id: index
+          )
+        end
+
+        def self.tagged_requests_sql
+          # Find all the requests for the current session which:
+          # - match all supplied tags
+          # - are the from the most recent test run for each runnable
+          <<~SQL.gsub(/\s+/, ' ').freeze
+            select final_requests.*
+            from (
+                select uncounted_requests.request_id request_id
+                from (
+                        select r.id request_id, t.id tag_id from requests r
+                        inner join requests_tags rt on r.`index` = rt.requests_id
+                        inner join tags t on rt.tags_id = t.id
+                        where r.test_session_id = :test_session_id
+                        and r.result_id in (
+                        SELECT a.id FROM results a
+                                WHERE a.test_session_id = r.test_session_id
+                                AND a.id IN  (
+                                SELECT id
+                                FROM results b
+                                WHERE (b.test_session_id = a.test_session_id AND b.test_id = a.test_id) OR
+                                        (b.test_session_id = a.test_session_id AND b.test_group_id = a.test_group_id) OR
+                                        (b.test_session_id = a.test_session_id AND b.test_suite_id = a.test_suite_id)
+                                ORDER BY updated_at DESC
+                                LIMIT 1
+                                )
+                        )
+                        and t.name in :tags
+                        group by r.id, t.id
+                    ) as uncounted_requests
+                    group by uncounted_requests.request_id
+                    having count(*) = :tag_count
+                ) as matched_requests
+            inner join requests final_requests on final_requests.id = matched_requests.request_id
+            where final_requests.test_session_id = :test_session_id
+            order by final_requests.`index`
+          SQL
+        end
+
+        def self.tagged_requests(test_session_id, tags)
+          fetch(tagged_requests_sql, test_session_id:, tags:, tag_count: tags.length)
+        end
       end
     end
   end

data/lib/inferno/repositories/tags.rb

@@ -0,0 +1,18 @@
+module Inferno
+  module Repositories
+    class Tags < Repository
+      class Model < Sequel::Model(db)
+        many_to_many :requests,
+                     class: 'Inferno::Repositories::Requests::Model',
+                     join_table: :requests_tags,
+                     left_key: :tags_id,
+                     right_key: :requests_id
+
+        def before_create
+          self.id = SecureRandom.uuid
+          super
+        end
+      end
+    end
+  end
+end

data/lib/inferno/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.4.22'.freeze
+  VERSION = '0.4.23'.freeze
 end

data/spec/factories/request.rb

@@ -27,6 +27,8 @@ FactoryBot.define do
       ]
     end
 
+    tags { [] }
+
     request_body { nil }
 
     sequence(:response_body) { |n| "RESPONSE_BODY #{n}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -577,6 +577,7 @@ files:
 - lib/inferno/config/boot/presets.rb
 - lib/inferno/config/boot/sidekiq.rb
 - lib/inferno/config/boot/suites.rb
+- lib/inferno/config/boot/validator.rb
 - lib/inferno/config/boot/web.rb
 - lib/inferno/db/migrations/001_create_initial_structure.rb
 - lib/inferno/db/migrations/002_add_wait_support.rb
@@ -586,12 +587,14 @@ files:
 - lib/inferno/db/migrations/006_remove_unused_tables.rb
 - lib/inferno/db/migrations/007_add_suite_options.rb
 - lib/inferno/db/migrations/008_remove_timestamps.rb
+- lib/inferno/db/migrations/009_add_request_tags.rb
 - lib/inferno/db/schema.rb
 - lib/inferno/dsl.rb
 - lib/inferno/dsl/assertions.rb
 - lib/inferno/dsl/configurable.rb
 - lib/inferno/dsl/fhir_client.rb
 - lib/inferno/dsl/fhir_client_builder.rb
+- lib/inferno/dsl/fhir_resource_validation.rb
 - lib/inferno/dsl/fhir_validation.rb
 - lib/inferno/dsl/http_client.rb
 - lib/inferno/dsl/http_client_builder.rb
@@ -624,6 +627,7 @@ files:
 - lib/inferno/ext/fhir_models.rb
 - lib/inferno/jobs.rb
 - lib/inferno/jobs/execute_test_run.rb
+- lib/inferno/jobs/invoke_validator_session.rb
 - lib/inferno/jobs/resume_test_run.rb
 - lib/inferno/public/0e0b993fd6ff351f435ff1c2938daf2d.png
 - lib/inferno/public/217.bundle.js
@@ -642,6 +646,7 @@ files:
 - lib/inferno/repositories/requests.rb
 - lib/inferno/repositories/results.rb
 - lib/inferno/repositories/session_data.rb
+- lib/inferno/repositories/tags.rb
 - lib/inferno/repositories/test_groups.rb
 - lib/inferno/repositories/test_runs.rb
 - lib/inferno/repositories/test_sessions.rb