pact_broker 2.51.0 → 2.52.0

data/lib/pact_broker/matrix/repository.rb

@@ -124,19 +124,9 @@ module PactBroker
       end
 
       def query_matrix selectors, options
-        query = base_model(options)
-                  .select_all_columns
+        query = base_model(options).select_all_columns
                   .matching_selectors(selectors)
-
-        # These two could both probably use the order by last action date,
-        # but I just want to give the implications a little more thought before changing
-        # the can-i-deploy query order.
-        if selectors.all?(&:only_pacticipant_name_specified?)
-          # Can only be the UI, as can-i-deploy requires a version to be specified
-          query = query.order_by_last_action_date
-        else
-          query = query.order_by_names_ascending_most_recent_first
-        end
+                  .order_by_last_action_date
 
         query = query.limit(options[:limit]) if options[:limit]
         query.eager_all_the_things.all

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -80,7 +80,7 @@ module PactBroker
       end
 
       def only_pacticipant_name_specified?
-        pacticipant_name && !tag && !latest?
+        pacticipant_name && !tag && !latest? && !pacticipant_version_number
       end
 
       def latest_tagged?

data/lib/pact_broker/matrix/service.rb

@@ -13,7 +13,7 @@ module PactBroker
       def find selectors, options = {}
         query_results = matrix_repository.find selectors, options
         deployment_status_summary = DeploymentStatusSummary.new(query_results.rows, query_results.resolved_selectors, query_results.integrations)
-        QueryResultsWithDeploymentStatusSummary.new(query_results.rows, query_results.selectors, query_results.options, query_results.resolved_selectors, query_results.integrations, deployment_status_summary)
+        QueryResultsWithDeploymentStatusSummary.new(query_results, deployment_status_summary)
       end
 
       def find_for_consumer_and_provider params, options = {}

data/lib/pact_broker/pacts/pact_publication.rb

@@ -82,6 +82,14 @@ module PactBroker
         def order_by_consumer_version_order
           order_append(Sequel[:cv][:order])
         end
+
+        def where_consumer_if_set(consumer)
+          if consumer
+            where(consumer: consumer)
+          else
+            self
+          end
+        end
       end
 
       def before_create

data/lib/pact_broker/pacts/repository.rb

@@ -79,7 +79,8 @@ module PactBroker
           provider_id: pact_publication.provider_id,
           pact_publication_id: pact_publication.id,
           consumer_id: pact_publication.consumer_id,
-          pact_version_id: pact_publication.pact_version_id
+          pact_version_id: pact_publication.pact_version_id,
+          created_at: pact_publication.consumer_version.created_at
         }
 
         LatestPactPublicationIdForConsumerVersion.new(params).upsert
@@ -130,8 +131,9 @@ module PactBroker
         end
       end
 
-      def find_all_pact_versions_for_provider_with_consumer_version_tags provider_name, consumer_version_tag_names
+      def find_all_pact_versions_for_provider_with_consumer_version_tags provider_name, selector
         provider = pacticipant_repository.find_by_name(provider_name)
+        consumer = selector.consumer ? pacticipant_repository.find_by_name(selector.consumer) : nil
 
         PactPublication
           .select_all_qualified
@@ -139,8 +141,9 @@ module PactBroker
           .select_append(Sequel[:ct][:name].as(:consumer_version_tag_name))
           .remove_overridden_revisions
           .join_consumer_versions(:cv)
-          .join_consumer_version_tags_with_names(consumer_version_tag_names)
+          .join_consumer_version_tags_with_names(selector.tag)
           .where(provider: provider)
+          .where_consumer_if_set(consumer)
           .eager(:consumer)
           .eager(:consumer_version)
           .eager(:provider)
@@ -149,10 +152,8 @@ module PactBroker
           .group_by(&:pact_version_id)
           .values
           .collect do | pact_publications |
-            selector_tag_names = pact_publications.collect{ | p| p.values.fetch(:consumer_version_tag_name) }
             latest_pact_publication = pact_publications.sort_by{ |p| p.values.fetch(:consumer_version_order) }.last
-            selectors = Selectors.create_for_all_of_each_tag(selector_tag_names)
-            SelectedPact.new(latest_pact_publication.to_domain, selectors)
+            SelectedPact.new(latest_pact_publication.to_domain, Selectors.new(selector))
           end
       end
 
@@ -457,12 +458,10 @@ module PactBroker
 
       def find_pacts_for_which_all_versions_for_the_tag_are_required(provider_name, consumer_version_selectors)
         # The tags for which all versions are specified
-        tag_names = consumer_version_selectors.tag_names_of_selectors_for_all_pacts
+        selectors = consumer_version_selectors.select(&:all_for_tag?)
 
