pact_broker 2.35.0 → 2.36.0

data/lib/pact_broker/matrix/repository.rb

@@ -103,6 +103,7 @@ module PactBroker
         specified_pacticipant_names.include?(consumer_name)
       end
 
+      # It would be nicer to do this in the SQL, but it requires time that I don't have at the moment
       def apply_latestby options, selectors, lines
         return lines unless options[:latestby]
         group_by_columns = case options[:latestby]
@@ -119,6 +120,7 @@ module PactBroker
           .flatten
       end
 
+      # It would be nicer to do this in the SQL, but it requires time that I don't have at the moment
       def remove_overwritten_revisions lines
         latest_revisions_keys = {}
         latest_revisions = []
@@ -143,7 +145,7 @@ module PactBroker
       end
 
       def resolve_selectors(specified_selectors, options)
-        resolved_specified_selectors = resolve_versions_and_add_ids(specified_selectors, :specified)
+        resolved_specified_selectors = resolve_versions_and_add_ids(specified_selectors, :specified, options[:latestby])
         if options[:latest] || options[:tag]
           add_inferred_selectors(resolved_specified_selectors, options)
         else
@@ -152,19 +154,19 @@ module PactBroker
       end
 
       # Find the version number for selectors with the latest and/or tag specified
-      def resolve_versions_and_add_ids(selectors, selector_type)
+      def resolve_versions_and_add_ids(selectors, selector_type, latestby)
         selectors.collect do | selector |
           pacticipant = PactBroker::Domain::Pacticipant.find(name: selector[:pacticipant_name])
           versions = find_versions_for_selector(selector)
-          build_selectors_for_pacticipant_and_versions(pacticipant, versions, selector, selector_type)
+          build_selectors_for_pacticipant_and_versions(pacticipant, versions, selector, selector_type, latestby)
         end.flatten
       end
 
-      def build_selectors_for_pacticipant_and_versions(pacticipant, versions, original_selector, selector_type)
+      def build_selectors_for_pacticipant_and_versions(pacticipant, versions, original_selector, selector_type, latestby)
         if versions
           versions.collect do | version |
             if version
-              selector_for_version(pacticipant, version, original_selector, selector_type)
+              selector_for_version(pacticipant, version, original_selector, selector_type, latestby)
             else
               selector_for_non_existing_version(pacticipant, original_selector, selector_type)
             end
@@ -192,23 +194,6 @@ module PactBroker
         end
       end
 
-      def add_ids_to_selector(selector)
-        if selector[:pacticipant_name]
-          pacticipant = PactBroker::Domain::Pacticipant.find(name: selector[:pacticipant_name])
-          selector[:pacticipant_id] = pacticipant ? pacticipant.id : nil
-        end
-
-        if selector[:pacticipant_name] && selector[:pacticipant_version_number] && !selector[:pacticipant_version_id]
-          version = version_repository.find_by_pacticipant_name_and_number(selector[:pacticipant_name], selector[:pacticipant_version_number])
-          selector[:pacticipant_version_id] = version ? version.id : nil
-        end
-
-        if !selector.key?(:pacticipant_version_id)
-           selector[:pacticipant_version_id] = nil
-        end
-        selector
-      end
-
       # When only one selector is specified, (eg. checking to see if Foo version 2 can be deployed to prod),
       # need to look up all integrated pacticipants, and determine their relevant (eg. latest prod) versions
       def add_inferred_selectors(resolved_specified_selectors, options)
@@ -228,7 +213,7 @@ module PactBroker
           selector[:latest] = options[:latest] if options[:latest]
           selector
         end
-        resolve_versions_and_add_ids(selectors, :inferred)
+        resolve_versions_and_add_ids(selectors, :inferred, options[:latestby])
       end
 
       def all_pacticipant_names_in_specified_matrix(selectors)
@@ -242,8 +227,27 @@ module PactBroker
         ResolvedSelector.for_pacticipant_and_non_existing_version(pacticipant, original_selector, selector_type)
       end
 
-      def selector_for_version(pacticipant, version, original_selector, selector_type)
-        ResolvedSelector.for_pacticipant_and_version(pacticipant, version, original_selector, selector_type)
+      def selector_for_version(pacticipant, version, original_selector, selector_type, latestby)
+        pact_publication_ids, verification_ids = nil, nil
+
+        # Querying for the "pre-filtered" pact publications and verifications directly, rather than just using the consumer
+        # and provider versions allows us to remove the "overwritten" pact revisions and verifications from the
+        # matrix result set, making the final matrix query more efficient and stopping the query limit from
+        # removing relevant data (eg. https://github.com/pact-foundation/pact_broker-client/issues/53)
+        if latestby
+          pact_publication_ids = PactBroker::Pacts::LatestPactPublicationsByConsumerVersion
+                                            .select(:id)
+                                            .where(consumer_version_id: version.id)
+                                            .collect{ |pact_publication| pact_publication[:id] }
+
+          verification_ids = PactBroker::Verifications::LatestVerificationIdForPactVersionAndProviderVersion
+                                .select(:verification_id)
+                                .distinct
+                                .where(provider_version_id: version.id)
+                                .collect{ |pact_publication| pact_publication[:verification_id] }
+        end
+
+        ResolvedSelector.for_pacticipant_and_version(pacticipant, version, pact_publication_ids, verification_ids, original_selector, selector_type)
       end
 
       def selector_without_version(pacticipant, selector_type)

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -23,11 +23,13 @@ module PactBroker
         )
       end
 
