Merge pull request #19000 from department-of-veterans-affairs/JHoang/…

…APPEALS-23520/23521 APPEALS-23521 CAVC Dashboard not showing all issues for Remand
department-of-veterans-affairs · Jul 21, 2023 · 2d72925 · 2d72925
2 parents d3dac4d + 9ded555
commit 2d72925
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/models/cavc_dashboard.rb b/app/models/cavc_dashboard.rb
@@ -26,9 +26,14 @@ 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
+    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)
 
-    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