pact_broker 2.85.0 → 2.88.0

data/lib/pact_broker/deployments/environment_service.rb

@@ -2,11 +2,14 @@ require "pact_broker/deployments/environment"
 require "securerandom"
 require "pact_broker/pacticipants/generate_display_name"
 require "pact_broker/string_refinements"
+require "pact_broker/repositories/scopes"
 
 module PactBroker
   module Deployments
     module EnvironmentService
       using PactBroker::StringRefinements
+      extend PactBroker::Repositories::Scopes
+
       extend self
 
       def self.included(base)
@@ -25,7 +28,7 @@ module PactBroker
         environment.save
       end
 
-      def update(uuid, environment)
+      def replace(uuid, environment)
         environment.uuid = uuid
         if environment.display_name.blank?
           environment.display_name = PactBroker::Pacticipants::GenerateDisplayName.call(environment.name)
@@ -33,8 +36,10 @@ module PactBroker
         environment.upsert
       end
 
+      alias_method :update, :replace # For PF
+
       def find_all
-        PactBroker::Deployments::Environment.order(Sequel.function(:lower, :display_name)).all
+        scope_for(PactBroker::Deployments::Environment).order(Sequel.function(:lower, :display_name)).all
       end
 
       def find(uuid)

data/lib/pact_broker/deployments/released_version_service.rb

@@ -52,6 +52,7 @@ module PactBroker
           .where(pacticipant_id: pacticipant.id)
           .eager(:version)
           .eager(:environment)
+          .order(:created_at, :id)
           .all
       end
     end

data/lib/pact_broker/doc/controllers/app.rb

@@ -17,6 +17,7 @@ module PactBroker
           "webhooks-webhooks" => "webhooks",
           "webhook" => "webhooks",
           "can-i-deploy-pacticipant-version-to-tag" => "can-i-deploy",
+          "can-i-deploy-pacticipant-version-to-environment" => "can-i-deploy",
           "pacticipant" => "pacticipants"
         }.freeze
 

data/lib/pact_broker/doc/views/can-i-deploy.markdown

@@ -10,7 +10,8 @@ A simplified resource that accepts the same parameters as the basic usage of the
 * _version_: The version of the pacticipant (application) you want to deploy (required).
 * _environment_: The name of the environment into which the pacticipant (application) is to be deployed. 
 * _to_: The tag used to identify the environment into which you wish to deploy the application (eg. `test` or `prod`). Deprecated - use the `environment=ENVIRONMENT` parameter in preference to the `to=TAG` parameter as deployments and environments are now explictly supported.
-* _ignore[]_: The name of the pacticipant to ignore when determining if it is safe to deploy (optional). May be used multiple times.
+* _ignore[]_: The name of the pacticipant to ignore when determining if it is safe to deploy (optional). May be used multiple times. eg `ignore[]=foo&ignore[]=bar`
+* _ignore[][pacticipant]_ and _ignore[][version]_: When ignoring a specific pacticipant version, the name and version of the application to ignore may be specified using "nested" param names syntax. eg. `ignore[][pacticipant]=foo&ignore[][version]=2ac5a946&ignore[][pacticipant]=bar`
 
 
 If you have an environment that you identify with the name `prod`, and each time you deployed an application to the prod environment you recorded the deployment of relevant application version in the Pact Broker using `record-deployment`, then calling `/can-i-deploy?pacticipant=Foo&version=734137278d&environment=prod` will check that version 734137278d of Foo has a successful verification result with each of the integrated application versions that are currently in prod. That is, it is safe to deploy.

data/lib/pact_broker/doc/views/index/publish-contracts.markdown

@@ -4,11 +4,16 @@ Allowed methods: `POST`
 
 Path: `/contracts/publish`
 
+Index relation: `pb:publish-contracts`
+
+Supported from: `v2.86.0`
+
 This is the preferred endpoint with which to publish contracts (previously, contracts were published using multiple calls to different endpoints to create the tag and contract resources). To detect whether this endpoint exists in a particular version of the Pact Broker, make a request to the index resource, and locate the `pb:publish-contracts` relation. Do a `POST` to the href specified for that relation. 
 
