pact_broker 2.117.1 → 2.119.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52b0ab9c14e0eff3a49143fa09d4205ba9c1d9c16e96fd8e88bc74fb2b798d2
-  data.tar.gz: bf44ad81e1676d10d8af2912875726cdc50e91bbfbd10b02b62d689d7590fbaa
+  metadata.gz: e28c13c74efb9e4cd894da6d14e18a28ea6d15c3240f4defc2b2fe246d1fafb0
+  data.tar.gz: 6194f39dd67344eed51782de55bea6d95ee937716bd59afbe8b6ee2cfe473b08
 SHA512:
-  metadata.gz: 0f9ef0b473f58fd3b60c4c6e61125041bf93002d5cff4fe03f589583ca4bff47e719a23bd14220c18a78e0ce662cb0dfcda0947c94b253d96c7caf4bfdb55238
-  data.tar.gz: 8558c5f412cd6bbbdf21b1af7e235c7f3f78b6e871a7584d7654319758043c7652d341cab21e4b00c1f6014bd5e950bd7484a4eb1ec5e384dcb09237d8e0db2d
+  metadata.gz: 40138782cf26259e00e0f2417d9243f5066f4b6dd77ad076869f12f47adcfb7f4a85481e4b9f3cff4ba9ba9bf03881bbb69e71fa7b269bd868a472ed74c2b91e
+  data.tar.gz: 056be7ffcb8273b41d7e1292307b495a6277b71248b685515185f0239b477aa8fb6ff6646ef9ac22e86cfb87aa10bfe969ff93a1868ef10e1e81a3ae793f381a

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+<a name="v2.119.0"></a>
+### v2.119.0 (2026-04-02)
+
+#### Features
+
+* support customising webhook requests	 ([d20a8274](/../../commit/d20a8274))
+* Optimize WIP Query Performance to Prevent Timeouts on Large Datasets (#902)	 ([711ac3c6](/../../commit/711ac3c6))
+
+#### Bug Fixes
+
+* add missing import and small improvement to batch delete (#899)	 ([2e83d012](/../../commit/2e83d012))
+* new unit test failure	 ([6c39e927](/../../commit/6c39e927))
+* avoid N+1 cascade	 ([681d98d9](/../../commit/681d98d9))
+* dont create index for mysql	 ([1ec72cc8](/../../commit/1ec72cc8))
+* Pacticipant API returning undeployed versions in pacticipant deployed-environments endpoint (#889)	 ([e217d3ba](/../../commit/e217d3ba))
+
+* **PACT-5504**
+  * use batch delete to speed up deletion	 ([e908035a](/../../commit/e908035a))
+
+<a name="v2.118.0"></a>
+### v2.118.0 (2026-01-02)
+
+#### Features
+
+* added has_messages column to pact_versions table (#880)	 ([34741dae](/../../commit/34741dae))
+
+#### Bug Fixes
+
+* remove route overlap and add tests for new routes	 ([45a81474](/../../commit/45a81474))
+* restore latest pact for branch endpoint	 ([cb867957](/../../commit/cb867957))
+
 <a name="v2.117.1"></a>
 ### v2.117.1 (2025-11-02)
 

data/db/migrations/20251106_add_branch_versions_version_id_branch_name_index.rb

@@ -0,0 +1,21 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:branch_versions) do
+        add_index([:version_id, :branch_name], name: "branch_versions_version_id_branch_name_idx")
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:branch_versions) do
+        drop_index([:version_id, :branch_name], name: "branch_versions_version_id_branch_name_idx")
+      end
+    end
+  end
+end

data/db/migrations/20251202_add_has_messages_column_to_pact_versions.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:pact_versions) do
+      add_column(:has_messages, TrueClass, default: false, null: false)
+    end
+  end
+end

data/db/migrations/20251202_populate_has_messages_in_pact_versions.rb

@@ -0,0 +1,29 @@
+require "pact_broker/pacts/content"
+require "pact_broker/pacts/interactions/types"
+
+Sequel.migration do
+  up do
+    batch_size = 500
+    offset = 0
+
+    loop do
+      rows = from(:pact_versions).order(:id).limit(batch_size).offset(offset).all
+      break if rows.empty?
+
+      rows.each do |row|
+        content = PactBroker::Pacts::Content.from_json(row[:content])
+        has_messages = PactBroker::Pacts::Interactions::Types.for(content).has_messages?
+
+        from(:pact_versions)
+          .where(id: row[:id])
+          .update(has_messages: has_messages)
+      end
+
+      offset += batch_size
+    end
+  end
+
+  down do
+
+  end
+end

data/db/migrations/20260119_add_index_on_consumer_id_provider_id_to_pact_versions.rb

@@ -0,0 +1,20 @@
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:pact_versions) do
+        add_index :consumer_id, name: :pact_versions_consumer_id_index
+        add_index :provider_id, name: :pact_versions_provider_id_index
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:pact_versions) do
+        drop_index :consumer_id, name: :pact_versions_consumer_id_index
+        drop_index :provider_id, name: :pact_versions_provider_id_index
+      end
+    end
+  end
+end
+

