Use group and project finders instead of direct ActiveRecord relations

1 files changed, 2 insertions, 2 deletions

diff --git a/app/serializers/group_entity.rb b/app/serializers/group_entity.rb
index 94085ba5afc..b389a63511f 100644
--- a/app/serializers/group_entity.rb
+++ b/app/serializers/group_entity.rb
@@ -29,11 +29,11 @@ class GroupEntity < Grape::Entity
   end
 
   expose :has_subgroups do |group|
-    group.children.any?
+    GroupsFinder.new(request.current_user, parent: group).execute.any?
   end
 
   expose :number_projects_with_delimiter do |group|
-    number_with_delimiter(group.projects.non_archived.count)
+    number_with_delimiter(GroupProjectsFinder.new(group: group, current_user: request.current_user).execute.count)
   end
 
   expose :number_users_with_delimiter do |group|