-The previous tag and pact endpoints are still supported, however, future features that build on this endpoint may not be able to be backported into those endpoints (eg. publishing pacts with a branch).
+The previous tag and pact endpoints are still supported, however, future features that build on this endpoint may not be able to be backported into those endpoints.
 
 ## Parameters
+
 * `pacticipantName`: the name of the application. Required.
 * `pacticipantVersionNumber`: the version number of the application. Required. It is recommended that this should be or include the git SHA. See [http://docs.pact.io/versioning](http://docs.pact.io/versioning).
 * `branch`: The git branch name. Optional but strongly recommended.
@@ -20,7 +25,31 @@ The previous tag and pact endpoints are still supported, however, future feature
   * `specification`: currently, only contracts of type "pact" are supported, but this will be extended in the future. Required.
   * `contentType`: currently, only contracts with a content type of "application/json" are supported. Required.
   * `content`: the content of the contract. Must be Base64 encoded. Required.
-  * `onConflict`: Specifies the action to take when a contract for this consumer version already exists with different content. Allowed values are `overwrite`|`merge`. Optional. Defaults to `overwrite`. When `merge` is specified, the interactions are merged into any pre-existing pact. This is required when the tests that generate pact files are split over multiple nodes.
+
+## Responses
+
+### Success
+
+* `notices`
+  * `level`: one of `debug`, `info`, `warning`,`prompt`,`success`
+  * `text`: the text of the notice. This is designed to be displayed in the output of a CLI.
+
+The `_links` section will contain links to all the resources created by the publication. The relations are:
+
+* `pb:contracts` (array)
+* `pb:pacticipant-version-tags` (array)
+* `pb:pacticipant-version`
+* `pb:pacticipant`
+
+### Errors
+
+Any validation errors will be returned in the standard Pact Broker format:
+
+    {
+      "errors": {
+        "<fieldName>": ["message 1", "message 2"]
+      }
+    }
 
 ## Example
 
@@ -37,30 +66,29 @@ The previous tag and pact endpoints are still supported, however, future feature
           "providerName": "Bar",
           "specification": "pact",
           "contentType": "application/json",
-          "content": "<base64 encoded JSON pact>",
-          "onConflict": "overwrite"
+          "content": "<base64 encoded JSON pact>"
         }
       ]
     }
     
     {
       {
-        "logs": [
+        "notices": [
           {
             "level": "debug",
-            "message": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
+            "text": "Created Foo version dc5eb529230038a4673b8c971395bd2922d8b240 with branch main and tags main"
           },
           {
             "level": "info",
-            "message": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
+            "text": "Pact published for Foo version dc5eb529230038a4673b8c971395bd2922d8b240 and provider Bar."
           },
           {
             "level": "debug",
-            "message": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
+            "text": "  Events detected: contract_published, contract_content_changed (first time any pact published for this consumer with consumer version tagged main)"
           },
           {
             "level": "debug",
-            "message": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
+            "text": "  Webhook \"foo webhook\" triggered for event contract_content_changed.\n    See logs at http://example.org/triggered-webhooks/1234/logs\""
           }
         ],
         "_embedded": {
@@ -118,3 +146,4 @@ The previous tag and pact endpoints are still supported, however, future feature
         }
       }
     }
+

data/lib/pact_broker/doc/views/pacticipant/label.markdown

@@ -0,0 +1,12 @@
+
+# Pacticipant labels
+
+Allowed methods: `GET`, `PUT`, `DELETE`
+
+Path: `/pacticipants/{pacticipant}/labels/{label}`
+
+Get, create or delete pacticipant labels.
+
+Pacticipants can be queried by label with `/pacticipants/label/{label}`.
+
+Labels are also used to create generic webhooks that are triggered for subset of pacticipants with label.

data/lib/pact_broker/doc/views/provider-pacts-for-verification.markdown

@@ -26,34 +26,34 @@ Example: This data structure represents the way a user might specify "I want to
       "includeWipPactsSince": "2020-01-01"
     }
 
