From e5b328d8e53a7acd5a8da4408d9331c27d4d5921 Mon Sep 17 00:00:00 2001 From: HunJerBAH Date: Thu, 18 Jul 2024 16:38:16 -0400 Subject: [PATCH 1/2] filtered attorney tasks to not include correspondence --- app/models/queues/attorney_queue.rb | 3 +-- app/serializers/attorney_serializer.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/queues/attorney_queue.rb b/app/models/queues/attorney_queue.rb index aacf2d7203e..168f03e315c 100644 --- a/app/models/queues/attorney_queue.rb +++ b/app/models/queues/attorney_queue.rb @@ -18,8 +18,7 @@ def tasks record.status = Constants.TASK_STATUSES.on_hold end end - - caseflow_tasks = user.tasks.includes(*task_includes).incomplete_or_recently_completed + caseflow_tasks = user.tasks.not_correspondence.includes(*task_includes).incomplete_or_recently_completed (colocated_tasks_for_attorney_tasks + caseflow_tasks).flatten end diff --git a/app/serializers/attorney_serializer.rb b/app/serializers/attorney_serializer.rb index fea9e3dcd3e..d54abc8cd22 100644 --- a/app/serializers/attorney_serializer.rb +++ b/app/serializers/attorney_serializer.rb @@ -6,6 +6,6 @@ class AttorneySerializer attribute :css_id attribute :full_name attribute :active_task_count do |object| - object.tasks.active.size + QueueRepository.tasks_for_user(object.css_id).count + object.tasks.not_correspondence.active.size + QueueRepository.tasks_for_user(object.css_id).count end end From f70207facc2753b06acdc209e79d89c97483417f Mon Sep 17 00:00:00 2001 From: HunJerBAH Date: Fri, 19 Jul 2024 09:20:05 -0400 Subject: [PATCH 2/2] added correspondence filtering for other Appeal Queues. --- app/models/queues/generic_queue.rb | 1 + app/models/queues/judge_queue.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/queues/generic_queue.rb b/app/models/queues/generic_queue.rb index 42fae3704e7..2eb2d801c91 100644 --- a/app/models/queues/generic_queue.rb +++ b/app/models/queues/generic_queue.rb @@ -17,6 +17,7 @@ def tasks def relevant_tasks Task.incomplete_or_recently_completed.visible_in_queue_table_view .where(assigned_to: user) + .not_correspondence .includes(*task_includes) .order(created_at: :asc) .limit(limit) diff --git a/app/models/queues/judge_queue.rb b/app/models/queues/judge_queue.rb index 7e713bc5a0c..2aed3781ffb 100644 --- a/app/models/queues/judge_queue.rb +++ b/app/models/queues/judge_queue.rb @@ -2,6 +2,6 @@ class JudgeQueue < GenericQueue def tasks - super.active.where(type: JudgeAssignTask.name) + super.active.not_correspondence.where(type: JudgeAssignTask.name) end end