pact_broker 2.107.1 → 2.108.0

data/lib/pact_broker/repositories.rb

@@ -47,6 +47,10 @@ module PactBroker
       get_repository(:matrix_repository)
     end
 
+    def branch_repository
+      get_repository(:branch_repository)
+    end
+
     def branch_version_repository
       get_repository(:branch_version_repository)
     end
@@ -96,6 +100,11 @@ module PactBroker
         Matrix::Repository.new
       end
 
+      register_repository(:branch_repository) do
+        require "pact_broker/versions/branch_repository"
+        PactBroker::Versions::BranchRepository.new
+      end
+
       register_repository(:branch_version_repository) do
         require "pact_broker/versions/branch_version_repository"
         PactBroker::Versions::BranchVersionRepository.new
@@ -105,7 +114,6 @@ module PactBroker
         require "pact_broker/integrations/repository"
         PactBroker::Integrations::Repository.new
       end
-
       # rubocop: enable Metrics/MethodLength
     end
   end

data/lib/pact_broker/string_refinements.rb

@@ -37,6 +37,10 @@ module PactBroker
     end
 
     refine String do
+      def integer?
+        self =~ /^\d+$/
+      end
+
       def present?
         !blank?
       end

data/lib/pact_broker/tags/head_pact_tags.rb

@@ -1,12 +1,9 @@
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
+require "pact_broker/dataset"
 
 module PactBroker
   module Tags
     class HeadPactTag < Sequel::Model
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-      end
+      dataset_module(PactBroker::Dataset)
     end
   end
 end

data/lib/pact_broker/tags/repository.rb

@@ -1,12 +1,8 @@
 require "pact_broker/domain/tag"
-require "pact_broker/repositories/helpers"
 
 module PactBroker
   module Tags
     class Repository
