Merge branch 'main' of https://github.com/solver-it-sro/govbox-pro in…

…to GO-195/sync_folders_according_to_box

# Conflicts:
#	app/jobs/govbox/sync_box_job.rb
#	db/schema.rb

app/components/message_threads_table_component.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col justify-stretch items-stretch gap-4 p-4">
   <div class="flex flex-col justify-stretch items-stretch rounded-md bg-white border border-gray-200">
-    <%= form_with(url:merge_message_threads_path, method: :get, local: true) do |form|%>
+    <%= form_with(url: merge_message_threads_path, local: true) do |form|%>
       <div class="flex justify-stretch items-center gap-4 p-4 border-t-0 border-r-0 border-b border-l-0 border-gray-200">
         <div class="todo flex justify-start items-start   pr-[100px]">
           <div class="  w-4 h-4 relative">

app/jobs/govbox/destroy_box_data_job.rb

@@ -0,0 +1,10 @@
+module Govbox
+  class DestroyBoxDataJob < ApplicationJob
+    queue_as :default
+
+    def perform(box_id)
+      Govbox::ApiConnection.find_by(box_id: box_id).destroy
+      Govbox::Folder.where(box_id: box_id).destroy_all
+    end
+  end
+end

app/jobs/govbox/submit_message_draft_job.rb

@@ -14,25 +14,24 @@ def perform(message_draft, upvs_client: UpvsEnvironment.upvs_client)
     }.compact
 
     sktalk_api = upvs_client.api(message_draft.thread.folder.box).sktalk
+    success, response_status, response_body = sktalk_api.receive_and_save_to_outbox(message_draft_data)
 
-    begin
-      success, response_status = sktalk_api.receive_and_save_to_outbox(message_draft_data)
-      if success
-        message_draft.metadata["status"] = "submitted"
-        Govbox::SyncBoxJob.set(wait: 3.minutes).perform_later(message_draft.thread.folder.box)
-      else
-        handle_submit_fail(message_draft, response_status)
-      end
-
-      message_draft.save!
-    rescue Error => error
-      message_draft.metadata["status"] = "submit_failed_temporary"
+    if success
+      message_draft.metadata["status"] = "submitted"
       message_draft.save!
 
-      raise error
+      Govbox::SyncBoxJob.set(wait: 3.minutes).perform_later(message_draft.thread.folder.box)
+    else
+      handle_submit_fail(message_draft, response_status, response_body.dig("message"))
     end
   end
 
+  class SubmissionError < StandardError
+  end
+
+  class TemporarySubmissionError < SubmissionError
+  end
+
   private
 
   def build_objects(message_draft)
@@ -52,14 +51,18 @@ def build_objects(message_draft)
     objects
   end
 
-  def handle_submit_fail(message_draft, response_status)
+  def handle_submit_fail(message_draft, response_status, response_message)
     case response_status
-    when 408
-      # TODO
-    when 422
-      message_draft.metadata["status"] = "submit_failed_unprocessable"
+    when 408, 503
+      message_draft.metadata["status"] = "temporary_submit_fail"
+      message_draft.save
+
+      raise TemporarySubmissionError, "#{response_status}, #{response_message}"
     else
-      message_draft.metadata["status"] = "submit_failed_temporary"
+      message_draft.metadata["status"] = "submit_fail"
+      message_draft.save
+
+      raise SubmissionError, "#{response_status}, #{response_message}"
     end
   end
 end

app/lib/event_bus.rb

@@ -34,3 +34,4 @@ def self.reset!
                    ->(message_thread_tag) { Searchable::ReindexMessageThreadJob.perform_later(message_thread_tag.message_thread) }
 EventBus.subscribe :tag_renamed, ->(tag) { Searchable::ReindexMessageThreadsWithTagIdJob.perform_later(tag.id) }
 EventBus.subscribe :tag_removed, ->(tag) { Searchable::ReindexMessageThreadsWithTagIdJob.perform_later(tag.id) }
+EventBus.subscribe :box_destroyed, ->(box_id) { Govbox::DestroyBoxDataJob.perform_later(box_id) }

app/lib/upvs/govbox_api.rb

@@ -49,7 +49,7 @@ def authorization_successful?(response_status, authorization_code)
     class SkTalk < Namespace
       def receive_and_save_to_outbox(data)
         response_status, response_body = @api.request(:post, "#{@api.url}/api/sktalk/receive_and_save_to_outbox", data.to_json, header)
-        [submit_successful?(response_status, response_body['receive_result'], response_body['save_to_outbox_result']), response_status]
+        [submit_successful?(response_status, response_body['receive_result'], response_body['save_to_outbox_result']), response_status, response_body]
       end
 
       private

app/models/box.rb

@@ -17,9 +17,6 @@ class Box < ApplicationRecord
   has_many :message_threads, through: :folders, extend: MessageThreadsExtensions, dependent: :destroy
   has_many :message_drafts_imports, dependent: :destroy
 