-      def self.for_pacticipant_and_version(pacticipant, version, original_selector, type)
+      def self.for_pacticipant_and_version(pacticipant, version, pact_publication_ids = [], verification_ids = [], original_selector, type)
         ResolvedSelector.new(
           pacticipant_id: pacticipant.id,
           pacticipant_name: pacticipant.name,
           pacticipant_version_id: version.id,
+          pact_publication_ids: pact_publication_ids,
+          verification_ids: verification_ids,
           pacticipant_version_number: version.number,
           latest: original_selector[:latest],
           tag: original_selector[:tag],

data/lib/pact_broker/matrix/row.rb

@@ -67,7 +67,9 @@ module PactBroker
           end
 
           def self.consumer_and_maybe_consumer_version_match_selector(s)
-            if s[:pacticipant_version_id]
+            if s[:pact_publication_ids]
+              Sequel.&(pact_publication_id: s[:pact_publication_ids])
+            elsif s[:pacticipant_version_id]
               Sequel.&(consumer_id: s[:pacticipant_id], consumer_version_id: s[:pacticipant_version_id])
             else
               Sequel.&(consumer_id: s[:pacticipant_id])
@@ -75,7 +77,9 @@ module PactBroker
           end
 
           def self.provider_and_maybe_provider_version_match_selector(s)
-            if s[:pacticipant_version_id]
+            if s[:verification_ids]
+              Sequel.&(verification_id: s[:verification_ids])
+            elsif s[:pacticipant_version_id]
               Sequel.&(provider_id: s[:pacticipant_id], provider_version_id: s[:pacticipant_version_id])
             else
               Sequel.&(provider_id: s[:pacticipant_id])

data/lib/pact_broker/metrics/service.rb

@@ -0,0 +1,56 @@
+require 'pact_broker/pacts/pact_publication'
+require 'pact_broker/pacts/pact_version'
+require 'pact_broker/domain/pacticipant'
+require 'pact_broker/integrations/integration'
+require 'pact_broker/domain/verification'
+require 'pact_broker/domain/version'
+require 'pact_broker/api/decorators/format_date_time'
+require 'pact_broker/webhooks/webhook'
+require 'pact_broker/webhooks/triggered_webhook'
+require 'pact_broker/webhooks/execution'
+
+module PactBroker
+  module Metrics
+    module Service
+      include PactBroker::Api::Decorators::FormatDateTime
+
+      extend self
+
+      def metrics
+        {
+          pacticipants: {
+            count: PactBroker::Domain::Pacticipant.count
+          },
+          integrations: {
+            count: PactBroker::Integrations::Integration.count
+          },
+          pactPublications: {
+            count: PactBroker::Pacts::PactPublication.count,
+            first: format_date_time(PactBroker::Pacts::PactPublication.order(:id).first&.created_at),
+            last: format_date_time(PactBroker::Pacts::PactPublication.order(:id).last&.created_at)
+          },
+          pactVersions: {
+            count: PactBroker::Pacts::PactVersion.count
+          },
+          verificationResults: {
+            count: PactBroker::Domain::Verification.count,
+            first: format_date_time(PactBroker::Domain::Verification.order(:id).first.created_at),
+            last: format_date_time(PactBroker::Domain::Verification.order(:id).last.created_at)
+          },
+          pacticipantVersions: {
+            count: PactBroker::Domain::Version.count
+          },
+          webhooks: {
+            count: PactBroker::Webhooks::Webhook.count
+          },
+          triggeredWebhooks: {
+            count: PactBroker::Webhooks::TriggeredWebhook.count
+          },
+          webhookExecutions: {
+            count: PactBroker::Webhooks::Execution.count
+          }
+        }
+      end
+    end
+  end
+end

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -101,7 +101,14 @@ module PactBroker
           consumer_version_number: consumer_version_number,
           revision_number: revision_number,
           pact_version_sha: pact_version_sha,
-          created_at: created_at)
+          created_at: created_at,
+          head_tag_names: head_tag_names)
+      end
+
+      def head_tag_names
+        # Avoid circular dependency
+        require 'pact_broker/pacts/latest_tagged_pact_publications'
+        LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
       end
 
       def to_domain_with_content

