pact_broker 2.65.0 → 2.66.0

data/lib/pact_broker/doc/views/pacticipant/versions.markdown

@@ -0,0 +1,9 @@
+# Pacticipant versions
+
+Allowed methods: `GET`
+
+Path: `/pacticipants/{pacticipant}/versions`
+
+A list of pacticipant versions in order from newest to oldest.
+
+To paginate, append `?pageNumber=x&pageSize=x` and follow the `next` relation until it is no longer present.

data/lib/pact_broker/domain/pacticipant.rb

@@ -30,6 +30,10 @@ module PactBroker
       end
 
       def before_destroy
+        PactBroker::Pacts::PactPublication.where(provider: self).delete
+        PactBroker::Domain::Verification.where(consumer: self).or(provider: self).delete
+        PactBroker::Domain::Version.where(pacticipant: self).delete
+        PactBroker::Pacts::PactVersion.where(consumer: self).or(provider: self).delete
         PactBroker::Domain::Label.where(pacticipant: self).destroy
         super
       end

data/lib/pact_broker/domain/tag.rb

@@ -10,6 +10,8 @@ module PactBroker
         include PactBroker::Repositories::Helpers
       end
 
+      plugin :insert_ignore, identifying_columns: [:name, :version_id]
+
       unrestrict_primary_key
 
       associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)

data/lib/pact_broker/domain/version.rb

@@ -50,6 +50,7 @@ module PactBroker
         end
 
         def delete
+          PactBroker::Pacts::PactPublication.where(consumer_version: self).delete
           PactBroker::Domain::Tag.where(version: self).delete
           super
         end

data/lib/pact_broker/feature_toggle.rb

@@ -1,7 +1,11 @@
 module PactBroker
   class FeatureToggle
-    def self.enabled?(feature)
-      not_production? || feature_in_env_var?(feature)
+    def self.enabled?(feature, ignore_env)
+      if ignore_env
+        feature_in_env_var?(feature)
+      else
+        not_production? || feature_in_env_var?(feature)
+      end
     end
 
     def self.not_production?
@@ -17,7 +21,7 @@ module PactBroker
     end
   end
 
-  def self.feature_enabled?(feature)
-    FeatureToggle.enabled?(feature)
+  def self.feature_enabled?(feature, ignore_env = false)
+    FeatureToggle.enabled?(feature, ignore_env)
   end
 end

data/lib/pact_broker/matrix/service.rb

@@ -1,3 +1,4 @@
+require 'pact_broker/logging'
 require 'pact_broker/repositories'
 require 'pact_broker/matrix/row'
 require 'pact_broker/matrix/deployment_status_summary'
@@ -9,8 +10,10 @@ module PactBroker
       extend self
       extend PactBroker::Repositories
       extend PactBroker::Services
+      include PactBroker::Logging
 
       def find selectors, options = {}
+        logger.info "Querying matrix", selectors: selectors, options: 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, deployment_status_summary)

data/lib/pact_broker/pacticipants/repository.rb

@@ -8,6 +8,7 @@ module PactBroker
     class Repository
 
       include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories
 
       def find_by_name name
         pacticipants = PactBroker::Domain::Pacticipant.where(name_like(:name, name)).all
@@ -35,11 +36,11 @@ module PactBroker
         query.order_ignore_case(Sequel[:pacticipants][:name]).eager(:labels).eager(:latest_version).all
       end
 
-      def find_all_pacticipant_versions_in_reverse_order name
-        PactBroker::Domain::Version.select_all_qualified
-          .join(:pacticipants, {id: :pacticipant_id})
-          .where(name_like(:name, name))
-          .reverse_order(:order)
+      def find_all_pacticipant_versions_in_reverse_order name, pagination_options = nil
+        pacticipant = pacticipant_repository.find_by_name!(name)
+        query = PactBroker::Domain::Version.where(pacticipant: pacticipant).reverse_order(:order)
+        query = query.paginate(pagination_options[:page_number], pagination_options[:page_size]) if pagination_options
+        query
       end
 
       def find_by_name_or_create name

data/lib/pact_broker/pacticipants/service.rb

@@ -52,8 +52,8 @@ module PactBroker
         pacticipant_repository.find options
       end
 
-      def self.find_all_pacticipant_versions_in_reverse_order name
-        pacticipant_repository.find_all_pacticipant_versions_in_reverse_order(name)
+      def self.find_all_pacticipant_versions_in_reverse_order name, pagination_options = nil
+        pacticipant_repository.find_all_pacticipant_versions_in_reverse_order(name, pagination_options)
       end
 
       def self.find_pacticipant_repository_url_by_pacticipant_name name
