Refactor FilterContext

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 2 insertions, 20 deletions

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 70dd3fff9a0..78456995b3b 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -51,30 +51,12 @@ class DashboardController < ApplicationController
   end
 
   def merge_requests
-    @merge_requests = case params[:scope]
-                      when 'authored' then
-                        current_user.merge_requests
-                      when 'all' then
-                        MergeRequest.where(target_project_id: current_user.authorized_projects.pluck(:id))
-                      else
-                        current_user.assigned_merge_requests
-                      end
-
-    @merge_requests = FilterContext.new(@merge_requests, params).execute
+    @merge_requests = FilterContext.new(MergeRequest, current_user, params).execute
     @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
   end
 
   def issues
-    @issues = case params[:scope]
-              when 'authored' then
-                current_user.issues
-              when 'all' then
-                Issue.where(project_id: current_user.authorized_projects.pluck(:id))
-              else
-                current_user.assigned_issues
-              end
-
-    @issues = FilterContext.new(@issues, params).execute
+    @issues = FilterContext.new(Issue, current_user, params).execute
     @issues = @issues.recent.page(params[:page]).per(20)
     @issues = @issues.includes(:author, :project)