data/lib/pact_broker/pacts/pact_publication.rb

@@ -31,10 +31,16 @@ module PactBroker
         self.revision_number ||= 1
       end
 
-      def latest_tag_names
+      # The names of the tags for which this pact is the latest pact with that tag
+      # (ie. it is not necessarily the pact for the latest consumer version with the given tag)
+      def head_tag_names
         LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
       end
 
+      def consumer_version_tags
+        consumer_version.tags
+      end
+
       def latest_verification
         pact_version.latest_verification
       end
@@ -50,7 +56,8 @@ module PactBroker
           json_content: pact_version.content,
           pact_version_sha: pact_version.sha,
           latest_verification: latest_verification,
-          created_at: created_at
+          created_at: created_at,
+          head_tag_names: head_tag_names
           )
       end
 

data/lib/pact_broker/services.rb

@@ -71,5 +71,10 @@ module PactBroker
       require 'pact_broker/webhooks/trigger_service'
       Webhooks::TriggerService
     end
+
+    def metrics_service
+      require 'pact_broker/metrics/service'
+      Metrics::Service
+    end
   end
 end

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -41,7 +41,7 @@
             %td.consumer-version-number
               %div.clippable
                 = escape_html(index_item.consumer_version_number)
-                %button.clippy.hidden{ title: "Copy to clipboard" }
+                %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.glyphicon.glyphicon-copy
               - if index_item.latest?
                 .tag.label.label-success
@@ -60,7 +60,7 @@
             %td.provider-version-number
               %div.clippable
                 = escape_html(index_item.provider_version_number)
-                %button.clippy.hidden{ title: "Copy to clipboard" }
+                %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.glyphicon.glyphicon-copy
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.label.label-primary

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

@@ -106,7 +106,7 @@
             %div.clippable
               %a{href: line.consumer_version_number_url}
                 = line.display_consumer_version_number
-              %button.clippy.hidden{ title: "Copy to clipboard" }
+              %button.clippy.invisible{ title: "Copy to clipboard" }
                 %span.glyphicon.glyphicon-copy
             - line.latest_consumer_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
@@ -132,7 +132,7 @@
             %div.clippable
               %a{href: line.provider_version_number_url}
                 = line.display_provider_version_number
-              %button.clippy.hidden{ title: "Copy to clipboard" }
+              %button.clippy.invisible{ title: "Copy to clipboard" }
                 %span.glyphicon.glyphicon-copy
             - line.latest_provider_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}

data/lib/pact_broker/verifications/repository.rb

@@ -54,6 +54,10 @@ module PactBroker
           .verification_number(verification_number).single_record
       end
 
+      def find_latest_for_pact(pact)
+        PactBroker::Pacts::PactPublication.where(id: pact.id).single_record.latest_verification
+      end
+
       def search_for_latest consumer_name, provider_name
         query = LatestVerificationForPactVersion
                   .select_all_qualified

data/lib/pact_broker/verifications/service.rb

@@ -49,6 +49,10 @@ module PactBroker
         verification_repository.find(params.fetch(:consumer_name), params.fetch(:provider_name), params.fetch(:pact_version_sha), params.fetch(:verification_number))
       end
 
+      def find_latest_for_pact(pact)
+        verification_repository.find_latest_for_pact(pact)
+      end
+
       def find_by_id id
         PactBroker::Domain::Verification.find(id: id)
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.35.0'
+  VERSION = '2.36.0'
 end

data/public/javascripts/clipboard.js

@@ -4,7 +4,7 @@
  * @example in Haml
  *     %div.clippable
  *       = Text to be copied
- *       %button.clippy.hidden{ title: "Copy to clipboard" }
+ *       %button.clippy.invisible{ title: "Copy to clipboard" }
  *         %span.glyphicon.glyphicon-copy
  */
 