data/db/migrations/20260123_drop_branch_versions_branch_name_index.rb

@@ -0,0 +1,17 @@
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:branch_versions) do
+        drop_index([:branch_name], name: "branch_versions_branch_name_index")
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:branch_versions) do
+        add_index([:branch_name], name: "branch_versions_branch_name_index")
+      end
+    end
+  end
+end

data/db/migrations/20260210_add_index_on_pact_version_id_to_latest_pact_publication.rb

@@ -0,0 +1,22 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if !mysql?
+      alter_table(:latest_pact_publication_ids_for_consumer_versions) do
+        add_index :pact_version_id, name: :latest_pp_ids_for_cons_ver_pact_version_id_index
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:latest_pact_publication_ids_for_consumer_versions) do
+        drop_index :pact_version_id, name: :latest_pp_ids_for_cons_ver_pact_version_id_index
+      end
+    end
+  end
+end
+

data/db/migrations/20260217_add_wip_query_optimization_indexes.rb

@@ -0,0 +1,31 @@
+require_relative "migration_helper"
+
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  no_transaction if PactBroker::MigrationHelper.postgres?
+
+  up do
+    if !mysql?
+      alter_table(:pact_publications) do
+        add_index([:provider_id, :created_at], name: "idx_pp_provider_created", concurrently: postgres?)
+      end
+
+      alter_table(:verifications) do
+        add_index([:provider_id, :provider_version_id, :success, :wip, :pact_version_id], name: "idx_verifications_provider_lookup", concurrently: postgres?)
+      end
+    end
+  end
+
+  down do
+    if !mysql?
+      alter_table(:pact_publications) do
+        drop_index([:provider_id, :created_at], name: "idx_pp_provider_created")
+      end
+
+      alter_table(:verifications) do
+        drop_index([:provider_id, :provider_version_id, :success, :wip, :pact_version_id], name: "idx_verifications_provider_lookup")
+      end
+    end
+  end
+end

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -25,7 +25,7 @@ module PactBroker
         def self.eager_load_associations
           [
             :pacticipant,
-            :pact_publications,
+            { pact_publications: [:consumer, :provider, { pact_version: :latest_verification }, :tags, :head_pact_publications_for_tags] },
             { branch_versions: [:version, :branch_head, { branch: :pacticipant }] },
             { tags: :head_tag }
           ]

data/lib/pact_broker/api/resources/index.rb

@@ -57,19 +57,19 @@ module PactBroker
             },
             "pb:latest-branch-pact-versions" =>
             {
-              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest",
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest/versions",
               title: "Latest version of pact for a provider, for a named consumers branch",
               templated: true
             },
             "pb:main-branch-pact-versions" =>
             {
-              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch",
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/versions",
               title: "All versions of pacts for a provider, for a named consumers main branch",
               templated: true
             },
             "pb:latest-main-branch-pact-versions" =>
             {
-              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/latest",
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/latest/versions",
               title: "Latest version of pact for a provider, for a named consumers main branch",
               templated: true
             },

data/lib/pact_broker/api/resources/provider_pacts_for_verification.rb

@@ -94,7 +94,7 @@ module PactBroker
         end
 
         def log_request
-          logger.info "Fetching pacts for verification by #{provider_name}", provider_name: provider_name, params: query
+          logger.debug "Fetching pacts for verification by #{provider_name}", provider_name: provider_name, params: query
         end
 
         def nested_query

data/lib/pact_broker/api.rb

