use group_concat when fetching member list

gate-sso · Dec 31, 2018 · aed305f · aed305f
1 parent c351ad1
commit aed305f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -122,13 +122,15 @@ def self.get_sysadmins_and_groups sysadmins, default_admins = true
       select(:user_login_id).
       where("id IN (?)", sysadmins).
       collect(&:user_login_id)
+
+    # TODO: extract to query object
     groups = Group.
       select(%Q(
         id,
         name,
         gid,
         (
-          SELECT user_login_id
+          SELECT GROUP_CONCAT(user_login_id)
           FROM users
           INNER JOIN group_associations
             ON users.id = group_associations.user_id
@@ -137,7 +139,7 @@ def self.get_sysadmins_and_groups sysadmins, default_admins = true
       )).
       where("name IN (?)", sysadmins_login_ids).
       map{ |group|
-        members = (group.members.is_a? Array) ? group.members : [group.members]
+        members = group.members.split(',')
         Group.generate_group_response(group.name, group.gid, members)
       }
     groups << Group.get_default_sysadmin_group_for_host(sysadmins_login_ids, default_admins)