pact_broker 2.103.0 → 2.104.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82ecff0b79c081b9f3712bde752b9983e7377eb8d48120616c8c3fcf237076c
-  data.tar.gz: cef4b3136255cbba17ad31e9001c935393989df848666ddb712e81884ac61003
+  metadata.gz: b2a928f323706d303796168aed1ec181dbf44be8156fc54010357a26771cffd2
+  data.tar.gz: b6e9ab38c908cd2263e51e16816f1b4ad8950151cf033ce5009c33022bd1ca59
 SHA512:
-  metadata.gz: cb22f318c1f69dc91ceb7a84c940170600ceaf4a53e3ef65eabb7876fd2510867ad243cb1fb4cb22cf06e7b370f868cb01199697de73835879423d1371d6e19b
-  data.tar.gz: 87507ea9c45bc37318b98a9b8d53ab5a703eeffd1970cb111f3c8d639015f08442a0839376c4d59cc3e321005cb77da11466a1ca5340661905d66578c5aa669d
+  metadata.gz: 9e43a6235c4a0a1cfdb8dacd8b83eca7f11e76c1ec40510207b7a904b72d2d1895878fdbbc1e249454c1b3fa5a814bb764bf747ae76b0f0f0f180da096f1d056
+  data.tar.gz: 77c95170acc6e136e177d27baaa65f2f668b5085789ebfafde5552983d83a3c42e25b21ee558faf19263d364ae9526350424d32312fb3a6db5d9dcb38e7521a4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="v2.104.0"></a>
+### v2.104.0 (2022-09-17)
+
+#### Features
+
+* ignore deleted webhooks when calculating the latest triggered webhook status	 ([c3105dcb](/../../commit/c3105dcb))
+
 <a name="v2.103.0"></a>
 ### v2.103.0 (2022-09-14)
 

data/lib/pact_broker/configuration.rb

@@ -106,7 +106,6 @@ module PactBroker
 
     def logger_from_runtime_configuration
       @logger_from_runtime_configuration ||= begin
-        runtime_configuration.validate_logging_attributes!
         SemanticLogger.default_level = runtime_configuration.log_level
         if runtime_configuration.log_stream == :file
           path = runtime_configuration.log_dir + "/pact_broker.log"

data/lib/pact_broker/integrations/integration.rb

@@ -12,7 +12,14 @@ module PactBroker
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
       associate(:one_to_one, :latest_verification, :class => "PactBroker::Verifications::LatestVerificationForConsumerAndProvider", key: [:consumer_id, :provider_id], primary_key: [:consumer_id, :provider_id])
-      associate(:one_to_many, :latest_triggered_webhooks, :class => "PactBroker::Webhooks::LatestTriggeredWebhook", key: [:consumer_id, :provider_id], primary_key: [:consumer_id, :provider_id])
+
+      one_to_many(:latest_triggered_webhooks,
+        :class => PactBroker::Webhooks::TriggeredWebhook,
+        key: [:consumer_id, :provider_id],
+        allow_eager: true,
+        primary_key: [:consumer_id, :provider_id]) do | ds |
+          ds.latest_triggered_webhooks
+        end
 
       # When viewing the index, every latest_pact in the database will match at least one of the rows, so
       # it makes sense to load the entire table and match each pact to the appropriate row.

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.103.0"
+  VERSION = "2.104.0"
 end

data/lib/pact_broker/webhooks/repository.rb

@@ -159,9 +159,9 @@ module PactBroker
 
       def find_latest_triggered_webhooks consumer, provider
         # policy already applied to pact
-        deliberately_unscoped(LatestTriggeredWebhook)
+        deliberately_unscoped(TriggeredWebhook)
           .where(consumer: consumer, provider: provider)
-          .order(:id)
+          .latest_triggered_webhooks
           .all
       end
 

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -45,6 +45,13 @@ module PactBroker
         def not_run
           where(status: STATUS_NOT_RUN)
         end
+
+        # Return the dataset for the latest triggered webhooks grouped by
+        # consumer, provider, webhook and event.
+        # Excludes the deleted webhooks
+        def latest_triggered_webhooks
+          exclude(webhook_id: nil).max_group_by(:id, [:consumer_id, :provider_id, :webhook_uuid, :event_name]).order(:id)
+        end
       end
 
       associate(:one_to_many, :webhook_executions, :class => "PactBroker::Webhooks::Execution", :key => :triggered_webhook_id, :primary_key => :id, :order => :id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.103.0
+  version: 2.104.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json