-
-      include PactBroker::Repositories::Helpers
-
       def create args
         params = {
           name: args.fetch(:name),
@@ -22,9 +18,9 @@ module PactBroker
           .select_all_qualified
           .join(:versions, { id: :version_id })
           .join(:pacticipants, {Sequel.qualify("pacticipants", "id") => Sequel.qualify("versions", "pacticipant_id")})
-          .where(name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
-          .where(name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
-          .where(name_like(Sequel.qualify("pacticipants", "name"), args.fetch(:pacticipant_name)))
+          .where(Sequel.name_like(Sequel.qualify("tags", "name"), args.fetch(:tag_name)))
+          .where(Sequel.name_like(Sequel.qualify("versions", "number"), args.fetch(:pacticipant_version_number)))
+          .where(Sequel.name_like(Sequel.qualify("pacticipants", "name"), args.fetch(:pacticipant_name)))
           .single_record
       end
 

data/lib/pact_broker/test/test_data_builder.rb

@@ -31,6 +31,8 @@ require "pact_broker/deployments/released_version_service"
 require "pact_broker/versions/branch_version_repository"
 require "pact_broker/integrations/repository"
 require "pact_broker/contracts/service"
+require "pact_broker/contracts/contract_to_publish"
+require "pact_broker/contracts/contracts_to_publish"
 
 require "ostruct"
 
@@ -86,6 +88,12 @@ module PactBroker
         self
       end
 
+      # Creates a consumer, consumer version, provider and pact with the specified JSON content
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version_number
+      # @param [Strig] provider_name
+      # @param [String] json_content
       def create_pact_with_hierarchy consumer_name = "Consumer", consumer_version_number = "1.2.3", provider_name = "Provider", json_content = nil
         use_consumer(consumer_name)
         create_consumer(consumer_name) if !consumer
@@ -97,18 +105,39 @@ module PactBroker
         self
       end
 
+      # Creates a consumer, consumer version with tag, provider and pact
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version_number
+      # @param [String] consumer_version_tag_name
+      # @param [Strig] provider_name
       def create_pact_with_consumer_version_tag consumer_name, consumer_version_number, consumer_version_tag_name, provider_name
         create_pact_with_hierarchy(consumer_name, consumer_version_number, provider_name)
         create_consumer_version_tag(consumer_version_tag_name)
         self
       end
 
+      # Creates a consumer, consumer version, provider, pact and verification
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version
+      # @param [String] provider_name
+      # @param [String] provider_version
+      # @param [Boolean] success default true
       def create_pact_with_verification consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", provider_name = "Provider", provider_version = "1.0.#{model_counter}", success = true
         create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
         create_verification(number: model_counter, provider_version: provider_version, success: success)
         self
       end
 
+      # Creates a consumer, consumer version, provider, pact and verification
+      # Does NOT rely on previous state.
+      # @param [String] consumer_name
+      # @param [String] consumer_version
+      # @param [Array<String>] consumer_version_tags
+      # @param [String] provider_name
+      # @param [String] provider_version
+      # @param [Array<String>] provider_version_tags
       def create_pact_with_verification_and_tags consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", consumer_version_tags = [], provider_name = "Provider", provider_version = "1.0.#{model_counter}", provider_version_tags = []
         create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
         consumer_version_tags.each do | tag |
@@ -118,6 +147,10 @@ module PactBroker
         self
       end
 
+      # Create a pacticipant and version
+      # Does NOT rely on previous state
+      # @param [String] pacticipant_name
+      # @param [String] pacticipant_version
       def create_version_with_hierarchy pacticipant_name, pacticipant_version
         pacticipant = pacticipant_service.create(:name => pacticipant_name)
         version = PactBroker::Domain::Version.create(:number => pacticipant_version, :pacticipant => pacticipant)
@@ -386,6 +419,14 @@ module PactBroker
         self
       end
 
+      # @param [Hash] parameters
+      # @option parameters [String] :provider_version
+      # @option parameters [Array<String>] :tag_names
+      # @option parameters [String] :branch
+      # @option parameters [Boolean] :success
+      # @option parameters [Integer] :number
+      # @option parameters [Boolean] :wip
+      # @option parameters [Boolean] :test_results
       def create_verification parameters = {}
         # This should use the verification service. what a mess
         parameters.delete(:comment)
@@ -493,6 +534,10 @@ module PactBroker
         instance_variable_get("@#{instance_variable_name}")
       end
 
+      def clear_now
+        @now = nil
+      end
+
       def set_now date
         @now = date.to_date
         self
@@ -602,6 +647,10 @@ module PactBroker
           tag = PactBroker::Domain::Tag.create(name: tag_name, version: version)
           set_created_at_if_set(params[:created_at], :tags, { name: tag.name, version_id: version.id })
         end
+        if params[:branch]
+          set_created_at_if_set params[:created_at], :branches, { name: params[:branch], pacticipant_id: pacticipant.id }
+          set_created_at_if_set params[:created_at], :branch_versions, { branch_name: params[:branch], pacticipant_id: pacticipant.id, version_id: version.id }
+        end
         version
       end
 
@@ -638,7 +687,7 @@ module PactBroker
         if date_to_set
           Sequel::Model.db[table_name].where(selector).update(date_column_name => date_to_set)
           if Sequel::Model.db.schema(table_name).any?{ |col| col.first == :updated_at }
-            Sequel::Model.db[table_name].where(selector.keys.first => selector.values.first).update(updated_at: date_to_set)
+            Sequel::Model.db[table_name].where(selector).update(updated_at: date_to_set)
           end
         end
       end

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

@@ -30,12 +30,13 @@ module PactBroker
           pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           {
             csv_path: "#{base_url}/groups/#{ERB::Util.url_encode(params[:name])}.csv",
+            max_pacticipants: PactBroker.configuration.network_diagram_max_pacticipants,
             pacticipant_name: params[:name],
             repository_url: pacticipant&.repository_url,
             base_url: base_url,
             pacticipant: pacticipant,
             details_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}",
-            network_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}/network"
+            network_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}/network?maxPacticipants=#{PactBroker.configuration.network_diagram_max_pacticipants}"
           }.merge(overrides)
         end
       end

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