-        if tag_names.any?
-          find_all_pact_versions_for_provider_with_consumer_version_tags(provider_name, tag_names)
-        else
-          []
+        selectors.flat_map do | selector |
+          find_all_pact_versions_for_provider_with_consumer_version_tags(provider_name, selector)
         end
       end
 

data/lib/pact_broker/pacts/selector.rb

@@ -25,6 +25,14 @@ module PactBroker
         self[:fallback_tag]
       end
 
+      def consumer= consumer
+        self[:consumer] = consumer
+      end
+
+      def consumer
+        self[:consumer]
+      end
+
       def self.overall_latest
         Selector.new(latest: true)
       end
@@ -41,6 +49,9 @@ module PactBroker
         Selector.new(tag: tag)
       end
 
+      def self.all_for_tag_and_consumer(tag, consumer)
+        Selector.new(tag: tag, consumer: consumer)
+      end
 
       def self.from_hash hash
         Selector.new(hash)
@@ -67,6 +78,10 @@ module PactBroker
         end
       end
 
+      def all_for_tag_and_consumer?
+        !!(tag && !latest? && consumer)
+      end
+
       def all_for_tag?
         !!(tag && !latest?)
       end
@@ -84,6 +99,12 @@ module PactBroker
           else
             latest_for_tag? ? -1 : 1
           end
+        elsif consumer || other.consumer
+          if consumer == other.consumer
+            tag <=> other.tag
+          else
+            consumer ? -1 : 1
+          end
         else
           tag <=> other.tag
         end

data/lib/pact_broker/pacts/verifiable_pact_messages.rb

@@ -138,7 +138,9 @@ module PactBroker
           else
             "latest pact for a consumer version tagged '#{selector.tag}'"
           end
-        elsif selector.tag
+        elsif selector.all_for_tag_and_consumer?
+          "pacts for all #{selector.consumer} versions tagged '#{selector.tag}'"
+        elsif selector.all_for_tag?
           "pacts for all consumer versions tagged '#{selector.tag}'"
         else
           selector.to_json
@@ -159,6 +161,8 @@ module PactBroker
           else
             "latest #{selector.tag}"
           end
+        elsif selector.all_for_tag_and_consumer?
+          "one of #{selector.consumer} #{selector.tag}"
         elsif selector.tag
           "one of #{selector.tag}"
         else

data/lib/pact_broker/test/test_data_builder.rb

@@ -213,6 +213,7 @@ module PactBroker
         )
         set_created_at_if_set(params[:created_at], :pact_publications, id: @pact.id)
         set_created_at_if_set(params[:created_at], :pact_versions, sha: @pact.pact_version_sha)
+        set_created_at_if_set(params[:created_at], :latest_pact_publication_ids_for_consumer_versions, consumer_version_id: @consumer_version.id)
         @pact = PactBroker::Pacts::PactPublication.find(id: @pact.id).to_domain
         self
       end
@@ -322,6 +323,7 @@ module PactBroker
 
         set_created_at_if_set(parameters[:created_at], :verifications, id: @verification.id)
         set_created_at_if_set(parameters[:created_at], :versions, id: @provider_version.id)
+        set_created_at_if_set(parameters[:created_at], :latest_verification_id_for_pact_version_and_provider_version, pact_version_id: pact_version_id, provider_version_id: @provider_version.id)
 
         if tag_names.any?
           tag_names.each do | tag_name |
@@ -406,6 +408,10 @@ module PactBroker
 
       private
 
+      def pact_version_id
+        PactBroker::Pacts::PactPublication.find(id: @pact.id).pact_version_id
+      end
+
       # Remember! This must be called before adding the IDs
       def generate_pact_version_sha json_content
         PactBroker.configuration.sha_generator.call(json_content)

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

@@ -50,6 +50,14 @@ module PactBroker
           @line.pact_revision_number
         end
 
+        def consumer_version_id
+          @line.consumer_version_id
+        end
+
+        def provider_version_id
+          @line.provider_version_id
+        end
+
         def consumer_version_number
           @line.consumer_version_number
         end

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -99,10 +99,10 @@
       %tbody
       - lines.each do | line |
         %tr
-          %td.consumer{'data-sort-value' => line.consumer_name}
+          %td.consumer{'data-sort-value' => line.consumer_name, 'data-consumer-name' => line.consumer_name}
             %a{href: line.consumer_name_url}
               = line.consumer_name
-          %td.consumer-version{'data-sort-value' => line.consumer_version_order}
+          %td.consumer-version{'data-sort-value' => line.consumer_version_order, 'data-consumer-version-id' => line.consumer_version_id}
             %div.clippable
               %a{href: line.consumer_version_number_url}
                 = line.display_consumer_version_number
