pact_broker 2.24.0 → 2.25.0

data/lib/pact_broker/matrix/service.rb

@@ -10,14 +10,6 @@ module PactBroker
       extend PactBroker::Repositories
       extend PactBroker::Services
 
-      def refresh params, &block
-        matrix_repository.refresh(params, &block)
-      end
-
-      def refresh_tags params, &block
-        matrix_repository.refresh_tags(params, &block)
-      end
-
       def find selectors, options = {}
         query_results = matrix_repository.find selectors, options
         pacticipant_names = selectors.collect{ | s| s[:pacticipant_name] }

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -120,3 +120,18 @@ module PactBroker
 
   end
 end
+
+# Table: all_pact_publications
+# Columns:
+#  id                      | integer                     |
+#  consumer_id             | integer                     |
+#  consumer_name           | text                        |
+#  consumer_version_id     | integer                     |
+#  consumer_version_number | text                        |
+#  consumer_version_order  | integer                     |
+#  provider_id             | integer                     |
+#  provider_name           | text                        |
+#  revision_number         | integer                     |
+#  pact_version_id         | integer                     |
+#  pact_version_sha        | text                        |
+#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_pact_publication_id_by_consumer_version.rb

@@ -0,0 +1,34 @@
+require 'pact_broker/pacts/all_pact_publications'
+require 'pact_broker/repositories/helpers'
+
+module PactBroker
+  module Pacts
+    class LatestPactPublicationIdForConsumerVersion < Sequel::Model(:latest_pact_publication_ids_for_consumer_versions)
+
+      unrestrict_primary_key
+
+      dataset_module do
+        include PactBroker::Repositories::Helpers
+      end
+
+      def upsert
+        self.class.upsert(to_hash, [:provider_id, :consumer_version_id])
+      end
+    end
+  end
+end
+
+# Table: latest_pact_publications_by_consumer_versions
+# Columns:
+#  id                      | integer                     |
+#  consumer_id             | integer                     |
+#  consumer_name           | text                        |
+#  consumer_version_id     | integer                     |
+#  consumer_version_number | text                        |
+#  consumer_version_order  | integer                     |
+#  provider_id             | integer                     |
+#  provider_name           | text                        |
+#  revision_number         | integer                     |
+#  pact_version_id         | integer                     |
+#  pact_version_sha        | text                        |
+#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_pact_publications.rb

@@ -9,3 +9,18 @@ module PactBroker
 
   end
 end
+
+# Table: latest_pact_publications
+# Columns:
+#  id                      | integer                     |
+#  consumer_id             | integer                     |
+#  consumer_name           | text                        |
+#  consumer_version_id     | integer                     |
+#  consumer_version_number | text                        |
+#  consumer_version_order  | integer                     |
+#  provider_id             | integer                     |
+#  provider_name           | text                        |
+#  revision_number         | integer                     |
+#  pact_version_id         | integer                     |
+#  pact_version_sha        | text                        |
+#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb

@@ -9,3 +9,18 @@ module PactBroker
 
   end
 end
+
+# Table: latest_pact_publications_by_consumer_versions
+# Columns:
+#  id                      | integer                     |
+#  consumer_id             | integer                     |
+#  consumer_name           | text                        |
+#  consumer_version_id     | integer                     |
+#  consumer_version_number | text                        |
+#  consumer_version_order  | integer                     |
+#  provider_id             | integer                     |
+#  provider_name           | text                        |
+#  revision_number         | integer                     |
+#  pact_version_id         | integer                     |
+#  pact_version_sha        | text                        |
+#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_tagged_pact_publications.rb

@@ -9,3 +9,19 @@ module PactBroker
 
   end
 end
+
+# Table: latest_tagged_pact_publications
+# Columns:
+#  id                      | integer                     |
+#  consumer_id             | integer                     |
+#  consumer_name           | text                        |
+#  consumer_version_id     | integer                     |
+#  consumer_version_number | text                        |
+#  consumer_version_order  | integer                     |
+#  provider_id             | integer                     |
+#  provider_name           | text                        |
+#  revision_number         | integer                     |
+#  pact_version_id         | integer                     |
+#  pact_version_sha        | text                        |
+#  created_at              | timestamp without time zone |
+#  tag_name                | text                        |

