pact_broker 2.117.0 → 2.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a321653a387b5b79c1929494938563e608901abf69bdf97c99062e6b97570d
-  data.tar.gz: b3b33dee60c7a5cdf1ad8471929821ad4f5c8ee07c9c8e54d147c0cc590b7492
+  metadata.gz: 8d5c79b9a890f8984e3e2975740672d1b6c4810a88f750202692144d54b006b2
+  data.tar.gz: 4fb8df1387017108768afd83f9117cab1a4cf274ce9f4a66a0701ca848474b5d
 SHA512:
-  metadata.gz: afb8062161928832aa645ca3f9b611e7d5969a7ee23de3987f3c4eda24f0efe4bfd0a393894225ac1836e4da4bee4d05fe3d3ada1f898292e3269ca8259e8675
-  data.tar.gz: 80da5823d947745d6c165bd744693886e8e744f32bbe218bd2fe61b328b0bcd95712c8f7140cdc6ce73db6293e3c6ebfdb3ed5d229a704b6299c188806d95b9e
+  metadata.gz: f1916525083f39001b263ddcd4d41867dec84b640f76b1ce8cd5b8e50c8341ef7e340a6c3f85d129ca56db79984fba48b1e348751ebb19adf5400cbdeaea3808
+  data.tar.gz: e7d66f051526f19300d62bf772082324ba8774c03341380b9de219d7ce0b6113776124a4d88a66adaf1eade5b61667a38877036e76f3f29eb83bbfdbecc98410

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+<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)
+
+#### Bug Fixes
+
+* dashboard loading after zeitwerk rename prep	 ([13112e2f](/../../commit/13112e2f))
+
 <a name="v2.117.0"></a>
 ### v2.117.0 (2025-10-28)
 

data/Gemfile

@@ -21,7 +21,13 @@ end
 
 group :test do
   gem "simplecov", :require => false
-  gem "pact", "~>1.14"
+  if ENV["X_PACT_DEVELOPMENT"] == "true"
+    gem "pact", path: "../pact-ruby"
+    gem "pact-ffi", path: "../pact-ruby-ffi"
+  else
+    gem "pact", "~>1.14"
+    gem "pact-ffi", "~>0.4.28"
+  end
   gem "rspec-pact-matchers", "~>0.1"
   gem "bundler-audit", "~>0.4"
   gem "webmock", "~>3.9"

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/contracts/pacts_for_verification_json_query_schema.rb

@@ -5,7 +5,7 @@ require "pact_broker/logging"
 module PactBroker
   module Api
     module Contracts
-      class PactsForVerificationJSONQuerySchema < BaseContract
+      class PactsForVerificationJsonQuerySchema < BaseContract
         json do
           optional(:providerVersionBranch).maybe(:string)
           optional(:providerVersionTags).maybe(:array?)

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

@@ -19,7 +19,7 @@ module PactBroker
         def process_post
           if content_type_json?
             keep_selectors = (params[:keep] || []).collect do | hash |
-              PactBroker::Matrix::UnresolvedSelector.new(hash)
+              PactBroker::DB::Clean::Selector.new(hash)
             end
 
             result = PactBroker::DB::Clean.call(Sequel::Model.db, { keep: keep_selectors })

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

@@ -73,9 +73,9 @@ module PactBroker
 
         def schema
           if request.get?
-            PactBroker::Api::Contracts::PactsForVerificationQueryStringSchema
+            api_contract_class(:pacts_for_verification_query_string_schema)
           elsif request.post?
-            PactBroker::Api::Contracts::PactsForVerificationJSONQuerySchema
+            api_contract_class(:pacts_for_verification_json_query_schema)
           end
         end
 

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/app.rb

@@ -23,7 +23,6 @@ require "rack/pact_broker/application_context"
 require "sucker_punch"
 require "pact_broker/api/middleware/configuration"
 require "pact_broker/api/middleware/basic_auth"
-require "pact_broker/config/basic_auth_configuration"
 require "pact_broker/api/authorization/resource_access_policy"
 require "pact_broker/api/middleware/http_debug_logs"
 require "pact_broker/application_context"

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/basic_auth_configuration"
-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.rb

@@ -3,7 +3,7 @@ require "pact_broker/dataset"
 require "pact_broker/domain/pact"
 require "pact_broker/pacts/pact_version"
 require "pact_broker/integrations/integration"
-require "pact_broker/tags/head_pact_tags"
+require "pact_broker/tags/head_pact_tag"
 require "pact_broker/pacts/pact_publication_dataset_module"
 require "pact_broker/pacts/pact_publication_wip_dataset_module"
 require "pact_broker/pacts/eager_loaders"

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/tasks/clean_task.rb

@@ -2,6 +2,7 @@
 # to stop performance issues from slowing down responses when there is
 # too much data.
 # See https://docs.pact.io/pact_broker/administration/maintenance
+require "rake/tasklib"
 
 module PactBroker
   module DB

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/ui/controllers/can_i_deploy.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/matrix_lines"
 require "pact_broker/matrix/unresolved_selector"
 require "pact_broker/matrix/parse_query"
@@ -20,7 +20,7 @@ module PactBroker
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:pacticipant_name], latest: true, tag: params[:tag]) ]
           options = { latestby: "cvp", limit: 100, tag: params[:to] }
           result = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(result, base_url: base_url)