@@ -126,10 +126,10 @@
               - else
                 = line.pact_publication_date
 
-          %td.provider{'data-sort-value' => line.provider_name}
+          %td.provider{'data-sort-value' => line.provider_name, 'data-provider-name' => line.provider_name }
             %a{href: line.provider_name_url}
               = line.provider_name
-          %td.provider-version{'data-sort-value' => line.provider_version_order}
+          %td.provider-version{'data-sort-value' => line.provider_version_order, 'data-provider-version-id' => line.provider_version_id }
             %div.clippable
               %a{href: line.provider_version_number_url}
                 = line.display_provider_version_number

data/lib/pact_broker/verifications/repository.rb

@@ -43,7 +43,8 @@ module PactBroker
           provider_version_id: verification.provider_version_id,
           provider_id: verification.provider_version.pacticipant_id,
           verification_id: verification.id,
-          consumer_id: verification.consumer_id
+          consumer_id: verification.consumer_id,
+          created_at: verification.created_at
         }
         LatestVerificationIdForPactVersionAndProviderVersion.new(params).upsert
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.51.0'
+  VERSION = '2.52.0'
 end

data/lib/rack/pact_broker/request_target.rb

@@ -6,7 +6,7 @@ module Rack
       extend self
 
       WEB_ASSET_EXTENSIONS = %w[.js .woff .woff2 .css .png .html .map .ttf .ico].freeze
-      API_CONTENT_TYPES = %w[application/hal+json application/json text/csv application/yaml].freeze
+      API_CONTENT_TYPES = %w[application/hal+json application/json text/csv application/yaml text/plain].freeze
 
       def request_for_ui?(env)
         !(request_for_api?(env))

data/pact_broker.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |gem|
 
   #gem.add_runtime_dependency 'pact'
   gem.add_runtime_dependency 'httparty', '~> 0.14'
-  gem.add_runtime_dependency 'json', '> 1.8', '< 3.0'
+  gem.add_runtime_dependency 'json', '~> 2.3'
   gem.add_runtime_dependency 'roar', '~> 1.1'
   gem.add_runtime_dependency 'reform', '~> 2.2'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'

data/public/javascripts/matrix.js

@@ -53,12 +53,12 @@ function disableFieldsThatShouldNotBeSubmitted() {
   $('.version-selectorizor').prop('disabled', 'disabled');
 }
 
