Merge pull request #50 from solver-it-sro/GO-195/sync_folders_accordi…

…ng_to_box

GO-195 Download messages according to box (allow same box in different tenants)

app/jobs/govbox/sync_box_job.rb

@@ -26,7 +26,7 @@ def find_or_create_folder_with_parent(folder_hash, folders, box)
         parent_folder = find_or_create_folder_with_parent(folders[folder_hash['parent_id']], folders, box)
       end
 
-      folder = Govbox::Folder.find_or_initialize_by(edesk_folder_id: folder_hash['id'], box_id: box.id).tap do |f|
+      folder = Govbox::Folder.find_or_initialize_by(edesk_folder_id: folder_hash['id'], box: box).tap do |f|
         f.edesk_folder_id = folder_hash['id']
         f.parent_folder = parent_folder
         f.name = folder_hash['name']

app/jobs/govbox/sync_folder_job.rb

@@ -11,7 +11,7 @@ def perform(folder, upvs_client: UpvsEnvironment.upvs_client, batch_size: 1000)
 
         raise "Unable to fetch folder messages" if response_status != 200
 
-        edesk_message_ids_to_folder_ids = Govbox::Message.where(edesk_message_id: raw_messages.pluck('id')).pluck(:edesk_message_id, :folder_id).to_h
+        edesk_message_ids_to_folder_ids = Govbox::Message.joins(:folder).where(folder: { box_id: folder.box.id }).where(edesk_message_id: raw_messages.pluck('id')).pluck(:edesk_message_id, :folder_id).to_h
         moved_edesk_message_ids = []
 
         raw_messages.each do |raw_message|

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!

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

db/migrate/20230914120010_update_govbox_folders_indexes.rb

@@ -0,0 +1,6 @@
+class UpdateGovboxFoldersIndexes < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :govbox_folders, :edesk_folder_id, unique: true
+    add_index :govbox_folders, [:edesk_folder_id, :box_id], unique: true
+  end
+end

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

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

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