Change MessageThreadMergeIdentifier tenant reference to box reference

slovensko-digital · Nov 14, 2023 · 3d469e5 · 3d469e5
1 parent 64c2e6a
commit 3d469e5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 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, tenant: folder.tenant)
+        thread.merge_identifiers.build(uuid: merge_uuid, box: folder.box)
       end
 
       thread.save!

diff --git a/app/models/message_thread_merge_identifier.rb b/app/models/message_thread_merge_identifier.rb
@@ -4,12 +4,12 @@
 #
 #  id                                          :integer          not null, primary key
 #  message_thread_id                           :integer          not null
-#  tenant_id                                   :integer          not null
+#  box_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
+  belongs_to :box
 end
diff --git a/db/migrate/20231114132619_add_box_id_to_message_thread_merge_identifiers.rb b/db/migrate/20231114132619_add_box_id_to_message_thread_merge_identifiers.rb
@@ -0,0 +1,14 @@
+class AddBoxIdToMessageThreadMergeIdentifiers < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :message_thread_merge_identifiers, :box, null: true, index: true
+
+    MessageThreadMergeIdentifier.find_each do |merge_identifier|
+      merge_identifier.update(box: merge_identifier.message_thread.box)
+    end
+
+    change_column_null :message_thread_merge_identifiers, :box_id, false
+    remove_column :message_thread_merge_identifiers, :tenant_id
+
+    add_index :message_thread_merge_identifiers, [:uuid, :box_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,14 +3,14 @@
 one:
   message_thread: one
   uuid: <%= SecureRandom.uuid %>
-  tenant: solver
+  box: one
 
 two:
   message_thread: one
   uuid: <%= SecureRandom.uuid %>
-  tenant: solver
+  box: one
 
 three:
   message_thread: two
   uuid: <%= SecureRandom.uuid %>
-  tenant: solver
+  box: one