@@ -79,21 +79,8 @@ module PactBroker
 
       def self.delete name
         pacticipant = find_pacticipant_by_name name
-        connection = PactBroker::Domain::Pacticipant.new.db
-        version_ids = PactBroker::Domain::Version.where(pacticipant_id: pacticipant.id).select_for_subquery(:id) #stupid mysql doesn't allow subqueries
-        select_pacticipant = "select id from pacticipants where name = '#{name}'"
-        tag_repository.delete_by_version_id version_ids
-        webhook_service.delete_all_webhhook_related_objects_by_pacticipant pacticipant
-        pact_repository.delete_by_version_id version_ids
-        connection.run("delete from pact_publications where provider_id = #{pacticipant.id}")
-        connection.run("delete from verifications where pact_version_id IN (select id from pact_versions where provider_id = #{pacticipant.id})")
-        connection.run("delete from verifications where pact_version_id IN (select id from pact_versions where consumer_id = #{pacticipant.id})")
-        connection.run("delete from pact_versions where provider_id = #{pacticipant.id}")
-        connection.run("delete from pact_versions where consumer_id = #{pacticipant.id}")
-        connection.run("delete from versions where pacticipant_id = #{pacticipant.id}")
-        version_repository.delete_by_id version_ids
-        label_repository.delete_by_pacticipant_id(pacticipant.id)
-        connection.run("delete from pacticipants where id = #{pacticipant.id}")
+        webhook_service.delete_all_webhhook_related_objects_by_pacticipant(pacticipant)
+        pacticipant.destroy
       end
 
       def self.delete_if_orphan(pacticipant)
@@ -105,4 +92,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/pacts/latest_tagged_pact_publications.rb

@@ -3,10 +3,24 @@ require 'pact_broker/pacts/head_pact'
 
 module PactBroker
   module Pacts
-
     class LatestTaggedPactPublications < LatestPactPublicationsByConsumerVersion
       set_dataset(:latest_tagged_pact_publications)
 
+      dataset_module do
+        def where_age_less_than(days)
+          start_date = Date.today - days
+          where{ latest_tagged_pact_publications[:created_at] >= start_date }
+        end
+
+        def for_selector(selector)
+          query = self
+          query = query.where(consumer_name: selector.pacticipant_name) if selector.pacticipant_name
+          query = query.where(tag_name: selector.tag) if selector.tag && selector.tag.is_a?(String)
+          query = query.where_age_less_than(selector.max_age) if selector.max_age
+          query
+        end
+      end
+
       def to_domain
         HeadPact.new(super, consumer_version_number, tag_name)
       end

data/lib/pact_broker/tags/repository.rb

@@ -10,12 +10,9 @@ module PactBroker
       def create args
         params = {
           name: args.fetch(:name),
-          version_id: args.fetch(:version).id,
-          created_at: Sequel.datetime_class.now,
-          updated_at: Sequel.datetime_class.now
+          version_id: args.fetch(:version).id
         }
-        Domain::Tag.dataset.insert_ignore.insert(params)
-        Domain::Tag.find(name: args[:name], version_id: args[:version].id)
+        Domain::Tag.new(params).insert_ignore
       end
 
       def find args

data/lib/pact_broker/test/test_data_builder.rb

@@ -293,8 +293,9 @@ module PactBroker
       def create_triggered_webhook params = {}
         params.delete(:comment)
         trigger_uuid = params[:trigger_uuid] || webhook_service.next_uuid
+        event_name = params.key?(:event_name) ? params[:event_name] : @webhook.events.first.name # could be nil, for backwards compatibility
         verification = @webhook.trigger_on_provider_verification_published? ? @verification : nil
-        @triggered_webhook = webhook_repository.create_triggered_webhook trigger_uuid, @webhook, @pact, verification, PactBroker::Webhooks::Service::RESOURCE_CREATION, @webhook.events.first.name
+        @triggered_webhook = webhook_repository.create_triggered_webhook trigger_uuid, @webhook, @pact, verification, PactBroker::Webhooks::Service::RESOURCE_CREATION, event_name
         @triggered_webhook.update(status: params[:status]) if params[:status]
         set_created_at_if_set params[:created_at], :triggered_webhooks, {id: @triggered_webhook.id}
         self
@@ -329,7 +330,7 @@ module PactBroker
 
         if tag_names.any?
           tag_names.each do | tag_name |
-            PactBroker::Domain::Tag.create(name: tag_name, version: @provider_version)
+            PactBroker::Domain::Tag.new(name: tag_name, version: @provider_version).insert_ignore
             set_created_at_if_set(parameters[:created_at], :tags, version_id: @provider_version.id, name: tag_name)
           end
         end
