pact_broker 2.39.0 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e280e7c13bd55791cab9e6133c2a63c62e18c89
-  data.tar.gz: 34f9831b62572f892ccd85a4a71f8f05e0660210
+  metadata.gz: 9640609d3cd63f00f72cd919503c9753e7f14901
+  data.tar.gz: c538742c6e384659661609b059e24ca1c5732ae2
 SHA512:
-  metadata.gz: 358dff2b700249596936bf1cd380568a01220941a0f63e4d70ed3366f5e69b1a8fa2855976011779439dfd01e43cae4e2c79b370a9f1920bcb98a199da92f132
-  data.tar.gz: f5a45fde10fde4d65afef8cc1ce3202da9dd46163c5f0096f6c421a305dc87a1f0528502bfcc0a15d4771b7a95e0e42864a6de1f218e56a1daadee73e5b69225
+  metadata.gz: 9a6918c28db99e46a2c28c6ac608aadec4efe8780369328956a8617bd1f17dd3bb8899c80f0e597920d0005e9856e0cce56303f108df98240d32556808f1fd46
+  data.tar.gz: 99cc9f3892e31cd11c449de7f4da9469f70d96df2ec6501df37225f3d98b5068ac71fbf42e1f359e5acbe7c29f572aa2d6baaa066a180c3ffa65fea29e777979

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+<a name="v2.40.0"></a>
+### v2.40.0 (2019-10-26)
+
+
+#### Features
+
+* **matrix**
+  * default page to showing 'latest by consumer version and provider' as it is much quicker and less confusing.	 ([dd879250](/../../commit/dd879250))
+
+* optimise query to find latest verification for consumer version tag	 ([301b30ca](/../../commit/301b30ca))
+
+* **matrix badge**
+  * optimise database query	 ([2b7f8e23](/../../commit/2b7f8e23))
+
+
+#### Bug Fixes
+
+* **matrix**
+  * exceptions on matrix page due to recent query optimisation	 ([3c504ba5](/../../commit/3c504ba5))
+
+* **frontend**
+  * remove 'v' prefix on versions during render (#313)	 ([e109a8cd](/../../commit/e109a8cd))
+
+
 <a name="v2.39.0"></a>
 ### v2.39.0 (2019-10-21)
 

data/db/ddl_statements/latest_verification_ids_for_consumer_version_tags.rb

@@ -0,0 +1,38 @@
+# The latest verification id for each consumer version tag
+# This is not:
+#   find latest pacticipant version with given tag
+#     -> find the latest pact
+#     -> find the latest verification
+# because the latest pacticipant version with the tag might not have a pact,
+# and the latest pact might not have a verification.
+
+# This is:
+# join the tags and the pacticipant versions and the verifications and find the "latest" row
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_VERSION_TAGS_V1 = "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        t.name as consumer_version_tag_name,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publications_by_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join tags t
+        on lpp.consumer_version_id = t.version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id, t.name"
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_VERSION_TAGS_V2 = "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        t.name as consumer_version_tag_name,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publication_ids_for_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join tags t
+        on lpp.consumer_version_id = t.version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id, t.name"

data/db/migrations/20180523_create_latest_verifications_for_consumer_version_tags.rb

@@ -1,22 +1,8 @@
+require_relative '../ddl_statements'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
-    # This is not the latest verification for the latest pact with a given tag,
-    # this is the latest verification for any pact with the tag
-    create_view(:latest_verification_ids_for_consumer_version_tags,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        t.name as consumer_version_tag_name,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join tags t
-        on lpp.consumer_version_id = t.version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id, t.name")
+    create_view(:latest_verification_ids_for_consumer_version_tags, LATEST_VERIFICATION_IDS_FOR_CONSUMER_VERSION_TAGS_V1)
 
     # The most recent verification for each consumer/consumer version tag/provider
     latest_verifications = from(:verifications)

data/db/migrations/20191025_optimise_latest_verification_ids_for_cv_tags.rb

@@ -0,0 +1,11 @@
+require_relative '../ddl_statements'
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_ids_for_consumer_version_tags, LATEST_VERIFICATION_IDS_FOR_CONSUMER_VERSION_TAGS_V2)
+  end
+
+  down do
+    create_or_replace_view(:latest_verification_ids_for_consumer_version_tags, LATEST_VERIFICATION_IDS_FOR_CONSUMER_VERSION_TAGS_V1)
+  end
+end

data/lib/pact_broker/domain/pact.rb

@@ -47,7 +47,7 @@ module PactBroker
       end
 
       def name
-        "Pact between #{consumer.name} (v#{consumer_version_number}) and #{provider.name}"
+        "Pact between #{consumer.name} (#{consumer_version_number}) and #{provider.name}"
       end
 
       def version_and_updated_date

data/lib/pact_broker/domain/verification.rb

@@ -58,12 +58,6 @@ module PactBroker
             .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

data/lib/pact_broker/matrix/quick_row.rb

@@ -204,7 +204,7 @@ module PactBroker
       end
 
       def verification_executed_at
-        verification.execution_date
+        verification&.execution_date
       end
 
       # Add logic for ignoring case

data/lib/pact_broker/matrix/row.rb

@@ -215,7 +215,7 @@ module PactBroker
       end
 
       def to_s
-        "#{consumer_name} v#{consumer_version_number} #{provider_name} #{provider_version_number} #{success}"
+        "#{consumer_name} #{consumer_version_number} #{provider_name} #{provider_version_number} #{success}"
       end
 
       def compare_number_desc number1, number2

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -42,7 +42,7 @@ module PactBroker
 
         get "/provider/:provider_name/consumer/:consumer_name" do
           selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] } ]