@@ -17,7 +17,7 @@ function initializeClipper(selector) {
   const elements = $(selector);
 
   elements.hover(function() {
-    $(this).children(".clippy").toggleClass("hidden");
+    $(this).children(".clippy").toggleClass("invisible");
   });
 
   elements

data/spec/features/get_latest_verification_for_pact_spec.rb

@@ -0,0 +1,42 @@
+require 'spec/support/test_data_builder'
+
+describe "Get latest verification for pact" do
+  before do
+    td
+      .create_consumer("Consumer")
+      .create_consumer_version("1.2.3")
+      .create_provider("Another provider")
+      .create_pact
+      .create_verification(number: 1, provider_version: "5")
+      .create_provider("Provider")
+      .create_pact
+      .create_verification(number: 1, provider_version: "3")
+      .create_verification(number: 2, provider_version: "4")
+  end
+
+  let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+  let(:content_type) { "application/vnd.pactbrokerextended.v1+json" }
+
+  subject { get(path, nil, "HTTP_ACCEPT" => content_type) }
+
+  context "by pact version" do
+    let!(:path) { "/pacts/provider/Provider/consumer/Consumer/pact-version/#{td.pact.pact_version_sha}/verification-results/latest" }
+
+    it "returns a 200 OK" do
+      expect(subject.status).to eq 200
+      expect(subject.headers['Content-Type']).to include content_type
+    end
+
+    it "returns the verification" do
+      expect(last_response_body[:providerApplicationVersion]).to eq "4"
+    end
+  end
+
+  context "by consumer version" do
+    let(:path) { "/pacts/provider/Provider/consumer/Consumer/version/1.2.3/verification-results/latest" }
+
+    it "returns the verification" do
+      expect(last_response_body[:providerApplicationVersion]).to eq "4"
+    end
+  end
+end

data/spec/features/get_pact_versions_spec.rb

@@ -1,14 +1,12 @@
 require 'spec/support/test_data_builder'
 
 describe "Get pact versions" do
-
   let(:path) { "/pacts/provider/Provider/consumer/Consumer/versions" }
   let(:last_response_body) { JSON.parse(subject.body, symbolize_names: true) }
 
   subject { get path; last_response }
 
   context "when the pacts exist" do
-
     before do
       TestDataBuilder.new
         .create_provider("Provider")
@@ -26,14 +24,11 @@ describe "Get pact versions" do
     it "returns a list of links to the pacts" do
       expect(last_response_body[:_links][:"pact-versions"].size).to eq 2
     end
-
   end
 
   context "when the pacts do not exist" do
-
     it "returns a 404 response" do
       expect(subject).to be_a_404_response
     end
-
   end
 end

data/spec/features/metrics_spec.rb

@@ -0,0 +1,23 @@
+describe "get metrics" do
+  let(:path) { "/metrics"}
+  let(:json_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get(path)  }
+
+  before do
+    TestDataBuilder.new
+      .create_consumer("Consumer")
+      .create_provider("Provider")
+      .create_consumer_version("1.2.3")
+      .create_consumer_version_tag("prod")
+      .create_pact
+      .create_verification(provider_version: "4.5.6")
+      .create_webhook
+      .create_triggered_webhook
+      .create_webhook_execution
+  end
+
+  it "returns some metrics" do
+    expect(json_response_body).to be_instance_of(Hash)
+  end
+end

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

@@ -0,0 +1,61 @@
+require 'pact_broker/api/decorators/extended_pact_decorator'
+
+module PactBroker
+  module Api
+    module Decorators
+      describe ExtendedPactDecorator do
+        before do
+          allow(decorator).to receive(:templated_diff_url).and_return('templated-diff-url')
+          allow(decorator).to receive(:verification_publication_url).and_return('verification-publication-url')
+        end
+        let(:content_hash) {
+          {
+            'consumer' => {'name' => 'Consumer'},
+            'provider' => {'name' => 'Provider'},
+            'interactions' => [],
+            'metadata' => {}
+          }
+        }
+
+        let(:base_url) { 'http://example.org' }
+        let(:created_at) { Time.new(2014, 3, 4) }
+        let(:pact) { double('pact',
+          content_hash: content_hash,
+          created_at: created_at,
+          consumer: consumer,
+          consumer_name: consumer.name,
+          provider: provider,
+          provider_name: provider.name,
+          consumer_version: consumer_version,
+          consumer_version_number: '1234',
+          pact_version_sha: '9999',
+          revision_number: 2,
+          name: 'A Pact',
+          head_tag_names: head_tag_names
+        )}
+        let(:head_tag_names) { ['prod'] }
+        let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: 'A Consumer')}
+        let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: 'A Provider')}
+        let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
+        let(:metadata) { "abcd" }
+        let(:decorator) { ExtendedPactDecorator.new(pact) }
+        let(:json) { decorator.to_json(user_options: { base_url: base_url, metadata: metadata }) }
+        subject { JSON.parse(json, symbolize_names: true) }
+
+        it "includes an array of tags" do
+          expect(subject[:_embedded][:tags].first).to include name: 'prod', latest: true
+          # Can't seem to stub the verification_publication_url method on the TagDecorator
+          expect(subject[:_embedded][:tags].first[:_links][:'pb:latest-pact'][:href]).to eq "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/latest/prod"
+        end
+
+        it "includes the pact contents under the contract key" do
+          expect(subject[:contract]).to eq JSON.parse(content_hash.to_json, symbolize_names: true)
+        end
+
+        it "does not include the contract contents in the root" do
+          expect(subject).to_not have_key(:interactions)
+        end
+      end
+    end
+  end
+end