-  before_destroy do
-    Govbox::ApiConnection.find_by(box_id: id).destroy
-    Govbox::Folder.where(box_id: id).destroy_all
-  end
+  before_destroy ->(box) { EventBus.publish(:box_destroyed, box.id) }
 end
 

app/models/govbox/folder.rb

@@ -22,14 +22,14 @@ def full_name
   end
 
   def inbox?
-    name == "Inbox"
+    name.start_with? 'Inbox'
   end
 
   def bin?
     name == 'Bin'
   end
 
   def drafts?
-    name == 'Drafts'
+    name.start_with? == 'Drafts'
   end
 end

app/models/tag.rb

@@ -19,6 +19,9 @@ class Tag < ApplicationRecord
   has_many :groups, through: :tag_groups
   belongs_to :owner, class_name: 'User', optional: true
 
+  validates :name, presence: true
+  validates :name, uniqueness: { scope: :tenant_id, case_sensitive: false }
+
   after_update_commit ->(tag) { EventBus.publish(:tag_renamed, tag) if previous_changes.key?("name") }
   after_destroy ->(tag) { EventBus.publish(:tag_removed, tag) }
 end

app/models/user.rb

@@ -20,7 +20,7 @@ class User < ApplicationRecord
   has_many :automation_rules, class_name: 'Automation::Rule'
 
   validates_presence_of :name, :email
-  validates_uniqueness_of :name, :email, scope: :tenant_id
+  validates_uniqueness_of :name, :email, scope: :tenant_id, case_sensitive: false
 
   before_destroy :delete_user_group, prepend: true
   after_create :handle_default_groups

config/routes.rb

@@ -41,7 +41,7 @@
 
   resources :message_threads do
     collection do
-      get 'merge'
+      post 'merge'
     end
     resources :messages
   end

db/migrate/20230914130304_add_unique_name_index_to_tags.rb

@@ -0,0 +1,43 @@
+class AddUniqueNameIndexToTags < ActiveRecord::Migration[7.0]
+  def up
+    Tag.connection.select_all(
+      "select tenant_id, ARRAY_AGG(id) AS ids from tags GROUP BY (tenant_id, LOWER(name)) HAVING COUNT(*) > 1;"
+    ).cast_values.each do |row|
+      tenant_id, ids = row
+
+      tags = Tag.where(tenant_id: tenant_id).find(ids)
+
+      main_tag = tags[0]
+
+      tags[1..-1].each do |other_tag|
+        MessagesTag.where(tag_id: other_tag).map do |mt|
+          mt.tag_id = main_tag.id
+          mt.save!
+        end
+
+        MessageThreadsTag.where(tag_id: other_tag).map do |mtt|
+          mtt.tag_id = main_tag.id
+          mtt.save!
+        end
+
+        TagGroup.where(tag_id: other_tag).map do |tg|
+          tg.tag_id = main_tag.id
+          tg.save!
+        end
+
+        TagUser.where(tag_id: other_tag).map do |tu|
+          tu.tag_id = main_tag.id
+          tu.save!
+        end
+
+        other_tag.destroy
+      end
+    end
+
+    execute "CREATE UNIQUE INDEX index_tags_on_tenant_id_and_lowercase_name ON tags USING btree (tenant_id, lower(name));"
+  end
+
+  def down
+    remove_index :tags, name: "index_tags_on_tenant_id_and_lowercase_name"
+  end
+end

db/migrate/20230914140353_change_email_index_in_users.rb

@@ -0,0 +1,11 @@
+class ChangeEmailIndexInUsers < ActiveRecord::Migration[7.0]
+  def up
+    remove_index :users, name: "index_users_on_tenant_id_and_email"
+    execute "CREATE UNIQUE INDEX index_users_on_tenant_id_and_lowercase_email ON users USING btree (tenant_id, lower(email));"
+  end
+
+  def down
+    remove_index :users, name: "index_users_on_tenant_id_and_lowercase_email"
+    add_index :users, [:tenant_id, :email], unique: true, name: "index_users_on_tenant_id_and_email"
+  end
+end

db/migrate/20230919111034_update_replyable_attributes_on_messages.rb

@@ -0,0 +1,8 @@
+class UpdateReplyableAttributesOnMessages < ActiveRecord::Migration[7.0]
+  def change
+    Message.find_each do |message|
+      govbox_message = Govbox::Message.find_by(message_id: message.uuid)
+      message.update(replyable: govbox_message&.replyable? || false)
+    end
+  end
+end

db/migrate/20230920093428_update_box_reference_in_govbox_folders.rb

@@ -0,0 +1,5 @@
+class UpdateBoxReferenceInGovboxFolders < ActiveRecord::Migration[7.0]
+  def change
+    remove_foreign_key :govbox_folders, :boxes
+  end
+end

db/migrate/20230920093653_update_box_reference_in_govbox_api_connections.rb

@@ -0,0 +1,5 @@
+class UpdateBoxReferenceInGovboxApiConnections < ActiveRecord::Migration[7.0]
+  def change
+    remove_foreign_key :govbox_api_connections, :boxes
+  end
+end