3 files changed, 35 insertions, 1 deletions
diff --git a/app/finders/admin/projects_finder.rb b/app/finders/admin/projects_finder.rb
new file mode 100644
index 00000000000..a5ba791a513
--- /dev/null
+++ b/app/finders/admin/projects_finder.rb
@@ -0,0 +1,33 @@
+class Admin::ProjectsFinder
+  attr_reader :sort, :namespace_id, :visibility_level, :with_push,
+              :abandoned, :last_repository_check_failed, :archived,
+              :personal, :name, :page, :current_user
+
+  def initialize(params:, current_user:)
+    @current_user = current_user
+    @sort = params.fetch(:sort) { 'latest_activity_desc' }
+    @namespace_id = params[:namespace_id]
+    @visibility_level = params[:visibility_level]
+    @with_push = params[:with_push]
+    @abandoned = params[:abandoned]
+    @last_repository_check_failed = params[:last_repository_check_failed]
+    @archived = params[:archived]
+    @personal = params[:personal]
+    @name = params[:name]
+    @page = params[:page]
+  end
+
+  def execute
+    items = Project.with_statistics
+    items = items.in_namespace(namespace_id) if namespace_id.present?
+    items = items.where(visibility_level: visibility_level) if visibility_level.present?
+    items = items.with_push if with_push.present?
+    items = items.abandoned if abandoned.present?
+    items = items.where(last_repository_check_failed: true) if last_repository_check_failed.present?
+    items = items.non_archived unless archived.present?
+    items = items.personal(current_user) if personal.present?
+    items = items.search(name) if name.present?
+    items = items.sort(sort)
+    items.includes(:namespace).order("namespaces.path, projects.name ASC").page(page)
+  end
+end
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index fc63e30c8fb..08a843ada97 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -11,6 +11,7 @@
 #     group_id: integer
 #     project_id: integer
 #     milestone_title: string
+#     author_id: integer
 #     assignee_id: integer
 #     search: string
 #     label_name: string
@@ -80,7 +81,6 @@ class IssuableFinder
     end
 
     counts[:all] = counts.values.sum
-    counts[:opened] += counts[:reopened]
 
     counts
   end
diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb
index 2fc34f186ad..771da3d441d 100644
--- a/app/finders/merge_requests_finder.rb
+++ b/app/finders/merge_requests_finder.rb
@@ -10,6 +10,7 @@
 #     group_id: integer
 #     project_id: integer
 #     milestone_title: string
+#     author_id: integer
 #     assignee_id: integer
 #     search: string
 #     label_name: string