fix: empty account variable for custom_attrbute_definition running in background job (#7351)

2023-06-20 12:15:36 +05:30
parent bc813b71dd
commit afb7e67795
2 changed files with 29 additions and 3 deletions
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -2,7 +2,7 @@ class Conversations::FilterService < FilterService
  ATTRIBUTE_MODEL = 'conversation_attribute'.freeze

  def initialize(params, user, filter_account = nil)
-    @filter_account = filter_account
+    @account = filter_account || Current.account
    super(params, user)
  end

@@ -54,8 +54,7 @@ class Conversations::FilterService < FilterService
  end

  def base_relation
-    account = @filter_account || Current.account
-    account.conversations.left_outer_joins(:labels)
+    @account.conversations.left_outer_joins(:labels)
  end

  def current_page