-          options = {latestby: nil, limit: 100}
+          options = {latestby: 'cvpv', limit: 100}
           lines = matrix_service.find(selectors, options)
           lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
           locals = {

data/lib/pact_broker/ui/view_models/index_item.rb

@@ -151,11 +151,11 @@ module PactBroker
         def verification_tooltip
           case @relationship.pseudo_branch_verification_status
           when :success
-            "Successfully verified by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)})"
+            "Successfully verified by #{provider_name} (#{short_version_number(@relationship.latest_verification_provider_version_number)})"
           when :stale
-            "Pact has changed since last successful verification by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)})"
+            "Pact has changed since last successful verification by #{provider_name} (#{short_version_number(@relationship.latest_verification_provider_version_number)})"
           when :failed
-            "Verification by #{provider_name} (v#{short_version_number(@relationship.latest_verification_provider_version_number)}) failed"
+            "Verification by #{provider_name} (#{short_version_number(@relationship.latest_verification_provider_version_number)}) failed"
           else
             nil
           end

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -17,7 +17,7 @@ module PactBroker
         end
 
         def provider_name
-          @line[:provider_name]
+          @line.provider_name
         end
 
         def provider_name_url
@@ -25,7 +25,7 @@ module PactBroker
         end
 
         def consumer_name
-          @line[:consumer_name]
+          @line.consumer_name
         end
 
         def consumer_name_url
@@ -33,24 +33,24 @@ module PactBroker
         end
 
         def pact_version_sha
-          @line[:pact_version_sha]
+          @line.pact_version_sha
         end
 
         # verification number, used in verification_url method
         def number
-          @line[:verification_number]
+          @line.verification_number
         end
 
         def pact_revision_number
-          @line[:pact_revision_number]
+          @line.pact_revision_number
         end
 
         def consumer_name
-          @line[:consumer_name]
+          @line.consumer_name
         end
 
         def consumer_version_number
-          @line[:consumer_version_number]
+          @line.consumer_version_number
         end
 
         def display_consumer_version_number
@@ -63,15 +63,15 @@ module PactBroker
         end
 
         def consumer_version_order
-          @line[:consumer_version_order]
+          @line.consumer_version_order
         end
 
         def provider_name
-          @line[:provider_name]
+          @line.provider_name
         end
 
         def provider_version_number
-          @line[:provider_version_number]
+          @line.provider_version_number
         end
 
         def display_provider_version_number
@@ -79,7 +79,7 @@ module PactBroker
         end
 
         def provider_version_order
-          @line[:provider_version_order]
+          @line.provider_version_order
         end
 
         def provider_version_number_url
@@ -88,39 +88,39 @@ module PactBroker
         end
 
         def provider_version_order
-          if @line[:verification_executed_at]
-            @line[:verification_executed_at].to_time.to_i
+          if @line.verification_executed_at
+            @line.verification_executed_at.to_time.to_i
           else
             0
           end
         end
 
         def latest_consumer_version_tags
-          @line[:consumer_version_tags]
-            .select{ | tag | tag[:latest] }
+          @line.consumer_version_tags
+            .select{ | tag | tag.latest }
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def other_consumer_version_tags
-          @line[:consumer_version_tags]
-            .select{ | tag | !tag[:latest] }
+          @line.consumer_version_tags
+            .select{ | tag | !tag.latest }
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def latest_provider_version_tags
-          @line[:provider_version_tags]
-            .select{ | tag | tag[:latest] }
+          @line.provider_version_tags
+            .select{ | tag | tag.latest }
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
         def other_provider_version_tags
-          @line[:provider_version_tags]
-            .select{ | tag | !tag[:latest] }
+          @line.provider_version_tags
+            .select{ | tag | !tag.latest }
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
         def orderable_fields
-          [consumer_name, consumer_version_order, pact_revision_number, provider_name, @line[:verification_id]]
+          [consumer_name, consumer_version_order, pact_revision_number, provider_name, @line.verification_id]
         end
 
         def <=> other
@@ -128,12 +128,12 @@ module PactBroker
         end
 
         def pseudo_branch_verification_status
-          if @line[:verification_executed_at]
-            DateHelper.distance_of_time_in_words(@line[:verification_executed_at], DateTime.now) + " ago"
+          if @line.verification_executed_at
+            DateHelper.distance_of_time_in_words(@line.verification_executed_at, DateTime.now) + " ago"
           else
             ''
           end
-          # case @line[:success]
+          # case @line.success
           #   when true then "Verified"
           #   when false then "Failed"
           #   else ''
@@ -145,7 +145,7 @@ module PactBroker
         end
 
         def pact_publication_date
-          relative_date(@line[:pact_created_at])
+          relative_date(@line.pact_created_at)
         end
 
         def pact_publication_date_url
@@ -157,11 +157,11 @@ module PactBroker
         end
 
         def pact_published_order
-          @line[:pact_created_at].to_time.to_i
+          @line.pact_created_at.to_time.to_i
         end
 
         def verification_status_class
-          case @line[:success]
+          case @line.success
             when true then 'success'
             when false then 'danger'
             else ''
@@ -177,7 +177,7 @@ module PactBroker
         end
 
         def inherited_verification_message
-          if @line[:verification_executed_at] && @line[:pact_created_at] > @line[:verification_executed_at]
+          if @line.verification_executed_at && @line.pact_created_at > @line.verification_executed_at
             "The verification date is before the pact publication date because this verification has been inherited from a previously verified pact with identical content."
           end
         end

data/lib/pact_broker/verifications/repository.rb

@@ -101,19 +101,27 @@ module PactBroker
       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

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.39.0'
+  VERSION = '2.40.0'
 end

data/spec/lib/pact_broker/pacts/diff_spec.rb

@@ -59,8 +59,8 @@ module PactBroker
           subject { Diff.new.process(pact_params.merge(base_url: 'http://example.org'), comparison_pact_params) }
 
           it "compares the two pacts" do
-            expect(subject).to include "Pact between Consumer (v3) and Provider"
-            expect(subject).to include "Pact between Consumer (v4) and Provider"
+            expect(subject).to include "Pact between Consumer (3) and Provider"
+            expect(subject).to include "Pact between Consumer (4) and Provider"
           end
 
           it "includes a link to the comparison pact", pending: true do

data/spec/lib/pact_broker/ui/view_models/index_item_spec.rb

@@ -52,21 +52,21 @@ module PactBroker
             let(:pseudo_branch_verification_status) { :stale }
             its(:pseudo_branch_verification_status) { is_expected.to eq "warning" }
             its(:warning?) { is_expected.to be true }
-            its(:verification_tooltip) { is_expected.to eq "Pact has changed since last successful verification by Foo (v4.5.6)" }
+            its(:verification_tooltip) { is_expected.to eq "Pact has changed since last successful verification by Foo (4.5.6)" }
           end
 
           context "when the pact has not changed since the last successful verification" do
             let(:pseudo_branch_verification_status) { :success }
             its(:pseudo_branch_verification_status) { is_expected.to eq "success" }
             its(:warning?) { is_expected.to be false }
-            its(:verification_tooltip) { is_expected.to eq "Successfully verified by Foo (v4.5.6)" }
+            its(:verification_tooltip) { is_expected.to eq "Successfully verified by Foo (4.5.6)" }
           end
 
           context "when the pact verification failed" do
             let(:pseudo_branch_verification_status) { :failed }
             its(:pseudo_branch_verification_status) { is_expected.to eq "danger" }
             its(:warning?) { is_expected.to be false }
-            its(:verification_tooltip) { is_expected.to eq "Verification by Foo (v4.5.6) failed" }
+            its(:verification_tooltip) { is_expected.to eq "Verification by Foo (4.5.6) failed" }
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.39.0
+  version: 2.40.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -610,6 +610,7 @@ files:
 - db/ddl_statements.rb
 - db/ddl_statements/head_matrix_v001.rb
 - db/ddl_statements/head_matrix_v002.rb
+- db/ddl_statements/latest_verification_ids_for_consumer_version_tags.rb
 - db/ddl_statements/latest_verification_ids_for_pact_versions_v001.rb
 - db/migrations/000001_create_pacticipant_table.rb
 - db/migrations/000002_create_versions_table.rb
@@ -717,6 +718,7 @@ files:
 - db/migrations/20190909_add_test_results_to_all_verifications.rb
 - db/migrations/20190910_add_test_results_to_latest_verifications.rb
 - db/migrations/20190911_add_test_results_to_latest_verifications_for_pact_versions.rb
+- db/migrations/20191025_optimise_latest_verification_ids_for_cv_tags.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals