From 2e502c4e4f4e50300c0aa8917a517bbb25000d69 Mon Sep 17 00:00:00 2001 From: Jonathan Hoang Date: Thu, 13 Jul 2023 12:50:07 -0500 Subject: [PATCH 1/4] updated cavc dashboard to show all issues from source appeal regardless of issues on the remand --- app/models/cavc_dashboard.rb | 18 +++++++++++++++--- .../work_queue/appeal_serializer.rb | 7 +------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/models/cavc_dashboard.rb b/app/models/cavc_dashboard.rb index 0fd35592b33..d5280441685 100644 --- a/app/models/cavc_dashboard.rb +++ b/app/models/cavc_dashboard.rb @@ -26,9 +26,21 @@ def set_attributes_from_cavc_remand end def remand_request_issues - return cavc_remand.remand_appeal&.request_issues.order(:id) if cavc_remand.remand_appeal - - cavc_remand.source_appeal&.request_issues.order(:id) + # return cavc_remand.remand_appeal&.request_issues.order(:id) if cavc_remand.remand_appeal + + # cavc_remand.source_appeal&.request_issues.order(:id) + remand_appeal_issues = if cavc_remand.remand_appeal + cavc_remand.remand_appeal&.request_issues.order(:id) + else + [] + end + source_issues = cavc_remand.source_appeal&.request_issues.order(:id) + + remand_appeal_issues + source_issues.reject do |ri| + remand_appeal_issues.any? do |rai| + rai.description.gsub(/#\d+\z/, "").rstrip == ri.description && rai.benefit_type == ri.benefit_type + end + end end def create_dispositions_for_remand_request_issues diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb index bfa23c51fe4..7a12453a761 100644 --- a/app/models/serializers/work_queue/appeal_serializer.rb +++ b/app/models/serializers/work_queue/appeal_serializer.rb @@ -305,11 +305,6 @@ class WorkQueue::AppealSerializer end attribute :cavc_remands_with_dashboard do |appeal| - @remands_with_dashboard = CavcRemand.where(source_appeal_id: appeal.id, cavc_decision_type: - [ - Constants.CAVC_DECISION_TYPES.other_dismissal, - Constants.CAVC_DECISION_TYPES.affirmed, - Constants.CAVC_DECISION_TYPES.settlement - ]).count + @remands_with_dashboard = CavcRemand.where(source_appeal_id: appeal.id).count end end From 7aa8cfbe90fb53307e118f2a2fc0237136193249 Mon Sep 17 00:00:00 2001 From: Jonathan Hoang Date: Thu, 13 Jul 2023 13:02:42 -0500 Subject: [PATCH 2/4] removed comment --- app/models/cavc_dashboard.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/cavc_dashboard.rb b/app/models/cavc_dashboard.rb index d5280441685..862e9f4f806 100644 --- a/app/models/cavc_dashboard.rb +++ b/app/models/cavc_dashboard.rb @@ -26,9 +26,6 @@ def set_attributes_from_cavc_remand end def remand_request_issues - # return cavc_remand.remand_appeal&.request_issues.order(:id) if cavc_remand.remand_appeal - - # cavc_remand.source_appeal&.request_issues.order(:id) remand_appeal_issues = if cavc_remand.remand_appeal cavc_remand.remand_appeal&.request_issues.order(:id) else From cfd7f72a00ade408693df272d39640deaafda3a8 Mon Sep 17 00:00:00 2001 From: Jonathan Hoang Date: Thu, 13 Jul 2023 21:23:26 -0500 Subject: [PATCH 3/4] set rai with ternary instead of if/else --- app/models/cavc_dashboard.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/cavc_dashboard.rb b/app/models/cavc_dashboard.rb index 862e9f4f806..209dce3f251 100644 --- a/app/models/cavc_dashboard.rb +++ b/app/models/cavc_dashboard.rb @@ -26,11 +26,7 @@ def set_attributes_from_cavc_remand end def remand_request_issues - remand_appeal_issues = if cavc_remand.remand_appeal - cavc_remand.remand_appeal&.request_issues.order(:id) - else - [] - end + remand_appeal_issues = cavc_remand.remand_appeal ? cavc_remand.remand_appeal&.request_issues.order(:id) : [] source_issues = cavc_remand.source_appeal&.request_issues.order(:id) remand_appeal_issues + source_issues.reject do |ri| From 37cd11459530c6c6d0e10eeee642f0bb489b8927 Mon Sep 17 00:00:00 2001 From: Jonathan Hoang Date: Wed, 19 Jul 2023 13:12:28 -0500 Subject: [PATCH 4/4] add checks back in for cavc_remands_with_dashboard --- app/models/serializers/work_queue/appeal_serializer.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb index 7a12453a761..bfa23c51fe4 100644 --- a/app/models/serializers/work_queue/appeal_serializer.rb +++ b/app/models/serializers/work_queue/appeal_serializer.rb @@ -305,6 +305,11 @@ class WorkQueue::AppealSerializer end attribute :cavc_remands_with_dashboard do |appeal| - @remands_with_dashboard = CavcRemand.where(source_appeal_id: appeal.id).count + @remands_with_dashboard = CavcRemand.where(source_appeal_id: appeal.id, cavc_decision_type: + [ + Constants.CAVC_DECISION_TYPES.other_dismissal, + Constants.CAVC_DECISION_TYPES.affirmed, + Constants.CAVC_DECISION_TYPES.settlement + ]).count end end