feat(matrix badge): optimise database query

pact-foundation · Oct 24, 2019 · 2b7f8e2 · 2b7f8e2
1 parent e109a8c
commit 2b7f8e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/lib/pact_broker/domain/verification.rb b/lib/pact_broker/domain/verification.rb
@@ -58,12 +58,6 @@ def untagged
             .left_outer_join(:tags, {version_id: :consumer_version_id})
             .where(Sequel.qualify(:tags, :name) => nil)
         end
-
-        def provider_version_tag tag_name
-          filter = name_like(Sequel.qualify(:ptags, :name), tag_name)
-          join_params = { Sequel[:ptags][:version_id] => Sequel[model.table_name][:provider_version_id] }
-          join(:tags, join_params, {table_alias: :ptags}).where(filter)
-        end
       end
 
       def pact_version_sha

diff --git a/lib/pact_broker/verifications/repository.rb b/lib/pact_broker/verifications/repository.rb
@@ -101,19 +101,27 @@ def find_latest_verification_for consumer_name, provider_name, consumer_version_
       end
 
       def find_latest_verification_for_tags consumer_name, provider_name, consumer_version_tag, provider_version_tag
-        view_name = PactBroker::Verifications::AllVerifications.table_name
-        query = PactBroker::Verifications::AllVerifications
+        view_name = PactBroker::Domain::Verification.table_name
+        consumer = pacticipant_repository.find_by_name(consumer_name)
+        provider = pacticipant_repository.find_by_name(provider_name)
+
+        consumer_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:consumer_tags, :name), consumer_version_tag)
+        provider_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:provider_tags, :name), provider_version_tag)
+
+        query = PactBroker::Domain::Verification
           .select_all_qualified
-          .join(:versions, {Sequel[:provider_versions][:id] => Sequel[view_name][:provider_version_id]}, {table_alias: :provider_versions})
-          .join(:latest_pact_publications_by_consumer_versions, { Sequel[view_name][:pact_version_id] => Sequel[:latest_pact_publications_by_consumer_versions][:pact_version_id] })
-          .consumer(consumer_name)
-          .provider(provider_name)
-          .tag(consumer_version_tag)
-          .provider_version_tag(provider_version_tag)
+          .join(:versions, { Sequel[:provider_versions][:id] => Sequel[view_name][:provider_version_id] }, { table_alias: :provider_versions })
+          .join(:latest_verification_id_for_pact_version_and_provider_version, { Sequel[:lv][:verification_id] => Sequel[view_name][:id] }, { table_alias: :lv })
+          .join(:latest_pact_publication_ids_for_consumer_versions, { Sequel[view_name][:pact_version_id] => Sequel[:lp][:pact_version_id] }, { table_alias: :lp })
+          .join(:versions, { Sequel[:consumer_versions][:id] => Sequel[:lp][:consumer_version_id] }, { table_alias: :consumer_versions })
+          .join(:tags, { Sequel[:consumer_tags][:version_id] => Sequel[:lp][:consumer_version_id]}, { table_alias: :consumer_tags })
+          .join(:tags, { Sequel[:provider_tags][:version_id] => Sequel[view_name][:provider_version_id]}, { table_alias: :provider_tags })
+          .where(consumer: consumer, provider: provider)
+          .where(consumer_tag_filter)
+          .where(provider_tag_filter)
 
         query.reverse_order(
-          Sequel[:latest_pact_publications_by_consumer_versions][:consumer_version_order],
-          Sequel[:latest_pact_publications_by_consumer_versions][:revision_number],
+          Sequel[:consumer_versions][:order],
           Sequel[:provider_versions][:order],
           Sequel[view_name][:execution_date]
         ).limit(1).single_record