Refactor complicated API group finding rules into GroupsFinder

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 892fd239df4..e56427304a6 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -47,16 +47,8 @@ module API
         use :pagination
       end
       get do
-        groups = if params[:owned]
-                   current_user ? current_user.owned_groups : Group.none
-                 elsif current_user&.admin?
-                   Group.all
-                 elsif params[:all_available] || current_user.nil?
-                   GroupsFinder.new(current_user).execute
-                 else
-                   current_user.groups
-                 end
-
+        find_params = { all_available: params[:all_available], owned: params[:owned] }
+        groups = GroupsFinder.new(current_user, find_params).execute
         groups = groups.search(params[:search]) if params[:search].present?
         groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present?
         groups = groups.reorder(params[:order_by] => params[:sort])