@@ -33,10 +33,10 @@ module PactBroker
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "versions"], Api::Resources::PactVersions, {resource_name: "pact_publications"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "versions", :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publication", deprecated: true} # Not the standard URL, but keep for backwards compatibility
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "tag", :tag], Api::Resources::TaggedPactVersions, {resource_name: "tagged_pact_publications"}
-        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch"], Api::Resources::PactVersionsForBranch, {resource_name: "pact_publications_for_main_branch"}
-        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", "latest"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_main_branch"}
-        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name, "latest"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_branch"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", "versions"], Api::Resources::PactVersionsForBranch, {resource_name: "pact_publications_for_main_branch"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name], Api::Resources::PactVersionsForBranch, {resource_name: "pact_publications_for_branch"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", "latest", "versions"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_main_branch"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name, "latest", "versions"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_branch"}
 
         # Pacts
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "version", :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publication"}

data/lib/pact_broker/config/runtime_configuration.rb

@@ -1,12 +1,4 @@
 require "anyway_config"
-require "pact_broker/config/runtime_configuration_logging_methods"
-require "pact_broker/config/runtime_configuration_database_methods"
-require "pact_broker/config/runtime_configuration_coercion_methods"
-require "pact_broker/version"
-require "pact_broker/config/runtime_configuration_basic_auth_methods"
-require "pact_broker/string_refinements"
-require "pact_broker/hash_refinements"
-require "pact_broker/error"
 
 module Anyway
   module Tracing
@@ -20,6 +12,15 @@ module Anyway
   end
 end
 
+require "pact_broker/config/runtime_configuration_logging_methods"
+require "pact_broker/config/runtime_configuration_database_methods"
+require "pact_broker/config/runtime_configuration_coercion_methods"
+require "pact_broker/version"
+require "pact_broker/config/runtime_configuration_basic_auth_methods"
+require "pact_broker/string_refinements"
+require "pact_broker/hash_refinements"
+require "pact_broker/error"
+
 module PactBroker
   module Config
     class RuntimeConfiguration < Anyway::Config

data/lib/pact_broker/configuration.rb

@@ -201,6 +201,32 @@ module PactBroker
       webhook_host_whitelist&.any?
     end
 
+    def dynamic_wip_window_enabled?
+      ENV["PACT_BROKER_DYNAMIC_WIP_WINDOW"]&.downcase == "true"
+    end
+
+    # Maximum lookback window (days) to query for unverified pacts. Prevents timeout on large datasets.
+    def max_wip_lookback_days
+      ENV["PACT_BROKER_MAX_WIP_LOOKBACK_DAYS"]&.to_i || 14
+    end
+
+    # Minimum WIP window (days) to ensure recent pacts are always included, even if P80 is very low.
+    def min_wip_window_days
+      ENV["PACT_BROKER_MIN_WIP_WINDOW_DAYS"]&.to_i || 7
+    end
+
+    # Lookback window (days) for checking if a pact was verified by another branch before this branch was created.
+    # Uses verification execution_date to find recent branch activity, avoiding false negatives when old
+    # version numbers are reused across branches.
+    def verified_by_other_branch_before_this_branch_look_back
+      ENV["PACT_BROKER_VERIFIED_BY_OTHER_BRANCH_LOOKBACK_DAYS"]&.to_i || 30
+    end
+
+    # Default WIP window (days) used when dynamic calculation fails or no unverified pacts exist.
+    def default_wip_window_days
+      ENV["PACT_BROKER_DEFAULT_WIP_WINDOW_DAYS"]&.to_i || 7
+    end
+
     def enable_badge_resources= enable_badge_resources
       puts "Pact Broker configuration property `enable_badge_resources` is deprecated. Please use `enable_public_badge_access`"
       self.enable_public_badge_access = enable_badge_resources

data/lib/pact_broker/deployments/deployed_version_service.rb

@@ -68,6 +68,7 @@ module PactBroker
 
       def self.find_all_deployed_versions_for_pacticipant(pacticipant)
         scope_for(DeployedVersion)
+          .currently_deployed
           .where(pacticipant_id: pacticipant.id)
           .eager(:environment)
           .all

data/lib/pact_broker/doc/views/index/latest-branch-pact-versions.markdown

@@ -2,6 +2,6 @@
 
  Allowed methods: `GET`
 
- Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest`
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest/versions`
 
  Returns the latest pact version with the specified consumer, provider and consumer version branch.

data/lib/pact_broker/doc/views/index/latest-main-branch-pact-versions.markdown

@@ -2,6 +2,6 @@
 
  Allowed methods: `GET`
 
- Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/latest`
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/latest/versions`
 
  Lists all latest pact version with the specified consumer, provider and the consumers main branch.

data/lib/pact_broker/doc/views/index/main-branch-pact-versions.markdown

@@ -2,6 +2,6 @@
 
  Allowed methods: `GET`
 
- Path: `/pacts/provider/{provider}/consumer/{consumer}/branch`
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/versions`
 
  Lists all the pact versions with the specified consumer, provider and the consumers main branch.

data/lib/pact_broker/domain/pacticipant.rb

@@ -55,11 +55,22 @@ module PactBroker
         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
+        delete_pact_versions_in_batches
         PactBroker::Domain::Label.where(pacticipant: self).destroy
         super
       end
 
+      BATCH_DELETE_SIZE = 500
+      def delete_pact_versions_in_batches
+        dataset = PactBroker::Pacts::PactVersion.where(consumer: self).or(provider: self).order(:id)
+        loop do
+          deleted = PactBroker::Pacts::PactVersion
+            .where(id: dataset.limit(BATCH_DELETE_SIZE).select(:id))
+            .delete
+          break if deleted.zero?
+        end
+      end
+
       def before_save
         super
         self.display_name = generate_display_name(name) if display_name.blank?

data/lib/pact_broker/logging.rb

@@ -52,6 +52,16 @@ module PactBroker
       end
     end
 
+    def measure_debug(message, payload: {})
+      if logger.respond_to?(:measure_debug)
+        logger.measure_debug(message, payload: payload) do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
     def log_error e, description = nil
       if logger.instance_of?(SemanticLogger::Logger)
         if description

data/lib/pact_broker/pacts/interactions/types.rb

@@ -0,0 +1,44 @@
+module PactBroker
+  module Pacts
+    module Interactions
+      class Types
+        # Pact Spec v4+ message interaction types
+        MESSAGE_TYPES = [
+          "Asynchronous/Messages",
+          "Synchronous/Messages"
+        ].freeze
+
+        def initialize(content)
+          @content = content
+        end
+
+        def self.for(content)
+          new(content)
+        end
+
+        def has_messages?
+          if spec_version < 4.0
+            # Pre-v4: messages in "messages" key
+            content.messages&.any? || false
+          else
+            # V4+: messages are typed interactions
+            content.interactions&.any? { |i| message_interaction?(i) } || false
+          end
+        end
+
+        private
+
+        attr_reader :content
+
+        def message_interaction?(interaction)
+          interaction.is_a?(Hash) &&
+            MESSAGE_TYPES.include?(interaction["type"])
+        end
+
+        def spec_version
+          content.pact_specification_version.to_f
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -287,9 +287,13 @@ module PactBroker
       # NEW LOGIC
       # @return [Sequel::Dataset<PactBroker::Pacts::PactPublication>]
       def for_all_tag_heads
+        # Optimization: Only aggregate tags for consumers that have pacts for this provider.
+        relevant_consumer_ids = self.select(:consumer_id).distinct
+
         head_tags = PactBroker::Domain::Tag
                       .select_group(:pacticipant_id, :name)
-                      .select_append{ max(version_order).as(:latest_version_order) }
+                      .select_append{ max(:version_order).as(:latest_version_order) }
+                      .where(pacticipant_id: relevant_consumer_ids)
 
         head_tags_join = {
           Sequel[:pact_publications][:consumer_id] => Sequel[:head_tags][:pacticipant_id],

data/lib/pact_broker/pacts/pact_publication_selector_dataset_module.rb

@@ -46,9 +46,18 @@ module PactBroker
 
       def for_main_branches
         consumers_join = { Sequel[:pact_publications][:consumer_id] => Sequel[:consumers][:id] }
-        query = self
-        query
+        branch_versions_join = {
+          Sequel[:branch_versions][:version_id] => Sequel[:pact_publications][:consumer_version_id],
+          Sequel[:branch_versions][:branch_name] => Sequel[:consumers][:main_branch]
+        }
+        base_query = self
+
+        if no_columns_selected?
+          base_query = base_query.select_all_qualified.select_append(Sequel[:branch_versions][:branch_name].as(:branch_name))
+        end
+        base_query
           .join(:pacticipants, consumers_join, { table_alias: :consumers })
+          .join(:branch_versions, branch_versions_join)
           .remove_overridden_revisions_from_complete_query
       end
 

data/lib/pact_broker/pacts/pact_publication_wip_dataset_module.rb

@@ -19,13 +19,19 @@ module PactBroker
           end
 
           def join_branch_versions_excluding_branch(provider_id, branch_name)
+            # Only check branches that have been active in the last N days
+            # to avoid old stale branches causing cartesian explosion.
+            # Filter by verification execution_date rather than version created_at
+            # to avoid incorrectly excluding old versions with recent verifications.
+            recent_branch_cutoff = DateTime.now - PactBroker.configuration.verified_by_other_branch_before_this_branch_look_back
+
             branch_versions_join = {
               Sequel[:verifications][:provider_version_id] => Sequel[:branch_versions][:version_id],
               Sequel[:branch_versions][:pacticipant_id] => provider_id
             }
-            join(:branch_versions, branch_versions_join) do
-              Sequel.lit("branch_versions.branch_name != ?", branch_name)
-            end
+            join(:branch_versions, branch_versions_join)
+              .where { Sequel[:verifications][:execution_date] >= recent_branch_cutoff }
+              .where { Sequel.lit("branch_versions.branch_name != ?", branch_name) }
           end
 
           def join_provider_versions_for_provider_id_and_branch(provider_id, provider_version_branch)
@@ -45,10 +51,13 @@ module PactBroker
       end
 
       def successfully_verified_by_provider_branch_when_not_wip(provider_id, provider_version_branch)
+        # Only check verifications from last N days (old verifications unlikely relevant for WIP)
+        recent_cutoff = DateTime.now - PactBroker.configuration.verified_by_other_branch_before_this_branch_look_back
         successful_verifications = VerificationForWipCalculations
                                      .select(:pact_version_id)
                                      .distinct
                                      .successful_non_wip_by_provider(provider_id)
+                                     .where { Sequel[:verifications][:execution_date] >= recent_cutoff }
                                      .join_provider_versions_for_provider_id_and_branch(provider_id, provider_version_branch)
 
 
@@ -65,8 +74,8 @@ module PactBroker
                                      .select(:pact_version_id)
                                      .distinct
                                      .successful_non_wip_by_provider(provider_id)
-                                     .join_branch_versions_excluding_branch(provider_id, provider_version_branch)
                                      .verified_before_creation_date_of(first_version_for_branch)
+                                     .join_branch_versions_excluding_branch(provider_id, provider_version_branch)
 
         from_self(alias: :pp)
           .select(Sequel[:pp].*)

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -57,7 +57,7 @@ module PactBroker
         end
 
         provider = pacticipant_repository.find_by_name(provider_name)
-        wip_start_date = options.fetch(:include_wip_pacts_since)
+        wip_start_date = determine_wip_start_date(provider, options)
 
         wip_by_consumer_tags = find_wip_pact_versions_for_provider_by_provider_tags(
           provider,
@@ -80,6 +80,94 @@ module PactBroker
 
       private
 
+      # Determine the WIP start date based on configuration and options
+      def determine_wip_start_date(provider, options)
+        dynamic_enabled = PactBroker.configuration.dynamic_wip_window_enabled?
+        logger.debug("Dynamic WIP window: #{dynamic_enabled ? 'enabled' : 'disabled'}") if logger.debug?
+        
+        if dynamic_enabled
+          calculate_wip_window(provider)
+        else
+          wip_start_date = options.fetch(:include_wip_pacts_since)
+          logger.debug("Using user-specified WIP window: #{wip_start_date}") if logger.debug?
+          wip_start_date
+        end
+      end
+
+      # Calculate optimal WIP window using P80 (80th percentile) of unverified pact ages
+      # Uses percentile instead of MAX to focus on active work and ignore abandoned pacts
+      # Returns: Date from N days ago (min 7 for weekly coverage, max 14 to align with query scope)
+      def calculate_wip_window(provider)
+        # Step 1: Get list of unverified pact ages in days (e.g., [2, 5, 7, 10, 12, 14])
+        unverified_ages = get_unverified_pact_ages_in_days(provider)
+        
+        # Step 2: If no unverified pacts, use default configured window
+        if unverified_ages.empty?
+          default_window = PactBroker.configuration.default_wip_window_days
+          logger.debug("No unverified pacts found for #{provider.name}, using default #{default_window}-day window") if logger.debug?
+          return Date.today - default_window
+        end
+
+        # Step 3: Calculate 80th percentile (ignore oldest 20% as abandoned work)
+        p80_age = percentile_80(unverified_ages)
+        
+        # Step 4: Ensure window is between configured min-max days, then return date
+        min_window = PactBroker.configuration.min_wip_window_days
+        max_window = PactBroker.configuration.max_wip_lookback_days
+        window_days = clamp_between(p80_age, min_window, max_window)
+        wip_start_date = Date.today - window_days
+        
+        if logger.debug?
+          logger.debug("Dynamic WIP window for #{provider.name}: found #{unverified_ages.size} unverified pacts, P80=#{p80_age} days, window=#{window_days} days (#{wip_start_date})")
+        end
+        
+        wip_start_date
+      rescue StandardError => e
+        default_window = PactBroker.configuration.default_wip_window_days
+        logger.error("Failed to calculate dynamic WIP window for provider #{provider.name}", error: e.class.name, message: e.message)
+        Date.today - default_window
+      end
+
+      # Get ages (in days) of pacts that haven't been successfully verified yet
+      # Only looks back the configured max_wip_lookback_days to keep query fast  
+      def get_unverified_pact_ages_in_days(provider)
+        max_days = PactBroker.configuration.max_wip_lookback_days
+        cutoff_date = DateTime.now - max_days
+        
+        # Use database-specific date arithmetic that works on both PostgreSQL and SQLite
+        # PostgreSQL: CURRENT_DATE - created_at::date returns integer days
+        # SQLite: julianday(date('now')) - julianday(date(created_at)) returns float days
+        db = PactPublication.db
+        age_expr = if db.database_type == :postgres
+                     Sequel.lit("CURRENT_DATE - ?::date", Sequel[:pact_publications][:created_at])
+                   else
+                     # SQLite
+                     Sequel.function(:julianday, Sequel.function(:date, "now")) -
+                     Sequel.function(:julianday, Sequel.function(:date, Sequel[:pact_publications][:created_at]))
+                   end
+        
+        PactPublication
+          .where(Sequel[:pact_publications][:provider_id] => provider.id)
+          .where { Sequel[:pact_publications][:created_at] >= cutoff_date }
+          .left_join(:verifications, { pact_version_id: :pact_version_id, success: true })
+          .where(Sequel[:verifications][:id] => nil)
+          .select_map { Sequel.cast(age_expr, :integer).as(:age_days) }
+          .compact
+      end
+
+      # Calculate 80th percentile: find value where 80% of data points are less than or equal
+      # Example: [2,3,5,7,10,12,14,20] → 80% index = 6 → value = 14
+      def percentile_80(values)
+        sorted = values.sort
+        index = [(sorted.length * 0.80).ceil - 1, 0].max
+        sorted[index]
+      end
+
+      # Constrain value between min and max bounds
+      def clamp_between(value, min, max)
+        [[value, max].min, min].max
+      end
+
       # Note: created_at is coming back as a string for sqlite
       # Can't work out how to to tell Sequel that this should be a date
       def to_datetime string_or_datetime
@@ -227,7 +315,7 @@ module PactBroker
 
       def find_wip_pact_versions_for_provider_by_provider_branch(provider_name, provider_version_branch, explicitly_specified_verifiable_pacts, options)
         provider = pacticipant_repository.find_by_name(provider_name)
-        wip_start_date = options.fetch(:include_wip_pacts_since)
+        wip_start_date = determine_wip_start_date(provider, options)
 
         potential_wip_by_consumer_branch = PactPublication.for_provider(provider).created_after(wip_start_date).for_all_branch_heads
         potential_wip_by_consumer_tag = PactPublication.for_provider(provider).created_after(wip_start_date).for_all_tag_heads

data/lib/pact_broker/pacts/repository.rb

@@ -14,6 +14,7 @@ require "pact_broker/pacts/selectors"
 require "pact_broker/feature_toggle"
 require "pact_broker/pacts/pacts_for_verification_repository"
 require "pact_broker/pacts/content"
+require "pact_broker/pacts/interactions/types"
 require "pact_broker/policies"
 
 module PactBroker
@@ -148,7 +149,7 @@ module PactBroker
           query = query.overall_latest
         end
 
-        query.all.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
+        query.all.sort.collect(&:to_head_pact)
       end
 
       def find_pacts_by_consumer_branch(provider_name, options = {})
@@ -178,7 +179,7 @@ module PactBroker
             query = query.for_branch_name(branch)
           end
         end
-        query.all.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
+        query.all.sort.collect(&:to_head_pact)
       end
 
       def find_for_verification(provider_name, consumer_version_selectors)
@@ -394,14 +395,16 @@ module PactBroker
       end
 
       def create_pact_version consumer_id, provider_id, sha, json_content
+        content = Content.from_json(json_content)
         PactBroker::Pacts::PactVersion.new(
           consumer_id: consumer_id,
           provider_id: provider_id,
           sha: sha,
           content: json_content,
           created_at: Sequel.datetime_class.now,
-          interactions_count: Content.from_json(json_content).interactions&.count || 0,
-          messages_count: Content.from_json(json_content).messages&.count || 0
+          interactions_count: content.interactions&.count || 0,
+          messages_count: content.messages&.count || 0,
+          has_messages: Interactions::Types.for(content).has_messages?
         ).upsert
       end
 

data/lib/pact_broker/pacts/service.rb

@@ -210,7 +210,7 @@ module PactBroker
 
       # When no publication for the given consumer/provider/consumer version number exists
       def create_pact(params, version, provider)
-        logger.info("Creating new pact publication", params.without(:json_content))
+        logger.debug("Creating new pact publication", params.without(:json_content))
         logger.debug("Content #{params[:json_content]}")
         json_content = add_interaction_ids(params[:json_content])
         pact = pact_repository.create(

data/lib/pact_broker/test/test_data_builder.rb

@@ -456,6 +456,9 @@ module PactBroker
         parameters = default_parameters.merge(parameters)
         parameters.delete(:provider_version)
         verification = PactBroker::Domain::Verification.new(parameters)
+        if pact.nil?
+          @pact = find_pact(@consumer.name, @consumer_version.number, @provider.name)
+        end
         pact_version = PactBroker::Pacts::Repository.new.find_pact_version(@consumer, @provider, pact.pact_version_sha)
         @provider_version = version_repository.find_by_pacticipant_id_and_number_or_create(provider.id, provider_version_number)
         branch_version = PactBroker::Versions::BranchVersionRepository.new.add_branch(@provider_version, branch) if branch
@@ -714,13 +717,16 @@ module PactBroker
       def default_json_content
         {
           "consumer" => {
-             "name" => consumer.name
-           },
-           "provider" => {
-             "name" => provider.name
-           },
-           "interactions" => [],
-           "random" => rand
+            "name" => consumer.name
+          },
+          "provider" => {
+            "name" => provider.name
+          },
+          "interactions" => [],
+          "metadata" => {
+            "pactSpecification" => { "version" => "4.0" }
+          },
+          "random" => rand
          }.to_json
       end
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.117.1"
+  VERSION = "2.119.0"
 end

data/lib/pact_broker/versions/branch_version_repository.rb

@@ -1,5 +1,6 @@
 require "pact_broker/versions/branch_version"
 require "pact_broker/services"
+require "pact_broker/logging"
 
 module PactBroker
   module Versions
@@ -21,16 +22,21 @@ module PactBroker
       end
 
       def add_branch(version, branch_name, auto_created: false)
-        branch = find_or_create_branch(version.pacticipant, branch_name)
-        branch_version = version.branch_version_for_branch(branch)
-        if branch_version
-          branch_version.update(updated_at: Sequel.datetime_class.now)
-        else
-          branch_version = PactBroker::Versions::BranchVersion.new(version: version, branch: branch, auto_created: auto_created).insert_ignore
-          PactBroker::Versions::BranchHead.new(branch: branch, branch_version: branch_version).upsert
+        PactBroker.logger.debug("BranchVersionRepository#add_branch method called with version #{version.inspect} and branch_name '#{branch_name}'")
+        Sequel::Model.db.transaction do
+          branch = find_or_create_branch(version.pacticipant, branch_name)
+          branch_version = version.branch_version_for_branch(branch)
+          if branch_version
+            PactBroker.logger.info("Updating branch version #{branch_version.inspect}, time: #{Time.now}")
+            branch_version.update(updated_at: Sequel.datetime_class.now)
+          else
+            PactBroker.logger.info("Creating branch version time: #{Time.now}")
+            branch_version = PactBroker::Versions::BranchVersion.new(version: version, branch: branch, auto_created: auto_created).insert_ignore
+            PactBroker::Versions::BranchHead.new(branch: branch, branch_version: branch_version).upsert
+          end
+          pacticipant_service.maybe_set_main_branch(version.pacticipant, branch_name)
+          branch_version
         end
-        pacticipant_service.maybe_set_main_branch(version.pacticipant, branch_name)
-        branch_version
       end
 
       # Deletes a branch version - that is, removes a version from a branch.

data/lib/pact_broker/webhooks/event_listener.rb

@@ -56,7 +56,7 @@ module PactBroker
         logger.debug("Event detected", event_name: event.name, event_comment: event.comment)
         if event.triggered_webhooks&.any?
           triggered_webhook_descriptions = event.triggered_webhooks.collect{ |tw| { event_name: event.name, webhook_uuid: tw.webhook_uuid, triggered_webhook_uuid: tw.uuid, webhook_description: tw.webhook.description } }
-          logger.info("Triggered webhooks for #{event.name}", triggered_webhooks: triggered_webhook_descriptions)
+          logger.debug("Triggered webhooks for #{event.name}", triggered_webhooks: triggered_webhook_descriptions)
         else
           logger.debug "No enabled webhooks found for event #{event.name}"
         end

data/lib/pact_broker/webhooks/execution_configuration.rb

@@ -53,6 +53,10 @@ module PactBroker
         with_updated_attribute(cert_store: value)
       end
 
+      def with_request_customizer(value)
+        with_updated_attribute(request_customizer: value)
+      end
+
       def webhook_context
         self[:webhook_context]
       end

data/lib/pact_broker/webhooks/redact_logs.rb

@@ -7,12 +7,12 @@ module PactBroker
 
       using PactBroker::StringRefinements
 
-      def redact_logs(logs, values)
-        RedactLogs.call(logs, values)
+      def redact_logs(logs, values, pattern_substitutions = [])
+        RedactLogs.call(logs, values, pattern_substitutions)
       end
 
-      def self.call logs, values
-        substitutions = HEADER_SUBSTITUTIONS + value_substitutions(values)
+      def self.call logs, values, pattern_substitutions = []
+        substitutions = HEADER_SUBSTITUTIONS + pattern_substitutions + value_substitutions(values)
 
         substitutions.reduce(logs) do | agg_logs, (find, replace) |
           agg_logs.gsub(find, replace)

data/lib/sequel/plugins/upsert.rb

@@ -68,6 +68,7 @@ module Sequel
         end
 
         def manual_upsert(opts)
+          sync_deserialized_values_to_values
           # Can use slice when we drop support for Ruby 2.4
           query = values.select{ |k, _| self.class.upsert_plugin_identifying_columns.include?(k) }
           existing_record = model.where(query).single_record
@@ -79,6 +80,12 @@ module Sequel
           end
         end
 
+        def sync_deserialized_values_to_values
+          if respond_to?(:deserialized_values) && deserialized_values.is_a?(Hash)
+            deserialized_values.each { |k, v| values[k] = v }
+          end
+        end
+
         # naughty override of Sequel private method to
         # avoid having to rewrite the whole save method logic
         def _insert_dataset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.117.1
+  version: 2.119.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -579,6 +579,13 @@ files:
 - db/migrations/20231002_add_version_id_index_to_released_version.rb
 - db/migrations/20231003_add_version_id_index_to_deployed_version.rb
 - db/migrations/20240112_add_client_language_verified_by_to_verification.rb
+- db/migrations/20251106_add_branch_versions_version_id_branch_name_index.rb
+- db/migrations/20251202_add_has_messages_column_to_pact_versions.rb
+- db/migrations/20251202_populate_has_messages_in_pact_versions.rb
+- db/migrations/20260119_add_index_on_consumer_id_provider_id_to_pact_versions.rb
+- db/migrations/20260123_drop_branch_versions_branch_name_index.rb
+- db/migrations/20260210_add_index_on_pact_version_id_to_latest_pact_publication.rb
+- db/migrations/20260217_add_wip_query_optimization_indexes.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
@@ -1001,6 +1008,7 @@ files:
 - lib/pact_broker/pacts/generate_interaction_sha.rb
 - lib/pact_broker/pacts/generate_sha.rb
 - lib/pact_broker/pacts/head_pact.rb
+- lib/pact_broker/pacts/interactions/types.rb
 - lib/pact_broker/pacts/latest_pact_publication_id_for_consumer_version.rb
 - lib/pact_broker/pacts/lazy_loaders.rb
 - lib/pact_broker/pacts/merger.rb
@@ -1287,7 +1295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: See description
 test_files: []