+          lines = PactBroker::UI::ViewModels::MatrixLines.new(result, base_url: base_url)
           locals = {
             lines: lines,
             selectors: create_selector_objects(selectors),

data/lib/pact_broker/ui/controllers/clusters.rb

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         get "/" do
-          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
+          view_model = PactBroker::UI::ViewModels::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
           haml "clusters/show", locals: { relationships: view_model, base_url: base_url }, escape_html: true
         end
 

data/lib/pact_broker/ui/controllers/dashboard.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "haml"
 
@@ -44,7 +44,7 @@ module PactBroker
                           []
                         end
 
-          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url, view: view)
+          view_index_items = PactBroker::UI::ViewModels::IndexItems.new(index_items, base_url: base_url, view: view)
 
           page = :'dashboard/show'
           locals = {

data/lib/pact_broker/ui/controllers/error_test.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/logging"
 require "pact_broker/error"
 

data/lib/pact_broker/ui/controllers/groups.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "haml"
 

data/lib/pact_broker/ui/controllers/index.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "pact_broker/string_refinements"
 require "haml"
@@ -33,7 +33,7 @@ module PactBroker
             error_messages << "No pacticipants found matching: \"#{search}\""
           end
 
-          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url)
+          view_index_items = PactBroker::UI::ViewModels::IndexItems.new(index_items, base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
           locals = {

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/matrix_lines"
 require "pact_broker/matrix/unresolved_selector"
 require "pact_broker/matrix/parse_query"
@@ -32,7 +32,7 @@ module PactBroker
               errors = matrix_service.validate_selectors(selectors, options)
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
-                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
+                locals[:lines] = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url)
                 locals[:badge_url] = matrix_badge_url(selectors, lines, base_url)
               else
                 locals[:errors] = errors
@@ -52,7 +52,7 @@ module PactBroker
                       ]
           options = { latestby: "cvpv", limit: 100 }
           lines = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
+          lines = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url)
           locals =  {
                       lines: lines,
                       consumer_name: params[:consumer_name],

data/lib/pact_broker/ui/controllers/pacts.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 
 module PactBroker
   module UI

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

@@ -9,7 +9,7 @@ require "forwardable"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItem
         extend Forwardable
 

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItemBranchHead
 
         include PactBroker::Api::PactBrokerUrls

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItemProviderBranchHead
 
         include PactBroker::Api::PactBrokerUrls

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

@@ -2,7 +2,7 @@ require "pact_broker/ui/view_models/index_item"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItems
 
         attr_reader :pagination_record_count

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixBranch
 
         include PactBroker::Api::PactBrokerUrls

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixDeployedVersion
         include PactBroker::Api::PactBrokerUrls
 

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

@@ -11,7 +11,7 @@ require "forwardable"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixLine
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Messages

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

@@ -2,12 +2,12 @@ require "pact_broker/ui/view_models/matrix_line"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixLines < Array
 
         def initialize rows, options = {}
           lines = rows.collect do | row |
-            PactBroker::UI::ViewDomain::MatrixLine.new(row, options)
+            PactBroker::UI::ViewModels::MatrixLine.new(row, options)
           end
           super(lines.sort)
         end

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixReleasedVersion
         include PactBroker::Api::PactBrokerUrls
 

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

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixTag
         include PactBroker::Api::PactBrokerUrls
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.117.0"
+  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.0
+  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
@@ -805,10 +807,10 @@ files:
 - lib/pact_broker/build_http_options.rb
 - lib/pact_broker/certificates/certificate.rb
 - lib/pact_broker/certificates/service.rb
-- lib/pact_broker/config/basic_auth_configuration.rb
 - lib/pact_broker/config/load.rb
 - lib/pact_broker/config/repository.rb
 - lib/pact_broker/config/runtime_configuration.rb
+- lib/pact_broker/config/runtime_configuration_basic_auth_methods.rb
 - lib/pact_broker/config/runtime_configuration_coercion_methods.rb
 - lib/pact_broker/config/runtime_configuration_database_methods.rb
 - lib/pact_broker/config/runtime_configuration_logging_methods.rb
@@ -823,7 +825,6 @@ files:
 - lib/pact_broker/contracts/contracts_to_publish.rb
 - lib/pact_broker/contracts/notice.rb
 - lib/pact_broker/contracts/service.rb
-- lib/pact_broker/dashboard/service.rb
 - lib/pact_broker/dataset.rb
 - lib/pact_broker/dataset/page.rb
 - lib/pact_broker/date_helper.rb
@@ -1002,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
@@ -1035,7 +1037,7 @@ files:
 - lib/pact_broker/services.rb
 - lib/pact_broker/string_refinements.rb
 - lib/pact_broker/tags/eager_loaders.rb
-- lib/pact_broker/tags/head_pact_tags.rb
+- lib/pact_broker/tags/head_pact_tag.rb
 - lib/pact_broker/tags/repository.rb
 - lib/pact_broker/tags/service.rb
 - lib/pact_broker/tasks.rb
@@ -1048,7 +1050,7 @@ files:
 - lib/pact_broker/test/test_data_builder.rb
 - lib/pact_broker/ui.rb
 - lib/pact_broker/ui/app.rb
-- lib/pact_broker/ui/controllers/base_controller.rb
+- lib/pact_broker/ui/controllers/base.rb
 - lib/pact_broker/ui/controllers/can_i_deploy.rb
 - lib/pact_broker/ui/controllers/clusters.rb
 - lib/pact_broker/ui/controllers/dashboard.rb
@@ -1060,7 +1062,6 @@ files:
 - lib/pact_broker/ui/helpers/haml_helpers.rb
 - lib/pact_broker/ui/helpers/matrix_helper.rb
 - lib/pact_broker/ui/helpers/url_helper.rb
-- lib/pact_broker/ui/view_models/clusters.rb
 - lib/pact_broker/ui/view_models/index_item.rb
 - lib/pact_broker/ui/view_models/index_item_branch_head.rb
 - lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb
@@ -1289,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: []