pact_broker 2.83.0 → 2.84.0

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

@@ -13,7 +13,9 @@ module PactBroker
 
         delegate [
           :consumer_version_branch,
+          :consumer_version_branches,
           :provider_version_branch,
+          :provider_version_branches,
           :latest_for_branch?,
           :consumer_version_environment_names,
           :provider_version_environment_names
@@ -206,6 +208,15 @@ module PactBroker
           @options[:base_url]
         end
 
+        def tagged_pacts
+          @relationship.tag_names.map do |tag|
+            {
+              tag: tag,
+              deletionUrl: PactBroker::Api::PactBrokerUrls.tagged_pact_versions_url(consumer_name, provider_name, tag, base_url)
+            }.to_json
+          end
+        end
+
         private
 
         attr_reader :relationship

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

@@ -0,0 +1,39 @@
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixBranch
+
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize branch_version, pacticipant_name
+          @branch_version = branch_version
+          @pacticipant_name = pacticipant_name
+        end
+
+        def name
+          branch_version.branch_name
+        end
+
+        def tooltip
+          if branch_version.latest?
+            "This is the latest version of #{pacticipant_name} from branch \"#{branch_version.branch_name}\"."
+          else
+            "A more recent version of #{pacticipant_name} from branch \"#{branch_version.branch_name}\" exists."
+          end
+        end
+
+        def latest?
+          branch_version.latest?
+        end
+
+        private
+
+        attr_reader :branch_version, :pacticipant_name
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ require "pact_broker/api/pact_broker_urls"
 require "pact_broker/ui/helpers/url_helper"
 require "pact_broker/date_helper"
 require "pact_broker/ui/view_models/matrix_tag"
+require "pact_broker/ui/view_models/matrix_branch"
 require "pact_broker/ui/view_models/matrix_deployed_version"
 require "pact_broker/ui/view_models/matrix_released_version"
 require "pact_broker/versions/abbreviate_number"
@@ -16,8 +17,6 @@ module PactBroker
         include PactBroker::Messages
         extend Forwardable
 
-        delegate [:consumer_version_branch, :provider_version_branch] => :line
-
         def initialize line, options = {}
           @line = line
           @options = options
@@ -103,20 +102,10 @@ module PactBroker
           end
         end
 
-        def consumer_version_branch_tooltip
-          branch_tooltip(consumer_name, consumer_version_branch, consumer_version_latest_for_branch?)
-        end
-
-        def consumer_version_latest_for_branch?
-          @line.consumer_version.latest_for_branch?
-        end
-
-        def provider_version_branch_tooltip
-          branch_tooltip(provider_name, provider_version_branch, provider_version_latest_for_branch?)
-        end
-
-        def provider_version_latest_for_branch?
-          @line.provider_version.latest_for_branch?
+        def consumer_version_branches
+          @line.consumer_version_branch_versions.collect do | branch_version |
+            MatrixBranch.new(branch_version, consumer_name)
+          end
         end
 
         def latest_consumer_version_tags
@@ -141,6 +130,12 @@ module PactBroker
           provider_deployed_versions + provider_released_versions
         end
 
+        def provider_version_branches
+          @line.provider_version_branch_versions.collect do | branch_version |
+            MatrixBranch.new(branch_version, provider_name)
+          end
+        end
+
         def latest_provider_version_tags
           @line.provider_version_tags
             .select(&:latest)

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

@@ -48,7 +48,11 @@
       %tbody
 
         - index_items.each do | index_item |
-          %tr{'data-pact-versions-url': index_item.pact_versions_url, 'data-consumer-name': index_item.consumer_name, 'data-provider-name': index_item.provider_name, 'data-integration-url': index_item.integration_url}
+          %tr{'data-pact-versions-url': index_item.pact_versions_url,
+              'data-consumer-name': index_item.consumer_name,
+              'data-provider-name': index_item.provider_name,
+              'data-integration-url': index_item.integration_url,
+              'data-tagged-pacts': index_item.tagged_pacts}
             %td.consumer
               %a{:href => index_item.consumer_group_url }
                 = index_item.consumer_name
@@ -58,10 +62,9 @@
                 - if index_item.display_consumer_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.copy-icon
-              - if index_item.consumer_version_branch
-                - branch_class = index_item.latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
-                %div{"class": branch_class}
-                  = "branch: " + index_item.consumer_version_branch
+              - index_item.consumer_version_branches.each do | branch_name |
+                %div{"class": "tag badge badge-dark"}
+                  = "branch: " + branch_name
               - index_item.consumer_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = "tag: " + tag_name
@@ -85,10 +88,9 @@
                 - if index_item.display_provider_version_number
                   %button.clippy.invisible{ title: "Copy to clipboard" }
                     %span.copy-icon
-              - if index_item.provider_version_branch
-                - branch_class = "tag badge badge-dark"
-                %div{"class": branch_class}
-                  = "branch: " + index_item.provider_version_branch
+              - index_item.provider_version_branches.each do | branch_name |
+                %div{"class": "tag badge badge-dark"}
+                  = "branch: " + branch_name
               - index_item.provider_version_latest_tag_names.each do | tag_name |
                 .tag.badge.badge-primary
                   = "tag: " + tag_name
@@ -108,8 +110,7 @@
                 - if index_item.warning?
                   %span.warning-icon{ 'aria-hidden': true }
             %td
-              - if index_item.show_settings?
-                %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
+              %span.integration-settings.kebab-horizontal{ 'aria-hidden': true }
 
     %div.pagination.text-center
 

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

@@ -136,11 +136,11 @@
               - if line.display_consumer_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
-            - if line.consumer_version_branch
-              .tag-parent{"title": line.consumer_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
-                - branch_class = line.consumer_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+            - line.consumer_version_branches.each do | branch |
+              .tag-parent{"title": branch.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = branch.latest? ? "tag badge badge-dark" : "tag badge badge-secondary"
                 %div{"class": branch_class}
-                  = "branch: " + line.consumer_version_branch
+                  = "branch: " + branch.name
             - line.consumer_versions_in_environments.each do | version_in_environment |
               .tag-parent{"title": version_in_environment.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: version_in_environment.url}
@@ -173,11 +173,11 @@
               - if line.display_provider_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
-            - if line.provider_version_branch
-              .tag-parent{"title": line.provider_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
-                - branch_class = line.provider_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+            - line.provider_version_branches.each do | branch |
+              .tag-parent{"title": branch.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = branch.latest? ? "tag badge badge-dark" : "tag badge badge-secondary"
                 %div{"class": branch_class}
-                  = "branch: " + line.provider_version_branch
+                  = "branch: " + branch.name
             - line.provider_versions_in_environments.each do | version_in_environment |
               .tag-parent{"title": version_in_environment.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: version_in_environment.url}

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.83.0"
+  VERSION = "2.84.0"
 end

data/lib/pact_broker/versions/branch.rb

@@ -0,0 +1,29 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class Branch < Sequel::Model(:branches)
+      plugin :timestamps, update_on_create: true
+      plugin :insert_ignore, identifying_columns: [:name, :pacticipant_id]
+
+      associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
+    end
+  end
+end
+
+# Table: branches
+# Columns:
+#  id             | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  name           | text                        |
+#  pacticipant_id | integer                     | NOT NULL
+#  created_at     | timestamp without time zone | NOT NULL
+#  updated_at     | timestamp without time zone | NOT NULL
+# Indexes:
+#  branches_pkey                      | PRIMARY KEY btree (id)
+#  branches_pacticipant_id_name_index | UNIQUE btree (pacticipant_id, name)
+# Foreign key constraints:
+#  branches_pacticipant_id_fkey | (pacticipant_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+# Referenced By:
+#  branch_heads    | branch_heads_branch_id_fkey | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_versions | branch_versions_branches_fk | (branch_id) REFERENCES branches(id) ON DELETE CASCADE

data/lib/pact_broker/versions/branch_head.rb

@@ -0,0 +1,45 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class BranchHead < Sequel::Model
+      plugin :upsert, identifying_columns: [:branch_id]
+      set_primary_key :branch_id
+      unrestrict_primary_key
+
+      associate(:many_to_one, :branch, :class => "PactBroker::Versions::Branch", :key => :branch_id, :primary_key => :id)
+      associate(:many_to_one, :branch_version, :class => "PactBroker::Versions::BranchVersion", :key => :branch_version_id, :primary_key => :id)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+
+      def before_save
+        super
+        self.pacticipant_id = branch.pacticipant_id
+        self.version_id = branch_version.version_id
+        self.branch_name = branch.name
+      end
+
+      def branch_name
+        branch.name
+      end
+    end
+  end
+end
+
+# Table: branch_heads
+# Columns:
+#  id                | integer | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  branch_id         | integer | NOT NULL
+#  branch_version_id | integer | NOT NULL
+#  version_id        | integer | NOT NULL
+#  pacticipant_id    | integer | NOT NULL
+#  branch_name       | text    | NOT NULL
+# Indexes:
+#  branch_heads_pkey                 | PRIMARY KEY btree (id)
+#  branch_heads_branch_id_index      | UNIQUE btree (branch_id)
+#  branch_heads_branch_name_index    | btree (branch_name)
+#  branch_heads_pacticipant_id_index | btree (pacticipant_id)
+#  branch_heads_version_id_index     | btree (version_id)
+# Foreign key constraints:
+#  branch_heads_branch_id_fkey         | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_heads_branch_version_id_fkey | (branch_version_id) REFERENCES branch_versions(id) ON DELETE CASCADE

data/lib/pact_broker/versions/branch_service.rb

@@ -0,0 +1,24 @@
+require "pact_broker/logging"
+require "pact_broker/repositories"
+require "pact_broker/messages"
+
+module PactBroker
+  module Versions
+    class BranchService
+      extend PactBroker::Repositories
+
+      def self.find_branch_version(pacticipant_name:, branch_name:, version_number:, **)
+        BranchVersion.where(
+          version: PactBroker::Domain::Version.where_pacticipant_name_and_version_number(pacticipant_name, version_number),
+          branch: Branch.where(name: branch_name)
+        ).single_record
+      end
+
+      def self.find_or_create_branch_version(pacticipant_name:, branch_name:, version_number:, **)
+        pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
+        version = version_repository.find_by_pacticipant_id_and_number_or_create(pacticipant.id, version_number)
+        branch_version_repository.add_branch(version, branch_name)
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/branch_version.rb

@@ -0,0 +1,64 @@
+require "pact_broker/db"
+require "pact_broker/repositories/helpers"
+
+module PactBroker
+  module Versions
+    class BranchVersion < Sequel::Model(:branch_versions)
+      plugin :timestamps, update_on_create: true
+      plugin :insert_ignore, identifying_columns: [:branch_id, :version_id]
+      plugin :upsert, identifying_columns: [:branch_id, :version_id]
+
+      associate(:many_to_one, :branch, :class => "PactBroker::Versions::Branch", :key => :branch_id, :primary_key => :id)
+      associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
+      associate(:many_to_one, :branch_head, :class => "PactBroker::Versions::BranchHead", :key => :branch_id, :primary_key => :branch_id)
+
+      dataset_module do
+        def find_latest_for_branch(branch)
+          max_version_order = BranchVersion.select(Sequel.function(:max, :version_order)).where(branch_id: branch.id)
+          BranchVersion.where(branch_id: branch.id, version_order: max_version_order).single_record
+        end
+      end
+
+      def before_save
+        super
+        self.version_order = version.order
+        self.pacticipant_id = version.pacticipant_id
+        self.branch_name = branch.name
+      end
+
+      def latest?
+        branch_head.branch_version_id == id
+      end
+
+      def version_number
+        version.number
+      end
+
+      def pacticipant
+        branch.pacticipant
+      end
+    end
+  end
+end
+
+# Table: branch_versions
+# Columns:
+#  id             | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  branch_id      | integer                     | NOT NULL
+#  version_id     | integer                     | NOT NULL
+#  version_order  | integer                     | NOT NULL
+#  pacticipant_id | integer                     | NOT NULL
+#  branch_name    | text                        | NOT NULL
+#  created_at     | timestamp without time zone | NOT NULL
+#  updated_at     | timestamp without time zone | NOT NULL
+# Indexes:
+#  branch_versions_pkey                                         | PRIMARY KEY btree (id)
+#  branch_versions_branch_id_version_id_index                   | UNIQUE btree (branch_id, version_id)
+#  branch_versions_branch_name_index                            | btree (branch_name)
+#  branch_versions_pacticipant_id_branch_id_version_order_index | btree (pacticipant_id, branch_id, version_order)
+#  branch_versions_version_id_index                             | btree (version_id)
+# Foreign key constraints:
+#  branch_versions_branches_fk | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
+#  branch_versions_versions_fk | (version_id) REFERENCES versions(id) ON DELETE CASCADE
+# Referenced By:
+#  branch_heads | branch_heads_branch_version_id_fkey | (branch_version_id) REFERENCES branch_versions(id) ON DELETE CASCADE

data/lib/pact_broker/versions/branch_version_repository.rb

@@ -0,0 +1,34 @@
+module PactBroker
+  module Versions
+    class BranchVersionRepository
+      include PactBroker::Services
+
+      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
+        end
+        pacticipant_service.maybe_set_main_branch(version.pacticipant, branch_name)
+        branch_version
+      end
+
+      private
+
+      def find_or_create_branch(pacticipant, branch_name)
+        find_branch(pacticipant, branch_name) || create_branch(pacticipant, branch_name)
+      end
+
+      def find_branch(pacticipant, branch_name)
+        PactBroker::Versions::Branch.where(pacticipant: pacticipant, name: branch_name).single_record
+      end
+
+      def create_branch(pacticipant, branch_name)
+        PactBroker::Versions::Branch.new(pacticipant: pacticipant, name: branch_name).insert_ignore
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/eager_loaders.rb

@@ -1,48 +1,6 @@
 module PactBroker
   module Versions
     module EagerLoaders
-      class LatestVersionForBranch
-        def self.call(eo, **_other)
-          initialize_association(eo[:rows])
-          populate_associations(eo[:rows])
-        end
-
-        def self.initialize_association(versions)
-          versions.each{|version| version.associations[:latest_version_for_branch] = nil }
-        end
-
-        def self.populate_associations(versions)
-          group_by_pacticipant_id(versions).each do | pacticipant, participant_versions |
-            populate_associations_by_pacticipant(pacticipant, participant_versions)
-          end
-        end
-
-        def self.group_by_pacticipant_id(versions)
-          versions.to_a.group_by(&:pacticipant_id)
-        end
-
-        def self.populate_associations_by_pacticipant(pacticipant_id, versions)
-          latest_versions_for_branches = latest_versions_for_pacticipant_branches(
-            pacticipant_id,
-            versions.collect(&:branch).uniq.compact,
-            versions.first.class
-          )
-          self.populate_versions_with_branches(versions, latest_versions_for_branches)
-        end
-
-        def self.populate_versions_with_branches(versions, latest_versions_for_branches)
-          versions.select(&:branch).each do | version |
-            version.associations[:latest_version_for_branch] = latest_versions_for_branches[[version.pacticipant_id, version.branch]]
-          end
-        end
-
-        def self.latest_versions_for_pacticipant_branches(pacticipant_id, branches, version_class)
-          version_class.latest_versions_for_pacticipant_branches(pacticipant_id, branches).each_with_object({}) do | row, hash |
-            hash[[row.pacticipant_id, row.branch]] = row
-          end
-        end
-      end
-
       class LatestVersionForPacticipant
         def self.call(eo, **_other)
           populate_associations(eo[:rows])