@@ -110,14 +110,14 @@ module PactBroker
 
         def latest_consumer_version_tags
           @line.consumer_version_tags
-            .select(&:latest)
+            .select(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
         def other_consumer_version_tags
           @line.consumer_version_tags
-            .reject(&:latest)
+            .reject(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
@@ -138,14 +138,14 @@ module PactBroker
 
         def latest_provider_version_tags
           @line.provider_version_tags
-            .select(&:latest)
+            .select(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end
 
         def other_provider_version_tags
           @line.provider_version_tags
-            .reject(&:latest)
+            .reject(&:latest?)
             .sort_by(&:created_at)
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
         end

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -329,8 +329,9 @@ window.onload = function() {
         .attr("d","M 10 0 L 10 10 L 0 5 z")
         .attr("fill", "#A0A0A0");
 
+    const maxPacticipants = new URL(location).searchParams.get("maxPacticipants") || <%= max_pacticipants %>;
 
-    d3.text("<%= csv_path %>", "text/csv", function(unparsedData) {
+    d3.text(`<%= csv_path %>?maxPacticipants=${maxPacticipants}`, "text/csv", function(unparsedData) {
         var data=d3.csv.parseRows(unparsedData);
         pacticipants = parseCSV(data);
         pacticipantNameArray = getPacticipantNames(pacticipants);

data/lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb

@@ -2,9 +2,6 @@ require "pact_broker/domain/verification"
 
 module PactBroker
   module Verifications
-
-    include PactBroker::Repositories::Helpers
-
     class LatestVerificationForConsumerAndProvider < PactBroker::Domain::Verification
       set_dataset(:latest_verifications_for_consumer_and_provider)
 

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -1,4 +1,4 @@
-require "pact_broker/domain/verification"
+require "pact_broker/dataset"
 
 module PactBroker
   module Verifications
@@ -8,9 +8,7 @@ module PactBroker
 
       plugin :upsert, identifying_columns: [:pact_version_id, :provider_version_id]
 
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-      end
+      dataset_module(PactBroker::Dataset)
     end
   end
 end

data/lib/pact_broker/verifications/repository.rb

@@ -1,4 +1,3 @@
-require "sequel"
 require "pact_broker/domain/verification"
 require "pact_broker/verifications/sequence"
 require "pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version"
@@ -8,8 +7,6 @@ require "pact_broker/repositories/scopes"
 module PactBroker
   module Verifications
     class Repository
-
-      include PactBroker::Repositories::Helpers
       include PactBroker::Repositories
       include PactBroker::Repositories::Scopes
 
@@ -140,8 +137,8 @@ module PactBroker
         consumer = pacticipant_repository.find_by_name!(consumer_name)
         provider = pacticipant_repository.find_by_name!(provider_name)
 
-        consumer_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:consumer_tags, :name), consumer_version_tag)
-        provider_tag_filter = PactBroker::Repositories::Helpers.name_like(Sequel.qualify(:provider_tags, :name), provider_version_tag)
+        consumer_tag_filter = Sequel.name_like(Sequel.qualify(:consumer_tags, :name), consumer_version_tag)
+        provider_tag_filter = Sequel.name_like(Sequel.qualify(:provider_tags, :name), provider_version_tag)
 
         query = scope_for(PactBroker::Domain::Verification)
           .select_all_qualified

data/lib/pact_broker/verifications/sequence.rb

@@ -1,6 +1,3 @@
-require "sequel"
-require "pact_broker/repositories/helpers"
-
 module PactBroker
   module Verifications
     class Sequence < Sequel::Model(:verification_sequence_number)
@@ -8,7 +5,7 @@ module PactBroker
         # The easiest way to implement a cross database compatible sequence.
         # Sad, I know.
         def next_val
-          if PactBroker::Repositories::Helpers.postgres?
+          if PactBroker::Dataset::Helpers.postgres?
             db.execute("SELECT nextval('verification_number_sequence') as val") { |v| v.first["val"].to_i }
           else
             db.transaction do

data/lib/pact_broker/verifications/service.rb

@@ -31,6 +31,10 @@ module PactBroker
 
       # TODO use a decorator instead of passing in params, srsly, Beth
       # verified_pacts is an array of SelectedPact objects
+      # @param [Integer] next_verification_number
+      # @param [Hash] params the verification params
+      # @param [Array<SelectedPact>] verified_pacts
+      # @param [Hash] event_context
       def create next_verification_number, params, verified_pacts, event_context
         first_verified_pact = verified_pacts.first
         logger.info("Creating verification #{next_verification_number} for pact_version_sha=#{first_verified_pact.pact_version_sha}", params.without("testResults"))

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.107.1"
+  VERSION = "2.108.0"
 end

data/lib/pact_broker/versions/branch.rb

@@ -1,5 +1,4 @@
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
+require "pact_broker/dataset"
 
 module PactBroker
   module Versions
@@ -11,9 +10,7 @@ module PactBroker
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       associate(:one_to_many, :branch_versions, :class => "PactBroker::Versions::BranchVersion", :key => :branch_id, :primary_key => :id)
 
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-      end
+      dataset_module(PactBroker::Dataset)
     end
   end
 end

data/lib/pact_broker/versions/branch_head.rb

@@ -1,6 +1,3 @@
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
-
 module PactBroker
   module Versions
     class BranchHead < Sequel::Model

data/lib/pact_broker/versions/branch_repository.rb

@@ -0,0 +1,76 @@
+require "pact_broker/repositories/scopes"
+module PactBroker
+  module Versions
+    class BranchRepository
+      include PactBroker::Services
+      include PactBroker::Repositories::Scopes
+
+      # @param [PactBroker::Domain::Pacticipant] pacticipant
+      # @param [Hash] filter_options with key :query_string
+      # @param [Hash] pagination_options with keys :page_size and :page_number
+      # @param [Array] eager_load_associations the associations to eager load
+      def find_all_branches_for_pacticipant(pacticipant, filter_options = {}, pagination_options = {}, eager_load_associations = [])
+        query = scope_for(Branch).where(pacticipant_id: pacticipant.id).select_all_qualified
+        query = query.filter(:name, filter_options[:query_string]) if filter_options[:query_string]
+        query
+          .order(Sequel.desc(:created_at), Sequel.desc(:id))
+          .eager(*eager_load_associations)
+          .all_with_pagination_options(pagination_options)
+      end
+
+      # @param [String] pacticipant_name
+      # @param [String] branch_name
+      # @return [PactBroker::Versions::Branch, nil]
+      def find_branch(pacticipant_name:, branch_name:)
+        Branch
+          .select_all_qualified
+          .join(:pacticipants, { Sequel[:branches][:pacticipant_id] => Sequel[:pacticipants][:id] }) do
+            Sequel.name_like(Sequel[:pacticipants][:name], pacticipant_name)
+          end
+          .where(Sequel[:branches][:name] => branch_name)
+          .single_record
+      end
+
+      # Deletes a branch, its branch head and branch_version objects, without deleting the
+      # pacticipant version objects
+      #
+      # @param [PactBroker::Versions::Branch] the branch to delete
+      def delete_branch(branch)
+        branch.delete
+      end
+
+      # @param [PactBroker::Domain::Pacticipant] pacticipant
+      # @params [Array<String>] exclude the names of the branches to NOT delete
+      # @param [Integer] the number of branches that will be deleted
+      def count_branches_to_delete(pacticipant, exclude: )
+        build_query_for_pacticipant_branches(pacticipant, exclude: exclude).count
+      end
+
+      # Returns the list of branches which will NOT be deleted (the bulk delete is executed async after the request has finished)
+      # @param [PactBroker::Domain::Pacticipant] pacticipant
+      # @params [Array<String>] exclude the names of the branches to NOT delete
+      # @return [Array<PactBroker::Versions::Branch>]
+      def remaining_branches_after_future_deletion(pacticipant, exclude: )
+        exclude_dup = exclude.dup
+        if pacticipant.main_branch
+          exclude_dup << pacticipant.main_branch
+        end
+        Branch.where(pacticipant_id: pacticipant.id).where(name: exclude_dup)
+      end
+
+      # @param [PactBroker::Domain::Pacticipant] pacticipant
+      # @params [Array<String>] exclude the names of the branches to NOT delete
+      def delete_branches_for_pacticipant(pacticipant, exclude:)
+        build_query_for_pacticipant_branches(pacticipant, exclude: exclude).delete
+      end
+
+      def build_query_for_pacticipant_branches(pacticipant, exclude: )
+        exclude_dup = exclude.dup
+        if pacticipant.main_branch
+          exclude_dup << pacticipant.main_branch
+        end
+        Branch.where(pacticipant_id: pacticipant.id).exclude(name: exclude_dup)
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/branch_service.rb

@@ -1,40 +1,28 @@
+require "forwardable"
 require "pact_broker/logging"
 require "pact_broker/repositories"
 require "pact_broker/messages"
-require "forwardable"
 
 module PactBroker
   module Versions
     class BranchService
       extend PactBroker::Repositories
+      extend PactBroker::Messages
 
       class << self
         extend Forwardable
-        delegate [:delete_branch_version] => :branch_version_repository
-      end
-
-
-      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
+        delegate [:find_branch_version, :find_or_create_branch_version, :delete_branch_version] => :branch_version_repository
+        delegate [:find_branch, :delete_branch, :find_all_branches_for_pacticipant, :delete_branches_for_pacticipant] => :branch_repository
 
-      def self.find_branch(pacticipant_name:, branch_name:)
-        Branch
-          .select_all_qualified
-          .join(:pacticipants, { Sequel[:branches][:pacticipant_id] => Sequel[:pacticipants][:id] }) do
-            PactBroker::Repositories::Helpers.name_like(Sequel[:pacticipants][:name], pacticipant_name)
-          end
-          .where(Sequel[:branches][:name] => branch_name)
-          .single_record
+        # Returns a list of notices to display to the user in the terminal
+        # @param [PactBroker::Domain::Pacticipant] pacticipant
+        # @param [Array<String>] exclude the list of branches to NOT delete
+        # @return [Array<PactBroker::Contracts::Notice>]
+        def branch_deletion_notices(pacticipant, exclude:)
+          count = branch_repository.count_branches_to_delete(pacticipant, exclude: exclude)
+          remaining = branch_repository.remaining_branches_after_future_deletion(pacticipant, exclude: exclude).sort_by(&:created_at).collect(&:name).join(", ")
+          [PactBroker::Contracts::Notice.success(message("messages.branch.bulk_delete", count: count, pacticipant_name: pacticipant.name, remaining: remaining))]
+        end
       end
     end
   end

data/lib/pact_broker/versions/branch_version.rb

@@ -1,6 +1,3 @@
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
-
 module PactBroker
   module Versions
     class BranchVersion < Sequel::Model(:branch_versions)

data/lib/pact_broker/versions/branch_version_repository.rb

@@ -1,7 +1,24 @@
+require "pact_broker/versions/branch_version"
+require "pact_broker/services"
+
 module PactBroker
   module Versions
     class BranchVersionRepository
       include PactBroker::Services
+      include PactBroker::Repositories
+
+      def 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 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
 
       def add_branch(version, branch_name, auto_created: false)
         branch = find_or_create_branch(version.pacticipant, branch_name)

data/lib/pact_broker/versions/repository.rb

@@ -1,4 +1,3 @@
-require "sequel"
 require "pact_broker/logging"
 require "pact_broker/domain/version"
 require "pact_broker/tags/repository"
@@ -11,7 +10,6 @@ module PactBroker
     class Repository
 
       include PactBroker::Logging
-      include PactBroker::Repositories::Helpers
       include PactBroker::Repositories
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
@@ -59,6 +57,9 @@ module PactBroker
           .single_record
       end
 
+      # The eager loaded relations are hardcoded here to support the PactBroker::Api::Decorators::VersionDecorator
+      # Newer "find all" implementations for other models pass the relations to eager load in
+      # from the decorator via the resource.
       def find_all_pacticipant_versions_in_reverse_order name, pagination_options = {}
         pacticipant = pacticipant_repository.find_by_name!(name)
         query = PactBroker::Domain::Version
@@ -71,6 +72,22 @@ module PactBroker
         query.all_with_pagination_options(pagination_options)
       end
 
+      def find_pacticipant_versions_in_reverse_order(pacticipant_name, options = {}, pagination_options = {})
+        pacticipant = pacticipant_repository.find_by_name!(pacticipant_name)
+        query = PactBroker::Domain::Version
+                  .where(pacticipant: pacticipant)
+                  .eager(:pacticipant)
+                  .eager(branch_versions: [:version, :branch_head, { branch: :pacticipant }])
+                  .eager(tags: :head_tag)
+                  .eager(:pact_publications)
+                  .reverse_order(:order)
+
+        if options[:branch_name]
+          query = query.where_branch_name(options[:branch_name])
+        end
+        query.all_with_pagination_options(pagination_options)
+      end
+
       # There may be a race condition if two simultaneous requests come in to create the same version
       def create(args)
         version_params = {

data/lib/pact_broker/versions/sequence.rb

@@ -1,5 +1,3 @@
-require "sequel"
-
 module PactBroker
   module Versions
     class Sequence < Sequel::Model(:version_sequence_number)
@@ -8,7 +6,7 @@ module PactBroker
         # The easiest way to implement a cross database compatible sequence.
         # Sad, I know.
         def next_val
-          if PactBroker::Repositories::Helpers.postgres?
+          if PactBroker::Dataset::Helpers.postgres?
             db.execute("SELECT nextval('version_order_sequence') as val") { |v| v.first["val"].to_i }
           else
             db.transaction do

data/lib/pact_broker/versions/service.rb

@@ -30,6 +30,10 @@ module PactBroker
         version_repository.find_all_pacticipant_versions_in_reverse_order(name, pagination_options)
       end
 
+      def self.find_pacticipant_versions_in_reverse_order(pacticipant_name, options, pagination_options = {})
+        version_repository.find_pacticipant_versions_in_reverse_order(pacticipant_name, options, pagination_options)
+      end
+
       def self.create_or_overwrite(pacticipant_name, version_number, version)
         pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
         version = version_repository.create_or_overwrite(pacticipant, version_number, version)

data/lib/pact_broker/webhooks/execution.rb

@@ -1,6 +1,4 @@
-require "sequel"
-require "pact_broker/db"
-require "pact_broker/repositories/helpers"
+require "pact_broker/dataset"
 
 module PactBroker
   module Webhooks
@@ -15,12 +13,10 @@ module PactBroker
       set_primary_key :id
       plugin :timestamps
 
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-      end
-
       associate(:many_to_one, :triggered_webhook, :class => "PactBroker::Webhooks::TriggeredWebhook", :key => :triggered_webhook_id, :primary_key => :id)
 
+      dataset_module(PactBroker::Dataset)
+
       def <=> other
         comp = created_date <=> other.created_date
         comp = id <=> other.id if comp == 0