@@ -407,6 +408,25 @@ module PactBroker
         end
       end
 
+      def random_json_content(consumer_name, provider_name)
+        {
+          "consumer" => {
+             "name" => consumer_name
+           },
+           "provider" => {
+             "name" => provider_name
+           },
+           "interactions" => [{
+              "request" => {
+                "method" => "GET",
+                "path" => "/things/#{rand}"
+              },
+              "response" => {
+                "status" => 200
+              }
+           }],
+         }.to_json
+      end
 
       private
 

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

@@ -51,6 +51,14 @@
             %input{name: 'q[]latest', value: 'true', hidden: true, class: 'latest-flag'}
 
 
+      - if options.latest || options.tag
+        .selector
+          %label{for: 'to'}
+            = options.latest ? 'To' : 'With all'
+          %input{name: 'tag', id: 'to', value: options.tag }
+          %input{name: 'latest', value: options.latest.to_s, hidden: true}
+
+
       %div.top-of-group
         .input-group
           %input{type: 'radio', name: "latestby", class: '', value: '', id: 'all_rows', checked: options.all_rows_checked}

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.65.0'
+  VERSION = '2.66.0'
 end

data/spec/features/get_versions_spec.rb

@@ -21,6 +21,14 @@ describe "Get versions" do
     it "returns a list of links to the versions" do
       expect(last_response_body[:_links][:"versions"].size).to eq 2
     end
+
+    context "with pagination options" do
+      subject { get(path, { 'pageSize' => '1', 'pageNumber' => '1' }) }
+
+      it "paginates the response" do
+        expect(last_response_body[:_links][:"versions"].size).to eq 1
+      end
+    end
   end
 
   context "when the pacticipant does not exist" do

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

@@ -3,32 +3,38 @@ require 'pact_broker/api/decorators/versions_decorator'
 require 'pact_broker/domain/version'
 
 module PactBroker
-
   module Api
-
     module Decorators
-
       describe VersionsDecorator do
 
-        let(:options) { {base_url: 'http://example.org', pacticipant_name: "Consumer" }}
+        let(:options) { { resource_url: 'http://versions', base_url: 'http://example.org', pacticipant_name: "Consumer", query_string: query_string}}
+        let(:query_string) { nil }
+        let(:versions) { [] }
 
         subject { JSON.parse VersionsDecorator.new(versions).to_json(user_options: options), symbolize_names: true }
 
-        context "with no versions" do
-          let(:versions) { [] }
+        context "with no query string" do
+          its([:_links, :self, :href]) { is_expected.to eq 'http://versions' }
+        end
 
+        context "with a query string" do
+          let(:query_string) { 'foo=bar' }
+          its([:_links, :self, :href]) { is_expected.to eq 'http://versions?foo=bar' }
+        end
+
+        context "with no versions" do
           it "doesn't blow up" do
             subject
           end
         end
 
         context "with versions" do
-          let(:version) do
+          let!(:version) do
             TestDataBuilder.new
               .create_consumer("Consumer")
               .create_consumer_version("1.2.3")
               .create_consumer_version_tag("prod")
-            PactBroker::Versions::Repository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
+              .and_return(:consumer_version)
           end
           let(:versions) { [version] }
 
@@ -37,7 +43,6 @@ module PactBroker
             expect(subject[:_embedded][:versions].size).to eq 1
           end
         end
-
       end
     end
   end

data/spec/lib/pact_broker/api/resources/default_base_resource_spec.rb

@@ -5,11 +5,11 @@ module PactBroker
     module Resources
       describe DefaultBaseResource do
         let(:request) { double('request', body: body, uri: uri, base_uri: URI("http://example.org/"), env: env).as_null_object }
-        let(:response) { double('response') }
+        let(:response) { double('response').as_null_object }
         let(:uri) { URI('http://example.org/path?query') }
         let(:body) { double('body', to_s: body_string) }
         let(:body_string) { '' }
-        let(:env) { double('env') }
+        let(:env) { double('env').as_null_object }
 
         subject { BaseResource.new(request, response) }
 
@@ -100,6 +100,10 @@ module PactBroker
         end
 
         describe "decorator_options" do
+          before do
+            allow(env).to receive(:[]).with("QUERY_STRING").and_return("foo=bar")
+          end
+
           context "with no overrides" do
             it "returns the default decorator options" do
               expect(subject.decorator_options).to eq(
@@ -107,7 +111,8 @@ module PactBroker
                   base_url: "http://example.org",
                   resource_url: "http://example.org/path",
                   env: env,
-                  resource_title: nil
+                  resource_title: nil,
+                  query_string: "foo=bar"
                 }
               )
             end
