fix: set custom filter count in redis (#7164)

This commit is contained in:
Tejaswini Chile
2023-06-19 16:10:03 +05:30
committed by GitHub
parent 2c3337b117
commit 9d0de04f7c
9 changed files with 127 additions and 24 deletions

View File

@@ -1,4 +1,5 @@
class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
before_action :check_authorization
before_action :fetch_custom_filters, except: [:create]
before_action :fetch_custom_filter, only: [:show, :update, :destroy]
DEFAULT_FILTER_TYPE = 'conversation'.freeze

View File

@@ -0,0 +1,9 @@
class CustomFiltersRecordsCountUpdateJob < ApplicationJob
queue_as :low
def perform
CustomFilter.find_each(batch_size: 25) do |filter|
SyncCustomFilterCountJob.perform_later(filter)
end
end
end

View File

@@ -0,0 +1,9 @@
class SyncCustomFilterCountJob < ApplicationJob
queue_as :low
def perform(filter)
Redis::Alfred.set(filter.filter_count_key, 0) if filter.filter_records.nil?
filter.set_record_count_in_redis
end
end

View File

@@ -24,6 +24,29 @@ class CustomFilter < ApplicationRecord
enum filter_type: { conversation: 0, contact: 1, report: 2 }
validate :validate_number_of_filters
def records_count
fetch_record_count_from_redis
end
def filter_records
Conversations::FilterService.new(query.with_indifferent_access, user, account).perform
end
def set_record_count_in_redis
records = filter_records
Redis::Alfred.set(filter_count_key, records[:count][:all_count])
end
def fetch_record_count_from_redis
number_of_records = Redis::Alfred.get(filter_count_key)
SyncCustomFilterCountJob.perform_later(self) if number_of_records.nil?
number_of_records.to_i
end
def filter_count_key
format(::Redis::Alfred::CUSTOM_FILTER_RECORDS_COUNT_KEY, account_id: account_id, filter_id: id, user_id: user_id)
end
def validate_number_of_filters
return true if account.custom_filters.where(user_id: user_id).size < MAX_FILTER_PER_USER

View File

@@ -0,0 +1,21 @@
class CustomFilterPolicy < ApplicationPolicy
def create?
@account_user.administrator? || @account_user.agent?
end
def show?
@account_user.administrator? || @account_user.agent?
end
def index?
@account_user.administrator? || @account_user.agent?
end
def update?
@account_user.administrator? || @account_user.agent?
end
def destroy?
@account_user.administrator? || @account_user.agent?
end
end

View File

@@ -1,6 +1,11 @@
class Conversations::FilterService < FilterService
ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
def initialize(params, user, filter_account = nil)
@filter_account = filter_account
super(params, user)
end
def perform
@conversations = conversation_query_builder
mine_count, unassigned_count, all_count, = set_count_for_all_conversations
@@ -49,7 +54,8 @@ class Conversations::FilterService < FilterService
end
def base_relation
Current.account.conversations.left_outer_joins(:labels)
account = @filter_account || Current.account
account.conversations.left_outer_joins(:labels)
end
def current_page

View File

@@ -4,3 +4,4 @@ json.filter_type resource.filter_type
json.query resource.query
json.created_at resource.created_at
json.updated_at resource.updated_at
json.count resource.records_count