data/lib/pact_broker/pacts/pact_publication.rb

@@ -61,3 +61,27 @@ module PactBroker
     PactPublication.plugin :timestamps, update_on_create: true
   end
 end
+
+# Table: pact_publications
+# Columns:
+#  id                  | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  consumer_version_id | integer                     | NOT NULL
+#  provider_id         | integer                     | NOT NULL
+#  revision_number     | integer                     | NOT NULL
+#  pact_version_id     | integer                     | NOT NULL
+#  created_at          | timestamp without time zone | NOT NULL
+#  consumer_id         | integer                     |
+# Indexes:
+#  pact_publications_pkey              | PRIMARY KEY btree (id)
+#  cv_prov_revision_unq                | UNIQUE btree (consumer_version_id, provider_id, revision_number)
+#  cv_prov_id_ndx                      | btree (consumer_version_id, provider_id, id)
+#  pact_publications_consumer_id_index | btree (consumer_id)
+# Foreign key constraints:
+#  pact_publications_consumer_id_fkey         | (consumer_id) REFERENCES pacticipants(id)
+#  pact_publications_consumer_version_id_fkey | (consumer_version_id) REFERENCES versions(id)
+#  pact_publications_pact_version_id_fkey     | (pact_version_id) REFERENCES pact_versions(id)
+#  pact_publications_provider_id_fkey         | (provider_id) REFERENCES pacticipants(id)
+# Referenced By:
+#  webhook_executions                                | webhook_executions_pact_publication_id_fkey                     | (pact_publication_id) REFERENCES pact_publications(id)
+#  triggered_webhooks                                | triggered_webhooks_pact_publication_id_fkey                     | (pact_publication_id) REFERENCES pact_publications(id)
+#  latest_pact_publication_ids_for_consumer_versions | latest_pact_publication_ids_for_consum_pact_publication_id_fkey | (pact_publication_id) REFERENCES pact_publications(id) ON DELETE CASCADE

data/lib/pact_broker/pacts/pact_version.rb

@@ -48,3 +48,23 @@ module PactBroker
     PactVersion.plugin :timestamps
   end
 end
+
+# Table: pact_versions
+# Columns:
+#  id          | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  consumer_id | integer                     | NOT NULL
+#  provider_id | integer                     | NOT NULL
+#  sha         | text                        | NOT NULL
+#  content     | text                        |
+#  created_at  | timestamp without time zone | NOT NULL
+# Indexes:
+#  pact_versions_pkey   | PRIMARY KEY btree (id)
+#  unq_pvc_con_prov_sha | UNIQUE btree (consumer_id, provider_id, sha)
+# Foreign key constraints:
+#  pact_versions_consumer_id_fkey | (consumer_id) REFERENCES pacticipants(id)
+#  pact_versions_provider_id_fkey | (provider_id) REFERENCES pacticipants(id)
+# Referenced By:
+#  pact_publications                                            | pact_publications_pact_version_id_fkey                          | (pact_version_id) REFERENCES pact_versions(id)
+#  verifications                                                | verifications_pact_version_id_fkey                              | (pact_version_id) REFERENCES pact_versions(id)
+#  latest_pact_publication_ids_for_consumer_versions            | latest_pact_publication_ids_for_consumer_v_pact_version_id_fkey | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
+#  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_pact_version_id_fk                    | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE

data/lib/pact_broker/pacts/repository.rb

@@ -11,6 +11,7 @@ require 'pact/shared/json_differ'
 require 'pact_broker/domain'
 require 'pact_broker/pacts/parse'
 require 'pact_broker/matrix/head_row'
+require 'pact_broker/pacts/latest_pact_publication_id_by_consumer_version'
 
 module PactBroker
   module Pacts
@@ -20,28 +21,46 @@ module PactBroker
       include PactBroker::Repositories
 
       def create params
-        PactPublication.new(
+        pact_publication = PactPublication.new(
           consumer_version_id: params[:version_id],
           provider_id: params[:provider_id],
+          consumer_id: params[:consumer_id],
           pact_version: find_or_create_pact_version(params.fetch(:consumer_id), params.fetch(:provider_id), params[:json_content]),
-        ).save.to_domain
+        ).save
+        update_latest_pact_publication_ids(pact_publication)
+        pact_publication.to_domain
       end
 
       def update id, params
         existing_model = PactPublication.find(id: id)
         pact_version = find_or_create_pact_version(existing_model.consumer_version.pacticipant_id, existing_model.provider_id, params[:json_content])
         if existing_model.pact_version_id != pact_version.id