-function highlightPactPublicationsWithSameContent(td) {
-  const pactVersionSha = $(td).data('pact-version-sha');
-  $('*[data-pact-version-sha="' + pactVersionSha +'"]').addClass('bg-info');
+function highlightPactPublicationsWithSameData(td, field) {
+  const value = $(td).data(field);
+  $('*[data-' + field + '="' + value +'"]').addClass('bg-info');
 }
 
-function unHighlightPactPublicationsWithSameContent(td, event) {
+function unHighlightPactPublicationsWithSameData(td, event, field) {
   var destinationElement = $(event.toElement || event.relatedTarget);
   // Have to use mouseout instead of mouseleave, because the tooltip is a child
   // of the td, and the mouseleave will consider that hovering over the tooltip
@@ -68,8 +68,8 @@ function unHighlightPactPublicationsWithSameContent(td, event) {
   // The tooltip needs to be a child of the td so that we can style the one showing
   // the SHA so that it's wide enough to fit the SHA in.
   if (!$(td).find('a').is(destinationElement)) {
-    const pactVersionSha = $(td).data('pact-version-sha');
-    $('*[data-pact-version-sha="' + pactVersionSha +'"]').removeClass('bg-info');
+    const value = $(td).data(field);
+    $('*[data-' + field + '="' + value +'"]').removeClass('bg-info');
   }
 }
 
@@ -90,6 +90,18 @@ $(document).ready(function(){
 
   initializeClipper('.clippable');
 
-  $('td.pact-published').mouseover(function(event) { highlightPactPublicationsWithSameContent(this) });
-  $('td.pact-published').mouseout(function(event) { unHighlightPactPublicationsWithSameContent(this, event)});
+  $('td.consumer').mouseover(function(event) { highlightPactPublicationsWithSameData(this, 'consumer-name') });
+  $('td.consumer').mouseout(function(event) { unHighlightPactPublicationsWithSameData(this, event, 'consumer-name') });
+
+  $('td.consumer-version').mouseover(function(event) { highlightPactPublicationsWithSameData(this, 'consumer-version-id') });
+  $('td.consumer-version').mouseout(function(event) { unHighlightPactPublicationsWithSameData(this, event, 'consumer-version-id') });
+
+  $('td.pact-published').mouseover(function(event) { highlightPactPublicationsWithSameData(this, 'pact-version-sha') });
+  $('td.pact-published').mouseout(function(event) { unHighlightPactPublicationsWithSameData(this, event, 'pact-version-sha') });
+
+  $('td.provider').mouseover(function(event) { highlightPactPublicationsWithSameData(this, 'provider-name') });
+  $('td.provider').mouseout(function(event) { unHighlightPactPublicationsWithSameData(this, event, 'provider-name') });
+
+  $('td.provider-version').mouseover(function(event) { highlightPactPublicationsWithSameData(this, 'provider-version-id') });
+  $('td.provider-version').mouseout(function(event) { unHighlightPactPublicationsWithSameData(this, event, 'provider-version-id') });
 });

data/script/docker/db-restore.sh

@@ -2,4 +2,4 @@
 
 : "${1:?Please specify file to restore}"
 
-docker exec -it pact-broker-postgres pg_restore -h localhost -U postgres -d postgres /data/$1
+docker exec -it pact-broker-postgres pg_restore -h localhost -U postgres -d postgres --clean --if-exists /data/$1

data/spec/lib/pact_broker/api/contracts/verifiable_pacts_json_query_schema_spec.rb

@@ -43,7 +43,7 @@ module PactBroker
             end
           end
 
-          context "when latest is not specified", pending: true do
+          context "when latest is not specified" do
             let(:consumer_version_selectors) do
               [{
                 tag: "feat-x",
@@ -52,7 +52,21 @@ module PactBroker
             end
 
             it "has an error" do
-              expect(subject[:consumerVersionSelectors].first).to include "not allowed"
+              expect(subject[:consumerVersionSelectors].first).to match /can only be set.*index 0/
+            end
+
+            context "when there are multiple errors" do
+              let(:consumer_version_selectors) do
+                [{
+                  consumer: "",
+                  tag: "feat-x",
+                  fallbackTag: "master"
+                }]
+              end
+
+              it "merges the array" do
+                expect(subject[:consumerVersionSelectors].size).to be 2
+              end
             end
           end
         end
@@ -113,6 +127,33 @@ module PactBroker
             it { is_expected.to_not have_key(:includeWipPactsSince) }
           end
         end
+
+        context "when a blank consumer name is specified" do
+          let(:consumer_version_selectors) do
+            [{
+              tag: "feat-x",
+              consumer: ""
+            }]
+          end
+
+          it "has an error" do
+            expect(subject[:consumerVersionSelectors].first).to include "blank"
+          end
+        end
+
+        context "when a consumer name is specified with a latest tag" do
+          let(:consumer_version_selectors) do
+            [{
+              latest: true,
+              tag: "feat-x",
+              consumer: "foo"
+            }]
+          end
+
+          it "has an error" do
+            expect(subject[:consumerVersionSelectors].first).to include "not yet supported"
+          end
+        end
       end
     end
   end

data/spec/lib/pact_broker/api/contracts/verifiable_pacts_query_schema_spec.rb

@@ -78,6 +78,19 @@ module PactBroker
             it { is_expected.to_not have_key(:include_wip_pacts_since) }
           end
         end
+
+        context "when a blank consumer name is specified" do
+          let(:consumer_version_selectors) do
+            [{
+              tag: "feat-x",
+              consumer: ""
+            }]
+          end
+
+          it "has an error" do
+            expect(subject[:consumer_version_selectors].first).to include "blank"
+          end
+        end
       end
     end
   end

data/spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb

@@ -135,7 +135,16 @@ module PactBroker
             ]
           end
 
-          let(:query_results){ PactBroker::Matrix::QueryResultsWithDeploymentStatusSummary.new([row_1, row_2], selectors, options, resolved_selectors, integrations, deployment_status_summary)}
+          let(:query_results) do
+            double('QueryResults',
+              rows: [row_1, row_2],
+              selectors: selectors,
+              options: options,
+              resolved_selectors: resolved_selectors,
+              integrations: integrations
+            )
+          end
+          let(:query_results_with_deployment_status_summary){ PactBroker::Matrix::QueryResultsWithDeploymentStatusSummary.new(query_results, deployment_status_summary)}
           let(:selectors) { nil }
           let(:integrations){ [] }
           let(:options) { nil }
@@ -145,7 +154,7 @@ module PactBroker
             instance_double('PactBroker::Matrix::DeploymentStatusSummary', reasons: ['foo', 'bar'], deployable?: deployable, counts: counts)
           end
           let(:deployable) { true }
-          let(:json) { MatrixDecorator.new(query_results).to_json(user_options: { base_url: 'http://example.org' }) }
+          let(:json) { MatrixDecorator.new(query_results_with_deployment_status_summary).to_json(user_options: { base_url: 'http://example.org' }) }
           let(:parsed_json) { JSON.parse(json, symbolize_names: true) }
 
           it "includes the consumer details" do