feat: move migrations on feature branch to run last

pact-foundation · Jul 30, 2018 · 78d31c4 · 78d31c4
1 parent 262af75
commit 78d31c4
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 18 deletions.
diff --git a/...517_create_latest_pact_publication_ids.rb → ...720_create_latest_pact_publication_ids.rb b/...517_create_latest_pact_publication_ids.rb → ...720_create_latest_pact_publication_ids.rb
diff --git a/...18_migrate_latest_pact_publication_ids.rb → ...21_migrate_latest_pact_publication_ids.rb b/...18_migrate_latest_pact_publication_ids.rb → ...21_migrate_latest_pact_publication_ids.rb
diff --git a/db/migrations/20180519_recreate_views.rb → db/migrations/20180722_recreate_views.rb b/db/migrations/20180519_recreate_views.rb → db/migrations/20180722_recreate_views.rb
diff --git a/...0180521_create_latest_verification_ids.rb → ...0180723_create_latest_verification_ids.rb b/...0180521_create_latest_verification_ids.rb → ...0180723_create_latest_verification_ids.rb
@@ -8,7 +8,7 @@
     create_table(:latest_verification_id_for_pact_version_and_provider_version, charset: 'utf8') do
       foreign_key :pact_version_id, :pact_versions, nil: false, on_delete: :cascade
       foreign_key :provider_version_id, :versions, nil: false, on_delete: :cascade
-      foreign_key :provider_id, :pacticipants, nil: false, on_delete: :cascade
+      foreign_key :provider_id, :pacticipants, nil: false, on_delete: :cascade # not required, but useful to avoid extra joins
       foreign_key :verification_id, :verifications, nil: false, on_delete: :cascade, unique: true
       index [:pact_version_id, :provider_version_id], unique: true, name: "unq_latest_verifid_pvid_provid"
     end

diff --git a/...180522_migrate_latest_verification_ids.rb → ...180724_migrate_latest_verification_ids.rb b/...180522_migrate_latest_verification_ids.rb → ...180724_migrate_latest_verification_ids.rb
diff --git a/...erifications_for_consumer_version_tags.rb → ...erifications_for_consumer_version_tags.rb b/...erifications_for_consumer_version_tags.rb → ...erifications_for_consumer_version_tags.rb
diff --git a/db/migrations/20180523_recreate_views.rb → db/migrations/20180726_recreate_views.rb b/db/migrations/20180523_recreate_views.rb → db/migrations/20180726_recreate_views.rb
@@ -12,11 +12,12 @@
           on lv.pact_version_id = pp.pact_version_id"
     )
 
-    #TODO
+    # TODO
     #drop_view(:latest_matrix)
     #drop_view(:latest_verification_id_for_consumer_version_and_provider)
     #drop_view(:latest_matrix_for_consumer_version_and_provider_version)
-
+    #drop_table(:materialized_matrix)
+    #drop_table(:materialized_head_matrix)
   end
 
   down do

diff --git a/...erifications_for_consumer_and_provider.rb → ...erifications_for_consumer_and_provider.rb b/...erifications_for_consumer_and_provider.rb → ...erifications_for_consumer_and_provider.rb
diff --git a/lib/pact_broker/pacts/repository.rb b/lib/pact_broker/pacts/repository.rb
@@ -47,13 +47,8 @@ def update id, params
       end
 
       def update_latest_pact_publication_ids(pact_publication)
-        table = AllPactPublications.db[:latest_pact_publication_ids_by_consumer_versions]
-        count = table.where(consumer_version_id: pact_publication.consumer_version_id, provider_id: pact_publication.provider_id).count
-        if count == 0
-          table.insert(consumer_version_id: pact_publication.consumer_version_id, provider_id: pact_publication.provider_id, pact_publication_id: pact_publication.id)
-        else
-          table.where(consumer_version_id: pact_publication.consumer_version_id, provider_id: pact_publication.provider_id).update(pact_publication_id: pact_publication.id)
-        end
+        latest_pact_publication_params = { consumer_version_id: pact_publication.consumer_version_id, provider_id: pact_publication.provider_id, pact_publication_id: pact_publication.id }
+        AllPactPublications.db[:latest_pact_publication_ids_by_consumer_versions].insert_ignore.insert(latest_pact_publication_params)
       end
 
       def delete params

diff --git a/lib/pact_broker/verifications/repository.rb b/lib/pact_broker/verifications/repository.rb
@@ -30,14 +30,8 @@ def create verification, provider_version_number, pact
       end
 
       def update_latest_verification_id verification
-        if PactBroker::Domain::Verification.db.table_exists?(:latest_verification_id_for_pact_version_and_provider_version)
-          table = PactBroker::Domain::Verification.db[:latest_verification_id_for_pact_version_and_provider_version]
-          if table.where(pact_version_id: verification.pact_version_id, provider_version_id: verification.provider_version_id).count == 0
-            table.insert(pact_version_id: verification.pact_version_id, provider_version_id: verification.provider_version_id, provider_id: verification.provider_version.pacticipant_id, verification_id: verification.id)
-          else
-            table.where(pact_version_id: verification.pact_version_id, provider_version_id: verification.provider_version_id).update(verification_id: verification.id)
-          end
-        end
+        latest_verification_params = { pact_version_id: verification.pact_version_id, provider_version_id: verification.provider_version_id, provider_id: verification.provider_version.pacticipant_id, verification_id: verification.id }
+        PactBroker::Domain::Verification.db[:latest_verification_id_for_pact_version_and_provider_version].insert_ignore.insert(latest_verification_params)
       end
 
       def find consumer_name, provider_name, pact_version_sha, verification_number