-          PactPublication.new(
+          pact_publication = PactPublication.new(
             consumer_version_id: existing_model.consumer_version_id,
+            consumer_id: existing_model.consumer_id,
             provider_id: existing_model.provider_id,
             revision_number: (existing_model.revision_number + 1),
             pact_version: pact_version,
-          ).save.to_domain
+          ).save
+          update_latest_pact_publication_ids(pact_publication)
+          pact_publication.to_domain
         else
           existing_model.to_domain
         end
       end
 
+      def update_latest_pact_publication_ids(pact_publication)
+        params = {
+          consumer_version_id: pact_publication.consumer_version_id,
+          provider_id: pact_publication.provider_id,
+          pact_publication_id: pact_publication.id,
+          consumer_id: pact_publication.consumer_id,
+          pact_version_id: pact_publication.pact_version_id
+        }
+
+        LatestPactPublicationIdForConsumerVersion.new(params).upsert
+      end
+
       def delete params
         id = AllPactPublications
           .consumer(params.consumer_name)
@@ -168,13 +187,20 @@ module PactBroker
           .order(:consumer_version_order, :revision_number).collect(&:to_domain_with_content)
       end
 
-      def find_previous_pact pact
-        LatestPactPublicationsByConsumerVersion
-          .eager(:tags)
-          .consumer(pact.consumer.name)
-          .provider(pact.provider.name)
-          .consumer_version_order_before(pact.consumer_version.order)
-          .latest.collect(&:to_domain_with_content)[0]
+      def find_previous_pact pact, tag = nil
+        query = LatestPactPublicationsByConsumerVersion
+            .eager(:tags)
+            .consumer(pact.consumer.name)
+            .provider(pact.provider.name)
+
+        if tag == :untagged
+          query = query.untagged
+        elsif tag
+          query = query.tag(tag)
+        end
+
+        query.consumer_version_order_before(pact.consumer_version.order)
+            .latest.collect(&:to_domain_with_content)[0]
       end
 
       def find_next_pact pact

data/lib/pact_broker/pacts/service.rb

@@ -104,8 +104,7 @@ module PactBroker
 
       # TODO also take into account overridden revisions
       def pact_is_new_or_pact_has_changed_since_previous_version? pact
-        previous_pact = pact_repository.find_previous_pact pact
-        previous_pact.nil? || pact.json_content != previous_pact.json_content
+        find_previous_pacts(pact).any? { |previous_pact| previous_pact.nil? || pact.json_content != previous_pact.json_content}
       end
 
       private
@@ -140,6 +139,14 @@ module PactBroker
           logger.debug "Pact has not changed since previous version, not triggering webhooks"
         end
       end
+
+      def find_previous_pacts pact
+        if pact.consumer_version_tag_names.any?
+          pact.consumer_version_tag_names.map { |tag| pact_repository.find_previous_pact(pact, tag) }
+        else
+          [pact_repository.find_previous_pact(pact, :untagged)]
+        end
+      end
     end
   end
 end

data/lib/pact_broker/repositories/helpers.rb

@@ -20,6 +20,10 @@ module PactBroker
         Sequel::Model.db.adapter_scheme.to_s =~ /mysql/
       end
 
+      def postgres?
+        Sequel::Model.db.adapter_scheme.to_s == "postgres"
+      end
+
       def select_all_qualified
         select(Sequel[model.table_name].*)
       end
@@ -31,6 +35,22 @@ module PactBroker
           select(column)
         end
       end
+
+      def upsert row, key_names
+        if postgres?
+          insert_conflict(update: row, target: key_names).insert(row)
+        elsif mysql?
+          on_duplicate_key_update.insert(row)
+        else
+          # Sqlite
+          key = row.reject{ |k, v| !key_names.include?(k) }
+          if where(key).count == 0
+            insert(row)
+          else
+            where(key).update(row)
+          end
+        end
+      end
     end
   end
 end