@@ -121,7 +126,8 @@ module PactBroker
                   resource_url: "http://example.org/path",
                   env: env,
                   resource_title: "foo",
-                  something: "else"
+                  something: "else",
+                  query_string: "foo=bar"
                 }
               )
             end

data/spec/lib/pact_broker/db/clean_spec.rb

@@ -7,6 +7,11 @@ module PactBroker
   module DB
     # Inner queries don't work on MySQL. Seriously, MySQL???
     describe Clean, pending: IS_MYSQL  do
+
+      def pact_publication_count_for(consumer_name, version_number)
+        PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name(consumer_name).where(number: version_number)).count
+      end
+
       let(:options) { {} }
       let(:db) { PactBroker::DB.connection }
 
@@ -47,6 +52,66 @@ module PactBroker
           end
         end
 
+        context "when the latest pact for a tag does not belong to the latest version for a tag" do
+          before do
+            td.create_pact_with_hierarchy("Foo", "1", "Bar").comment("delete, not latest pact for dev")
+              .create_consumer_version_tag("dev")
+              .create_pact_with_hierarchy("Foo", "2", "Bar").comment("keep, latest pact for dev")
+              .create_consumer_version_tag("dev")
+              .create_consumer_version("3").comment("keep, latest version for dev")
+              .create_consumer_version_tag("dev")
+          end
+
+          it "deletes the not-latest pact" do
+            expect { subject }.to change { pact_publication_count_for("Foo", "1") }.by(-1)
+          end
+
+          it "does not delete the pact latest" do
+            expect { subject }.to_not change { pact_publication_count_for("Foo", "2") }
+          end
+        end
+
+        context "when a verification for the latest tagged version belongs to a pact that is not the latest tagged version" do
+          before do
+            td.create_pact_with_hierarchy("Foo", "1", "Bar", td.random_json_content("Foo", "Bar"))
+              .create_consumer_version_tag("dev").comment("delete, not latest, not verified by latest Bar")
+              .create_verification(provider_version: "3", tag_names: "dev").comment("delete, not latest")
+              .create_pact_with_hierarchy("Foo", "2", "Bar", td.random_json_content("Foo", "Bar"))
+              .create_consumer_version_tag("dev").comment("can't delete because it is verified by the latest dev version of the provider")
+              .create_verification(provider_version: "4", tag_names: "dev").comment("keep")
+              .create_pact_with_hierarchy("Foo", "3", "Bar", td.random_json_content("Foo", "Bar"))
+              .create_consumer_version_tag("dev").comment("keep")
+          end
+
+          let(:options) { { keep: [latest_dev_selector] } }
+
+          it "does not delete the latest verification" do
+            expect{ subject }.to_not change {
+              PactBroker::Domain::Verification.where(provider_version: PactBroker::Domain::Version.where_pacticipant_name("Bar").where(number: "4")).count
+            }
+          end
+
+          it "deletes the non-latest verification" do
+            expect{ subject }.to change {
+              PactBroker::Domain::Verification.where(provider_version: PactBroker::Domain::Version.where_pacticipant_name("Bar").where(number: "3")).count
+            }.by(-1)
+          end
+
+          it "does not delete the pact publication that belongs to the latest verification" do
+            expect{ subject }.to_not change {
+              PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name("Foo").where(number: "2")).count
+            }
+          end
+
+          it "deletes the pact publication that does not belongs to the latest verification" do
+            expect{ subject }.to change {
+              PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name("Foo").where(number: "1")).count
+            }.by(-1)
+          end
+        end
+
+
+
         context "with orphan pact versions" do
           before do
             # Create a pact that will not be deleted
@@ -69,20 +134,23 @@ module PactBroker
           end
         end
 
-        context "with triggered and executed" do
+        context "with triggered and executed webhooks" do
           before do
             td.create_pact_with_hierarchy("Foo", "1", "Bar")
-              .create_consumer_version_tag("dev").comment("keep")
+              .create_consumer_version_tag("dev").comment("delete")
               .create_webhook
               .create_triggered_webhook
               .create_webhook_execution
               .add_day
+              .create_pact_with_hierarchy("Foo", "2", "Bar")
+              .create_consumer_version_tag("dev").comment("keep")
+              .create_webhook
               .create_triggered_webhook
               .create_webhook_execution
           end
 
-          xit "deletes all but the most recent triggered webhook" do
-
+          it "deletes the ones associated with the deleted pacts" do
+            expect { subject }.to change { PactBroker::Webhooks::TriggeredWebhook.count }.by(-1)
           end
         end
       end