+`consumerVersionSelectors.mainBranch`: if the key is specified, can only be set to `true`. Return the pacts for the configured `mainBranch` of each consumer. Use of this selector requires that the consumer has configured the `mainBranch` property, and has set a branch name when publishing the pacts.
+
 `consumerVersionSelectors.branch`: the branch name of the consumer versions to get the pacts for. Use of this selector requires that the consumer has configured a branch name when publishing the pacts.
 
-`consumerVersionSelectors.fallbackBranch`: the name of the branch to fallback to if the specified `branch` does not exist. This is useful when the consumer and provider use matching branch names to coordinate the development of new features.
+`consumerVersionSelectors.fallbackBranch`: the name of the branch to fallback to if the specified `branch` does not exist. Use of this property is discouraged as it may allow a pact to pass on a feature branch while breaking backwards compatibility with the main branch, which is generally not desired. It is better to use two separate consumer version selectors, one with the main branch name, and one with the feature branch name, rather than use this property.
 
 `consumerVersionSelectors.deployed`: if the key is specified, can only be set to `true`. Returns the pacts for all versions of the consumer that are currently deployed to any environment. Use of this selector requires that the deployment of the consumer application is recorded in the Pact Broker using the `pact-broker record-deployment` CLI.
 
 `consumerVersionSelectors.released`: if the key is specified, can only be set to `true`. Returns the pacts for all versions of the consumer that are released and currently supported in any environment. Use of this selector requires that the deployment of the consumer application is recorded in the Pact Broker using the `pact-broker record-release` CLI.
 
-
 `consumerVersionSelectors.deployedOrReleased`: if the key is specified, can only be set to `true`. Returns the pacts for all versions of the consumer that are currently deployed or released and currently supported in any environment. Use of this selector requires that the deployment of the consumer application is recorded in the Pact Broker using the `pact-broker record-deployment` or `record-release` CLI.
 
