pact_broker 2.36.1 → 2.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f548b10f34b5932038ac4b65943dd13fe86ec93
-  data.tar.gz: 48415859d4d16b2b92bf5154e232185c6a851274
+  metadata.gz: f2f3154a77ea59e200285d2ce7771d02f8333c47
+  data.tar.gz: 5e9096d23e486f5cd2b370b61b7be1733cfa7876
 SHA512:
-  metadata.gz: 34d7eea98e2502d1740afa9f92cdd9f0aa9e4812f26fa16e0091ce5d1e0875ad6f0b56bd5ed4c246baa626f9749a1e353627a878829ca7ec7fbc91872c6f7829
-  data.tar.gz: c65cb9caa13006cbe9291fdd3cec51993fc056a8172ac45ee81ece334ccb0c129d25407653d675dc1c0f610c8c60c1657f854b152eac2d561764d98369838b0f
+  metadata.gz: f1fefb75e3e0e1a7ffe4008c6a35b580569069d4ac3d48b3848d02f730e7723a22a4b425f2306dabc3697d3cdd4d1ae78f728d84b70615d1805736e3dfb48d2c
+  data.tar.gz: 4faa99affeef607ac56cb4feaffd9142fc1351ee101d5eb798f48f8b9d6675814c058d5d00e4af2169ab28b43e511fbda02e717461ae2af6f6e6ef3dc12b48d8

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="v2.37.0"></a>
+### v2.37.0 (2019-09-02)
+
+
+#### Bug Fixes
+
+* delete triggered webhook data when deleting pacticipant version	 ([77265c30](/../../commit/77265c30))
+
+* **index with tags**
+  * sort pact publication by date, not string (#301)	 ([e92bde5f](/../../commit/e92bde5f))
+
+* **index**
+  * sort pact publication by date, not string	 ([75d35802](/../../commit/75d35802))
+
+
 <a name="v2.36.1"></a>
 ### v2.36.1 (2019-08-30)
 

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

@@ -131,6 +131,10 @@ module PactBroker
           PactBroker::DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
         end
 
+        def publication_date_of_latest_pact_order
+          @relationship.latest_pact.created_at.to_time.to_i
+        end
+
         def verification_status
           case @relationship.verification_status
             when :success then "success"

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

@@ -67,7 +67,7 @@
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.label.label-primary
                   = escape_html(tag_name)
-            %td
+            %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact.gsub("about ", "")
             %td{ class: index_item.webhook_status }
               - if index_item.show_webhook_status?

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

@@ -42,7 +42,7 @@
               %a{ href: index_item.provider_group_url }
                 = escape_html(index_item.provider_name)
             %td
-            %td
+            %td{"data-text": index_item.publication_date_of_latest_pact_order}
               = index_item.publication_date_of_latest_pact
             %td{class: index_item.webhook_status}
               %a{ href: index_item.webhook_url }

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.36.1'
+  VERSION = '2.37.0'
 end

data/lib/pact_broker/versions/service.rb

@@ -21,6 +21,7 @@ module PactBroker
 
       def self.delete version
         tag_repository.delete_by_version_id version.id
+        webhook_repository.delete_triggered_webhooks_by_version_id version.id
         pact_repository.delete_by_version_id version.id
         verification_repository.delete_by_provider_version_id version.id
         version_repository.delete_by_id version.id

data/lib/pact_broker/webhooks/repository.rb

@@ -99,13 +99,6 @@ module PactBroker
           .collect(&:to_domain)
       end
 
-      # TODO delete
-      def find_by_consumer_and_provider_existing_at consumer, provider, date_time
-        Webhook.where(consumer_id: consumer.id, provider_id: provider.id)
-        .where(Sequel.lit("created_at < ?", date_time))
-        .collect(&:to_domain)
-      end
-
       def create_triggered_webhook trigger_uuid, webhook, pact, verification, trigger_type
         db_webhook = Webhook.where(uuid: webhook.uuid).single_record
         TriggeredWebhook.create(
@@ -157,15 +150,22 @@ module PactBroker
 
       def delete_triggered_webhooks_by_webhook_uuid uuid
         triggered_webhook_ids = TriggeredWebhook.where(webhook: Webhook.where(uuid: uuid)).select_for_subquery(:id)
-        Execution.where(triggered_webhook_id: triggered_webhook_ids).delete
+        delete_triggered_webhooks_and_executions(triggered_webhook_ids)
         DeprecatedExecution.where(webhook_id: Webhook.where(uuid: uuid).select_for_subquery(:id)).delete
-        TriggeredWebhook.where(id: triggered_webhook_ids).delete
+      end
+
+      def delete_triggered_webhooks_by_version_id version_id
+        delete_triggered_webhooks_by_pact_publication_ids(PactBroker::Pacts::PactPublication.where(consumer_version_id: version_id).select_for_subquery(:id))
+        delete_triggered_webhooks_by_verification_ids(PactBroker::Domain::Verification.where(provider_version_id: version_id).select_for_subquery(:id))
+      end
+
+      def delete_triggered_webhooks_by_verification_ids verification_ids
+        delete_triggered_webhooks_and_executions(TriggeredWebhook.where(verification_id: verification_ids).select_for_subquery(:id))
       end
 
       def delete_triggered_webhooks_by_pact_publication_ids pact_publication_ids
         triggered_webhook_ids = TriggeredWebhook.where(pact_publication_id: pact_publication_ids).select_for_subquery(:id)
-        Execution.where(triggered_webhook_id: triggered_webhook_ids).delete
-        TriggeredWebhook.where(id: triggered_webhook_ids).delete
+        delete_triggered_webhooks_and_executions(triggered_webhook_ids)
         DeprecatedExecution.where(pact_publication_id: pact_publication_ids).delete
       end
 
@@ -203,6 +203,13 @@ module PactBroker
       def fail_retrying_triggered_webhooks
         TriggeredWebhook.retrying.update(status: TriggeredWebhook::STATUS_FAILURE)
       end
+
+      private
+
+      def delete_triggered_webhooks_and_executions triggered_webhook_ids
+        Execution.where(triggered_webhook_id: triggered_webhook_ids).delete
+        TriggeredWebhook.where(id: triggered_webhook_ids).delete
+      end
     end
   end
 end

data/spec/lib/pact_broker/versions/service_spec.rb

@@ -14,6 +14,9 @@ module PactBroker
             .create_consumer_version_tag("prod")
             .create_pact
             .create_verification(provider_version: "1.0.0")
+            .create_webhook
+            .create_triggered_webhook
+            .create_webhook_execution
             .and_return(:consumer_version)
         end
 

data/spec/lib/pact_broker/webhooks/repository_spec.rb

@@ -730,6 +730,41 @@ module PactBroker
           }.by(-1)
         end
       end
+
+      describe "delete_triggered_webhooks_by_version_id" do
+        subject { Repository.new.delete_triggered_webhooks_by_version_id(version.id) }
+
+        context "when deleting a triggered webhook by consumer version" do
+          let!(:version) do
+            td
+              .create_pact_with_hierarchy
+              .create_webhook
+              .create_triggered_webhook
+              .create_webhook_execution
+              .and_return(:consumer_version)
+          end
+
+          it "deletes the webhooks belonging to the consumer version" do
+            expect { subject }.to change{ TriggeredWebhook.count }.by (-1)
+          end
+        end
+
+        context "when deleting a triggered webhook by provider version" do
+          let!(:version) do
+            td
+              .create_pact_with_hierarchy
+              .create_verification(provider_version: "1")
+              .create_provider_webhook(event_names: ['provider_verification_published'])
+              .create_triggered_webhook
+              .create_webhook_execution
+              .and_return(:provider_version)
+          end
+
+          it "deletes the webhooks belonging to the consumer version" do
+            expect { subject }.to change{ TriggeredWebhook.count }.by (-1)
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.36.1
+  version: 2.37.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty