Handle archived projects in the `GroupDescendantsFinder`

2 files changed, 49 insertions, 20 deletions

diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb
index ea7974eb882..7ceede3a31a 100644
--- a/app/finders/group_descendants_finder.rb
+++ b/app/finders/group_descendants_finder.rb
@@ -1,10 +1,29 @@
+# GroupDescendantsFinder
+#
+# Used to find and filter all subgroups and projects of a passed parent group
+# visible to a specified user.
+#
+# When passing a `filter` param, the search is performed over all nested levels
+# of the `parent_group`. All ancestors for a search result are loaded
+#
+# Arguments:
+#   current_user: The user for which the children should be visible
+#   parent_group: The group to find children of
+#   params:
+#     Supports all params that the `ProjectsFinder` and `GroupProjectsFinder`
+#     support.
+#
+#     filter: string - is aliased to `search` for consistency with the frontend
+#     archived: string - `only` or `true`.
+#                        `non_archived` is passed to the `ProjectFinder`s if none
+#                        was given.
 class GroupDescendantsFinder
   attr_reader :current_user, :parent_group, :params
 
   def initialize(current_user: nil, parent_group:, params: {})
     @current_user = current_user
     @parent_group = parent_group
-    @params = params.reverse_merge(non_archived: true)
+    @params = params.reverse_merge(non_archived: params[:archived].blank?)
   end
 
   def execute
@@ -83,7 +102,7 @@ class GroupDescendantsFinder
     projects_to_load_ancestors_of = projects.where.not(namespace: parent_group)
     groups_to_load_ancestors_of = Group.where(id: projects_to_load_ancestors_of.select(:namespace_id))
     ancestors_for_groups(groups_to_load_ancestors_of)
-      .with_selects_for_list
+      .with_selects_for_list(params[:archived])
   end
 
   def subgroups
@@ -96,7 +115,7 @@ class GroupDescendantsFinder
              else
                direct_child_groups
              end
-    groups.with_selects_for_list.order_by(sort)
+    groups.with_selects_for_list(params[:archived]).order_by(sort)
   end
 
   def direct_child_projects
@@ -104,15 +123,15 @@ class GroupDescendantsFinder
       .execute
   end
 
-  def projects_for_user
-    Project.public_or_visible_to_user(current_user).non_archived
-  end
-
   # Finds all projects nested under `parent_group` or any of its descendant
   # groups
   def projects_matching_filter
-    projects_for_user.search(params[:filter])
-      .where(namespace_id: hierarchy_for_parent.base_and_descendants.select(:id))
+    projects_nested_in_group = Project.where(namespace_id: hierarchy_for_parent.base_and_descendants.select(:id))
+    params_with_search = params.merge(search: params[:filter])
+
+    ProjectsFinder.new(params: params_with_search,
+                       current_user: current_user,
+                       project_ids_relation: projects_nested_in_group).execute
   end
 
   def projects
diff --git a/app/models/concerns/loaded_in_group_list.rb b/app/models/concerns/loaded_in_group_list.rb
index e73ddcfb567..8b519d742c5 100644
--- a/app/models/concerns/loaded_in_group_list.rb
+++ b/app/models/concerns/loaded_in_group_list.rb
@@ -2,15 +2,14 @@ module LoadedInGroupList
   extend ActiveSupport::Concern
 
   PROJECT_COUNT_SQL = <<~PROJECTCOUNT.freeze
-                     (SELECT COUNT(*) AS preloaded_project_count
-                      FROM projects
-                      WHERE projects.namespace_id = namespaces.id
-                      AND projects.archived IS NOT true)
+                     SELECT COUNT(*) AS preloaded_project_count
+                     FROM projects
+                     WHERE projects.namespace_id = namespaces.id
                      PROJECTCOUNT
   SUBGROUP_COUNT_SQL = <<~SUBGROUPCOUNT.freeze
                      (SELECT COUNT(*) AS preloaded_subgroup_count
-                      FROM namespaces children
-                      WHERE children.parent_id = namespaces.id)
+                     FROM namespaces children
+                     WHERE children.parent_id = namespaces.id)
                      SUBGROUPCOUNT
   MEMBER_COUNT_SQL = <<~MEMBERCOUNT.freeze
                      (SELECT COUNT(*) AS preloaded_member_count
@@ -21,17 +20,28 @@ module LoadedInGroupList
                      MEMBERCOUNT
 
   COUNT_SELECTS = ['namespaces.*',
-                   PROJECT_COUNT_SQL,
                    SUBGROUP_COUNT_SQL,
                    MEMBER_COUNT_SQL].freeze
 
   module ClassMethods
-    def with_counts
-      select(COUNT_SELECTS)
+    def with_counts(archived = nil)
+      selects = COUNT_SELECTS.dup << project_count(archived)
+      select(selects)
     end
 
-    def with_selects_for_list
-      with_route.with_counts
+    def with_selects_for_list(archived = nil)
+      with_route.with_counts(archived)
+    end
+
+    def project_count(archived)
+      project_count = if archived == 'only'
+                        PROJECT_COUNT_SQL + 'AND projects.archived IS true'
+                      elsif Gitlab::Utils.to_boolean(archived)
+                        PROJECT_COUNT_SQL
+                      else
+                        PROJECT_COUNT_SQL + 'AND projects.archived IS NOT true'
+                      end
+      "(#{project_count})"
     end
   end