-
 `consumerVersionSelectors.environment`: the name of the environment containing the consumer versions for which to return the pacts. Used to further qualify `{ "deployed": true }` or `{ "released": true }`. Normally, this would not be needed, as it is recommended to verify the pacts for all currently deployed/currently supported released versions.
 
 `consumerVersionSelectors.latest`: true. Used in conjuction with the `tag` and `branch` properties. When used with a `branch`, it may be `true` or the key ommitted (in which case it will be inferred to be `true`). This is because it only makes sense to verify the latest pact for a branch. If a `tag` is specified, and `latest` is `true`, then the latest pact for each of the consumers with that tag will be returned. If a `tag` is specified and the latest flag is *not* set to `true`, *all* the pacts with the specified tag will be returned. (This might seem a bit weird, but it's done this way to match the syntax used for the matrix query params. See https://docs.pact.io/selectors). 
 
 `consumerVersionSelectors.consumer`: allows a selector to only be applied to a certain consumer.
 
+`consumerVersionSelectors.tag`: the tag name(s) of the consumer versions to get the pacts for. *This field is still supported but it is recommended to use the `branch` in preference now.*
+
+`consumerVersionSelectors.fallbackTag`: the name of the tag to fallback to if the specified `tag` does not exist. This is useful when the consumer and provider use matching branch names to coordinate the development of new features. *This field is still supported but it is recommended to use the `fallbackBranch` in preference now.*
+
 `providerVersionBranch`: the repository branch name for the provider application version that will be published with the verification results. This is used by the Broker to determine whether or not a particular pact is in pending state or not.
 
 `includePendingStatus`: true|false (default false). When true, a pending boolean will be added to the verificationProperties in the response, and an extra message will appear in the notices array to indicate why this pact is/is not in pending state. This will allow your code to handle the response based on only what is present in the response, and not have to do ifs based on the user's options together with the response. As requested in the "pacts for verification" issue, please print out these messages in the tests if possible. If not possible, perhaps create a separate task which will list the pact URLs and messages for debugging purposes.
 
 `includeWipPactsSince`: Date string. The date from which to include the "work in progress" pacts. See https://docs.pact.io/wip for more information on work in progress pacts.
 
-`consumerVersionSelectors.tag`: the tag name(s) of the consumer versions to get the pacts for. *This field is still supported but it is recommended to use the `branch` in preference now.*
-
-`consumerVersionSelectors.fallbackTag`: the name of the tag to fallback to if the specified `tag` does not exist. This is useful when the consumer and provider use matching branch names to coordinate the development of new features. *This field is still supported but it is recommended to use the `fallbackBranch` in preference now.*
-
 `providerVersionTags`: the tag name(s) for the provider application version that will be published with the verification results. This is used by the Broker to determine whether or not a particular pact is in pending state or not. This parameter can be specified multiple times. *This field is still supported but it is recommended to use the `providerVersionBranch` in preference now.*
 
 ### Response body

data/lib/pact_broker/doc/views/webhooks.markdown

@@ -79,6 +79,23 @@ To specify an XML body, you will need to use a correctly escaped string (or use
 
 **BEWARE** While the basic auth password, and any header containing the word `authorization` or `token` will be redacted from the UI and the logs, the password could be reverse engineered from the database, so make a separate account for the Pact Broker to use in your webhooks. Don't use your personal account!
 
+#### Consumer or provider label matching
+
+Webhooks can be created to match events of certain set of [consumers or providers by label](/doc/label?context=pacticipant). Use `label` attribute for either `provider` or `consumer`. Both are optional, but they cannot be provided when `name` attribute is present. Following example would trigger a webhook when any contract with `async` labeled provider changed its content:
+
+        {
+          "provider": {
+            "label": "async"
+          },
+          "events": [{
+            "name": "contract_content_changed"
+          }],
+          "request": {
+            "method": "POST",
+            "url": "http://master.ci.my.domain:8085/rest/api/latest/queue/SOME-PROJECT"
+          }
+        }
+
 #### Event types
 
 `contract_published:` triggered every time a contract is published. It is not recommended to trigger your provider verification build every time a contract is published - see `contract_content_changed` below.

data/lib/pact_broker/domain/index_item.rb

@@ -74,6 +74,10 @@ module PactBroker
         consumer_version.branch_heads.collect(&:branch_name)
       end
 
+      def consumer_version_branch_heads
+        consumer_version.branch_heads
+      end
+
       def consumer_version_environment_names
         (consumer_version.current_deployed_versions.collect(&:environment).collect(&:name) + consumer_version.current_supported_released_versions.collect(&:environment).collect(&:name)).uniq
       end
@@ -90,6 +94,11 @@ module PactBroker
         @latest_verification ? @latest_verification.provider_version_number : nil
       end
 
+      def provider_version_branch_heads
+        provider_version&.branch_heads || []
+      end
+
+
       def provider_version_branches
         provider_version&.branch_heads&.collect(&:branch_name) || []
       end

data/lib/pact_broker/domain/pacticipant.rb

@@ -76,6 +76,10 @@ module PactBroker
       def branch_head_for(branch_name)
         branch_heads.find{ | branch_head | branch_head.branch_name == branch_name }
       end
+
+      def label?(name)
+        labels.any? { |label| label.name == name }
+      end
     end
   end
 end

data/lib/pact_broker/domain/verification.rb

@@ -37,6 +37,22 @@ module PactBroker
           where(consumer: PactBroker::Domain::Pacticipant.find_by_name(consumer_name))
         end
 
+        # TODO optimise this
+        def from_provider_main_branch
+          providers_join = {
+            Sequel[:verifications][:provider_id] => Sequel[:providers][:id]
+          }
+
+          branch_versions_join = {
+            Sequel[:verifications][:provider_version_id] => Sequel[:branch_versions][:version_id],
+            Sequel[:providers][:main_branch] => Sequel[:branch_versions][:branch_name]
+          }
+
+          join(:pacticipants, providers_join, { table_alias: :providers })
+            .join(:branch_versions, branch_versions_join)
+        end
+
+        # TODO change this to a group by
         def latest_by_pact_version
           base_query = self
           base_join = {
@@ -116,10 +132,6 @@ module PactBroker
           join(:latest_pact_publication_ids_for_consumer_versions, { pact_version_id: :pact_version_id } )
         end
 
-        # Expects to be joined with AllPactPublications or subclass
-        # Beware that when columns with the same name exist in both datasets
-        # you may get the wrong column back in your model.
-
         def delete
           require "pact_broker/webhooks/triggered_webhook"
           PactBroker::Webhooks::TriggeredWebhook.where(verification: self).delete
@@ -246,6 +258,9 @@ end
 #  wip                              | boolean                     | NOT NULL DEFAULT false
 #  consumer_version_selector_hashes | text                        |
 #  tag_names                        | text                        |
+#  pact_pending                     | boolean                     |
+#  verified_by_implementation       | text                        |
+#  verified_by_version              | text                        |
 # Indexes:
 #  verifications_pkey                          | PRIMARY KEY btree (id)
 #  verifications_pact_version_id_number_index  | UNIQUE btree (pact_version_id, number)

data/lib/pact_broker/domain/webhook.rb

@@ -33,11 +33,11 @@ module PactBroker
 
       def scope_description
         if consumer && provider
-          "A webhook for the pact between #{consumer.name} and #{provider.name}"
+          "A webhook for the pact between #{consumer_name} and #{provider_name}"
         elsif provider
-          "A webhook for all pacts with provider #{provider.name}"
+          "A webhook for all pacts with provider #{provider_name}"
         elsif consumer
-          "A webhook for all pacts with consumer #{consumer.name}"
+          "A webhook for all pacts with consumer #{consumer_name}"
         else
           "A webhook for all pacts"
         end
@@ -63,11 +63,11 @@ module PactBroker
       end
 
       def consumer_name
-        consumer && consumer.name
+        consumer && (consumer.name || (consumer.label && "#{provider ? 'consumers ' : ''}labeled '#{consumer.label}'"))
       end
 
       def provider_name
-        provider && provider.name
+        provider && (provider.name || (provider.label && "#{consumer ? 'providers ' : ''}labeled '#{provider.label}'"))
       end
 
       def trigger_on_contract_content_changed?

data/lib/pact_broker/domain/webhook_pacticipant.rb

@@ -0,0 +1,6 @@
+
+module PactBroker
+  module Domain
+    WebhookPacticipant = Struct.new(:name, :label, keyword_init: true)
+  end
+end

data/lib/pact_broker/index/service.rb

@@ -112,11 +112,11 @@ module PactBroker
         elsif tags_option == true
           latest_verifications_for_cv_tags
             .select{ | v | v.consumer_id == pact_publication.consumer_id && v.provider_id == pact_publication.provider_id && pact_publication.head_pact_tags.collect(&:name).include?(v.consumer_version_tag_name) }
-            .sort{ |v1, v2| v1.id <=> v2.id }.last || (is_overall_latest && pact_publication.integration.latest_verification)
+            .sort{ |v1, v2| v1.id <=> v2.id }.last || (is_overall_latest ? pact_publication.integration.latest_verification : nil)
         elsif tags_option.is_a?(Array)
           latest_verifications_for_cv_tags
           .select{ | v | v.consumer_id == pact_publication.consumer_id && v.provider_id == pact_publication.provider_id && pact_publication.head_pact_tags.collect(&:name).include?(v.consumer_version_tag_name) && tags_option.include?(v.consumer_version_tag_name) }
-          .sort{ |v1, v2| v1.id <=> v2.id }.last  || (is_overall_latest && pact_publication.integration.latest_verification)
+          .sort{ |v1, v2| v1.id <=> v2.id }.last  || (is_overall_latest ? pact_publication.integration.latest_verification : nil)
         else
           pact_publication.integration.latest_verification
         end
@@ -138,8 +138,8 @@ module PactBroker
         pact_publications = head_pact_publications(consumer_name: consumer_name, provider_name: provider_name, tags: true, page_number: page_number, page_size: page_size)
           .eager(:consumer)
           .eager(:provider)
-          .eager(pact_version: { latest_verification: { provider_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, :branch_heads, { tags: :head_tag }]} })
-          .eager(consumer_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, :branch_heads, { tags: :head_tag }])
+          .eager(pact_version: { latest_verification: { provider_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_heads: :branch_version }, { tags: :head_tag }]} })
+          .eager(consumer_version: [{ current_deployed_versions: :environment }, { current_supported_released_versions: :environment }, { branch_heads: :branch_version }, { tags: :head_tag }])
           .eager(:head_pact_publications_for_tags)
 
         pact_publications.all.collect do | pact_publication |

data/lib/pact_broker/locale/en.yml

@@ -13,6 +13,7 @@ en:
     single_line?: "cannot contain multiple lines"
     no_spaces?: "cannot contain spaces"
     environment_with_name_exists?: "with name '%{value}' does not exist"
+    none?: "cannot be provided"
 
   pact_broker:
     messages:
@@ -33,16 +34,18 @@ en:
             consumerVersionTags: The list of tag names for the most recent consumer version associated with the pact content, separated by ", "
             consumerVersionBranch: The repository branch associated with the consumer version
             providerVersionTags: The list of tag names for the provider version associated with the verification result, separated by ", ".
+            providerVersionDescriptions: The descriptions of the provider version(s) for which the contract_requiring_verification_published webhook has been triggered.
             providerVersionBranch: The repository branch associated with the provider version
             consumerLabels: The list of labels for the consumer associated with the pact content, separated by ", ".
             providerLabels: The list of labels for the provider associated with the pact content, separated by ", ".
-            pactUrl: The "permalink" URL to the newly published pact (the URL specifying the consumer version URL, rather than the "/latest" format.
+            pactUrl: The "permalink" URL to the newly published pact content (using the pact version SHA).
             verificationResultUrl: The URL to the relevant verification result.
             githubVerificationStatus: The verification status using the correct keywords for posting to the Github commit status API. See https://developer.github.com/v3/repos/statuses
             bitbucketVerificationStatus: The verification status using the correct keywords for posting to the Bitbucket commit status API. See https://developer.atlassian.com/server/bitbucket/how-tos/updating-build-status-for-commits/
             azureDevOpsVerificationStatus: The verification status using the correct keywords for posting to the Azure DevOps GitStatusState API. See https://docs.microsoft.com/en-us/rest/api/azure/devops/git/statuses/create?view=azure-devops-rest-6.0
             gitlabVerificationStatus: The verification status using the correct keywords for posting to the Gitlab Commits API. See https://docs.gitlab.com/ee/api/commits.html#post-the-build-status-to-a-commit
             eventName: The name of the event that triggered the webhook
+            buildUrl: The URL of the build that published the resources that have triggered the webhook (currently only supported for contracts published using the 'all in one' endpoint).
             currentlyDeployedProviderVersionNumber: The version number of the currently deployed provider version (when used in a template, the webhook will be triggered once for each currently deployed provider version)
         no_webhooks_enabled_for_event: No enabled webhooks found for the detected events
         webhook_triggered_for_event: Webhook %{webhook_description} triggered for event %{event_name}.

data/lib/pact_broker/matrix/head_row.rb

@@ -38,7 +38,7 @@ module PactBroker
       # This will only work when using eager loading. The keys are just blanked out to avoid errors.
       # I don't understand how they work at all.
       # It would be nice to do this declaratively.
-      many_to_many :webhooks, :left_key => [], left_primary_key: [], :eager_loader=>(proc do |eo_opts|
+      many_to_many :webhooks, class: :'PactBroker::Webhooks::Webhook', :left_key => [], left_primary_key: [], :eager_loader=>(proc do |eo_opts|
         eo_opts[:rows].each do |row|
           row.associations[:webhooks] = []
         end

data/lib/pact_broker/matrix/parse_can_i_deploy_query.rb

@@ -29,9 +29,11 @@ module PactBroker
         end
 
         if params[:ignore].is_a?(Array)
-          options[:ignore_selectors] = params[:ignore].collect do | pacticipant_name |
-            if pacticipant_name.is_a?(String)
-              PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: pacticipant_name)
+          options[:ignore_selectors] = params[:ignore].collect do | param |
+            if param.is_a?(String)
+              PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: param)
+            elsif param.is_a?(Hash) && param.key?(:pacticipant)
+              PactBroker::Matrix::UnresolvedSelector.new({ pacticipant_name: param[:pacticipant], pacticipant_version_number: param[:version] }.compact)
             end
           end.compact
         else

data/lib/pact_broker/matrix/quick_row.rb

@@ -1,4 +1,3 @@
-require "pact_broker/pacts/all_pact_publications"
 require "pact_broker/repositories/helpers"
 require "pact_broker/matrix/query_builder"
 require "sequel"

data/lib/pact_broker/matrix/repository.rb

@@ -11,7 +11,6 @@ require "pact_broker/matrix/query_results_with_deployment_status_summary"
 require "pact_broker/matrix/resolved_selector"
 require "pact_broker/matrix/unresolved_selector"
 require "pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version"
-require "pact_broker/pacts/latest_pact_publications_by_consumer_version"
 
 module PactBroker
   module Matrix

data/lib/pact_broker/matrix/row.rb

@@ -150,11 +150,11 @@ module PactBroker
       end
 
       def consumer
-        @consumer ||= OpenStruct.new(name: consumer_name, id: consumer_id)
+        @consumer ||= Domain::Pacticipant.new(name: consumer_name).tap { |pacticipant| pacticipant.id = consumer_id }
       end
 
       def provider
-        @provider ||= OpenStruct.new(name: provider_name, id: provider_id)
+        @provider ||= Domain::Pacticipant.new(name: provider_name).tap { |pacticipant| pacticipant.id = provider_id }
       end
 
       def consumer_version

data/lib/pact_broker/pacticipants/repository.rb

@@ -95,7 +95,7 @@ module PactBroker
       end
 
       def search_by_name(pacticipant_name)
-        terms = pacticipant_name.split.map { |v| v.gsub("_", '\\_') }
+        terms = pacticipant_name.split.map { |v| v.gsub("_", "\\_") }
         string_match_query = Sequel.|( *terms.map { |term| Sequel.ilike(Sequel[:pacticipants][:name], "%#{term}%") })
         PactBroker::Domain::Pacticipant.where(string_match_query)
       end

data/lib/pact_broker/pacts/latest_pact_publication_id_for_consumer_version.rb

@@ -1,4 +1,3 @@
-require "pact_broker/pacts/all_pact_publications"
 require "pact_broker/repositories/helpers"
 
 module PactBroker

data/lib/pact_broker/pacts/metadata.rb

@@ -5,7 +5,7 @@ module PactBroker
 
       MAPPINGS = [
         [:consumer_version_tags, "cvt"],
-        [:consumer_version_number, "cvn"], # for old urls
+        [:consumer_version_number, "cvn"], # for old urls and build_metadata_for_consumer_version_number
         [:consumer_version_id, "cv"],
         [:wip, "w"],
         [:pending, "p"],
@@ -33,6 +33,12 @@ module PactBroker
         end
       end
 
+      def build_metadata_for_consumer_version_number(consumer_version_number)
+        {
+          "cvn" => consumer_version_number
+        }
+      end
+
       # When a pact is published, and a webhook is triggered, this stores
       # the current tags and consumer version number in the metadata parameter of the
       # pact version URL that is made available in the webhook template

data/lib/pact_broker/pacts/pact_publication.rb

@@ -8,6 +8,8 @@ require "pact_broker/pacts/pact_publication_dataset_module"
 require "pact_broker/pacts/pact_publication_wip_dataset_module"
 require "pact_broker/pacts/eager_loaders"
 require "pact_broker/pacts/lazy_loaders"
+require "pact_broker/pacts/pact_publication_clean_selector_dataset_module"
+require "pact_broker/pacts/head_pact"
 
 module PactBroker
   module Pacts
@@ -77,6 +79,7 @@ module PactBroker
       dataset_module do
         include PactBroker::Repositories::Helpers
         include PactPublicationDatasetModule
+        include PactPublicationCleanSelectorDatasetModule
         include PactPublicationWipDatasetModule
       end
 
@@ -110,6 +113,10 @@ module PactBroker
         pact_version.latest_verification
       end
 
+      def latest_main_branch_verification
+        pact_version.latest_main_branch_verification
+      end
+
       def latest_for_branch?
         if !defined?(@latest_for_branch)
           if consumer_version.branch_versions.empty?

data/lib/pact_broker/pacts/pact_publication_clean_selector_dataset_module.rb

@@ -0,0 +1,19 @@
+module PactBroker
+  module Pacts
+    module PactPublicationCleanSelectorDatasetModule
+      # we've already done the latest_by_consumer_tag in the clean
+      def latest_by_consumer_tag_for_clean_selector(selector)
+        query = latest_by_consumer_tag
+        query = query.for_consumer_name(selector.pacticipant_name) if selector.pacticipant_name
+        query = query.for_consumer_version_tag(selector.tag) if selector.tag && selector.tag.is_a?(String)
+        query = query.where_age_less_than(selector.max_age) if selector.max_age
+        query
+      end
+
+      def where_age_less_than(days)
+        start_date = Date.today - days
+        where{ pact_publications[:created_at] >= start_date }
+      end
+    end
+  end
+end

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -27,6 +27,11 @@ module PactBroker
         where(consumer: consumer)
       end
 
+      def untagged
+        left_outer_join(:tags, { version_id: :consumer_version_id })
+          .where(Sequel.qualify(:tags, :name) => nil)
+      end
+
       def for_consumer_version_tag tag_name
         base_query = self
         if no_columns_selected?
@@ -38,6 +43,12 @@ module PactBroker
           .remove_overridden_revisions_from_complete_query
       end
 
+      def for_consumer_version_tag_all_revisions tag_name
+        join(:tags, { version_id: :consumer_version_id }) do
+          name_like(Sequel[:tags][:name], tag_name)
+        end
+      end
+
       def for_consumer_name_and_maybe_version_number(consumer_name, consumer_version_number)
         if consumer_version_number
           where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name_and_version_number(consumer_name, consumer_version_number))
@@ -128,6 +139,7 @@ module PactBroker
           .remove_overridden_revisions_from_complete_query
       end
 
+      # The latest pact publication for each tag
       def latest_by_consumer_tag
         tags_join = {
           Sequel[:pact_publications][:consumer_version_id] => Sequel[:tags][:version_id]
@@ -234,7 +246,7 @@ module PactBroker
         deployed = base_query.join(:currently_deployed_version_ids, currently_deployed_join)
         released = base_query.join(:released_versions, released_join)
 
-        deployed.union(released)
+        deployed.union(released).remove_overridden_revisions_from_complete_query
       end
 
       def verified_before_date(date)
@@ -344,7 +356,19 @@ module PactBroker
       end
 
       def consumer_version_tag(tag)
-        where(Sequel[:ct][:name] => tag)
+        where(name_like(Sequel[:ct][:name],tag))
+      end
+
+      def consumer_version_order_before order
+        where(Sequel.lit("consumer_version_order < ?", order))
+      end
+
+      def consumer_version_order_after order
+        where(Sequel.lit("consumer_version_order > ?", order))
+      end
+
+      def latest_by_consumer_version_order
+        reverse_order(:consumer_version_order).limit(1)
       end
 
       def order_by_consumer_name
@@ -355,6 +379,10 @@ module PactBroker
         order_append(:consumer_version_order, :revision_number)
       end
 
+      def earliest
+        order(:consumer_version_order).limit(1)
+      end
+
       def latest
         order(:consumer_version_order, :revision_number).last
       end