Add tenant reference to MessageThreadMergeIdentifier

slovensko-digital · Sep 19, 2023 · f620e94 · f620e94
1 parent 0edf3eb
commit f620e94
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/app/models/box/message_threads_extensions.rb b/app/models/box/message_threads_extensions.rb
@@ -21,7 +21,7 @@ def find_or_create_by_merge_uuid!(folder:, merge_uuid:, title:, delivered_at:)
           delivered_at: delivered_at,
           last_message_delivered_at: delivered_at
         )
-        thread.merge_identifiers.build(uuid: merge_uuid)
+        thread.merge_identifiers.build(uuid: merge_uuid, tenant: folder.tenant)
       end
 
       thread.save!

diff --git a/app/models/message_thread_merge_identifier.rb b/app/models/message_thread_merge_identifier.rb
@@ -4,10 +4,12 @@
 #
 #  id                                          :integer          not null, primary key
 #  message_thread_id                           :integer          not null
+#  tenant_id                                   :integer          not null
 #  uuid                                        :uuid             not null
 #  created_at                                  :datetime         not null
 #  updated_at                                  :datetime         not null
 
 class MessageThreadMergeIdentifier < ApplicationRecord
   belongs_to :message_thread
+  belongs_to :tenant
 end
diff --git a/db/migrate/20230914155237_remove_message_thread_merge_identifiers_unique_constraint.rb b/db/migrate/20230914155237_remove_message_thread_merge_identifiers_unique_constraint.rb
diff --git a/db/migrate/20230919104351_add_tenant_id_to_message_thread_merge_identifiers.rb b/db/migrate/20230919104351_add_tenant_id_to_message_thread_merge_identifiers.rb
@@ -0,0 +1,9 @@
+class AddTenantIdToMessageThreadMergeIdentifiers < ActiveRecord::Migration[7.0]
+  def up
+    add_reference :message_thread_merge_identifiers, :tenant, foreign_key: true
+
+    MessageThreadMergeIdentifier.find_each { |merge_identifier| merge_identifier.update(tenant: merge_identifier.message_thread.folder.tenant) }
+
+    change_column :message_thread_merge_identifiers, :tenant_id, :bigint, null: false, foreign_key: true
+  end
+end
diff --git a/db/migrate/20230919105229_update_message_thread_merge_identifiers_unique_constraint.rb b/db/migrate/20230919105229_update_message_thread_merge_identifiers_unique_constraint.rb
@@ -0,0 +1,6 @@
+class UpdateMessageThreadMergeIdentifiersUniqueConstraint < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :message_thread_merge_identifiers, :uuid, unique: true
+    add_index :message_thread_merge_identifiers, [:uuid, :tenant_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/fixtures/message_thread_merge_identifiers.yml b/test/fixtures/message_thread_merge_identifiers.yml
@@ -3,11 +3,14 @@
 one:
   message_thread: one
   uuid: <%= SecureRandom.uuid %>
+  tenant: solver
 
 two:
   message_thread: one
   uuid: <%= SecureRandom.uuid %>
+  tenant: solver
 
 three:
   message_thread: two
   uuid: <%= SecureRandom.uuid %>
+  tenant: solver