pact_broker 2.117.1 → 2.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52b0ab9c14e0eff3a49143fa09d4205ba9c1d9c16e96fd8e88bc74fb2b798d2
-  data.tar.gz: bf44ad81e1676d10d8af2912875726cdc50e91bbfbd10b02b62d689d7590fbaa
+  metadata.gz: 8d5c79b9a890f8984e3e2975740672d1b6c4810a88f750202692144d54b006b2
+  data.tar.gz: 4fb8df1387017108768afd83f9117cab1a4cf274ce9f4a66a0701ca848474b5d
 SHA512:
-  metadata.gz: 0f9ef0b473f58fd3b60c4c6e61125041bf93002d5cff4fe03f589583ca4bff47e719a23bd14220c18a78e0ce662cb0dfcda0947c94b253d96c7caf4bfdb55238
-  data.tar.gz: 8558c5f412cd6bbbdf21b1af7e235c7f3f78b6e871a7584d7654319758043c7652d341cab21e4b00c1f6014bd5e950bd7484a4eb1ec5e384dcb09237d8e0db2d
+  metadata.gz: f1916525083f39001b263ddcd4d41867dec84b640f76b1ce8cd5b8e50c8341ef7e340a6c3f85d129ca56db79984fba48b1e348751ebb19adf5400cbdeaea3808
+  data.tar.gz: e7d66f051526f19300d62bf772082324ba8774c03341380b9de219d7ce0b6113776124a4d88a66adaf1eade5b61667a38877036e76f3f29eb83bbfdbecc98410

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<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/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/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.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/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/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_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/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
@@ -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/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.118.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.info("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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.117.1
+  version: 2.118.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -579,6 +579,8 @@ 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/20251202_add_has_messages_column_to_pact_versions.rb
+- db/migrations/20251202_populate_has_messages_in_pact_versions.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
@@ -1001,6 +1003,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 +1290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: See description
 test_files: []