data/lib/pact_broker/tags/tag_with_latest_flag.rb

@@ -16,3 +16,11 @@ module PactBroker
     end
   end
 end
+
+# Table: tags_with_latest_flag
+# Columns:
+#  name       | text                        |
+#  version_id | integer                     |
+#  created_at | timestamp without time zone |
+#  updated_at | timestamp without time zone |
+#  latest     | integer                     |

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

@@ -50,10 +50,14 @@ module PactBroker
           Helpers::URLHelper.group_url provider_name
         end
 
-        def pact_url
+        def latest_pact_url
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
+        def pact_url
+          PactBroker::Api::PactBrokerUrls.pact_url('', @relationship)
+        end
+
         def pact_matrix_url
           Helpers::URLHelper.matrix_url consumer_name, provider_name
         end

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

@@ -44,7 +44,7 @@
               = index_item.consumer_name
           %td.pact
             %span.pact
-              %a{ href: index_item.pact_url, :title => "View pact" }
+              %a{ href: index_item.latest_pact_url, :title => "View pact" }
             %span.pact-matrix
               %a{ href: index_item.pact_matrix_url, title: "View pact matrix" }
           %td.provider

data/lib/pact_broker/verifications/all_verifications.rb

@@ -10,3 +10,16 @@ module PactBroker
 
   end
 end
+
+# Table: all_verifications
+# Columns:
+#  id                      | integer                     |
+#  number                  | integer                     |
+#  success                 | boolean                     |
+#  provider_version_id     | integer                     |
+#  provider_version_number | text                        |
+#  provider_version_order  | integer                     |
+#  build_url               | text                        |
+#  pact_version_id         | integer                     |
+#  execution_date          | timestamp without time zone |
+#  created_at              | timestamp without time zone |

data/lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb

@@ -24,3 +24,21 @@ module PactBroker
     end
   end
 end
+
+# Table: latest_verifications_for_consumer_and_provider
+# Columns:
+#  consumer_id             | integer                     |
+#  provider_id             | integer                     |
+#  pact_version_sha        | text                        |
+#  provider_version_number | text                        |
+#  provider_version_order  | integer                     |
+#  id                      | integer                     |
+#  number                  | integer                     |
+#  success                 | boolean                     |
+#  provider_version        | text                        |
+#  build_url               | text                        |
+#  pact_version_id         | integer                     |
+#  execution_date          | timestamp without time zone |
+#  created_at              | timestamp without time zone |
+#  provider_version_id     | integer                     |
+#  test_results            | text                        |

data/lib/pact_broker/verifications/latest_verification_for_consumer_version_tag.rb

@@ -21,3 +21,22 @@ module PactBroker
     end
   end
 end
+
+# Table: latest_verifications_for_consumer_version_tags
+# Columns:
+#  consumer_id               | integer                     |
+#  provider_id               | integer                     |
+#  consumer_version_tag_name | text                        |
+#  pact_version_sha          | text                        |
+#  provider_version_number   | text                        |
+#  provider_version_order    | integer                     |
+#  id                        | integer                     |
+#  number                    | integer                     |
+#  success                   | boolean                     |
+#  provider_version          | text                        |
+#  build_url                 | text                        |
+#  pact_version_id           | integer                     |
+#  execution_date            | timestamp without time zone |
+#  created_at                | timestamp without time zone |
+#  provider_version_id       | integer                     |
+#  test_results              | text                        |

data/lib/pact_broker/verifications/latest_verification_for_pact_version.rb

@@ -0,0 +1,22 @@
+require 'pact_broker/domain/verification'
+
+module PactBroker
+  module Verifications
+    class LatestVerificationForPactVersion < PactBroker::Domain::Verification
+      set_dataset(:latest_verifications_for_pact_versions)
+    end
+  end
+end
+
+# Table: latest_verifications_for_pact_versions
+# Columns:
+#  id                      | integer                     |
+#  number                  | integer                     |
+#  success                 | boolean                     |
+#  build_url               | text                        |
+#  pact_version_id         | integer                     |
+#  execution_date          | timestamp without time zone |
+#  created_at              | timestamp without time zone |
+#  provider_version_id     | integer                     |
+#  provider_version_number | text                        |
+#  provider_version_order  | integer                     |