Revert "FEATURE: moderators allowed to view groups which members can see."

Build is broken.

This reverts commit 2bf0c4188b.

app/models/group.rb

@@ -121,18 +121,18 @@ class Group < ActiveRecord::Base
     end
 
     if !user&.admin
-      is_staff = !!user&.staff?
-
-      if user.blank?
-        sql = "groups.visibility_level = :public"
-      elsif is_staff
-        sql = "groups.visibility_level IN (:public, :logged_on_users, :members, :staff)"
-      else
       sql = <<~SQL
         groups.id IN (
           SELECT id
             FROM groups
-            WHERE visibility_level IN (:public, :logged_on_users)
+           WHERE visibility_level = :public
+
+          UNION ALL
+
+          SELECT id
+            FROM groups
+           WHERE visibility_level = :logged_on_users
+             AND :user_id IS NOT NULL
 
           UNION ALL
 
@@ -143,15 +143,22 @@ class Group < ActiveRecord::Base
 
           UNION ALL
 
+          SELECT g.id
+            FROM groups g
+       LEFT JOIN group_users gu ON gu.group_id = g.id AND gu.user_id = :user_id AND gu.owner
+           WHERE g.visibility_level = :staff
+             AND (gu.id IS NOT NULL OR :is_staff)
+
+          UNION ALL
+
           SELECT g.id
             FROM groups g
             JOIN group_users gu ON gu.group_id = g.id AND gu.user_id = :user_id AND gu.owner
-            WHERE g.visibility_level IN (:staff, :owners)
+           WHERE g.visibility_level = :owners
         )
       SQL
-      end
 
-      params = Group.visibility_levels.to_h.merge(user_id: user&.id, is_staff: is_staff)
+      params = Group.visibility_levels.to_h.merge(user_id: user&.id, is_staff: !!user&.staff?)
       groups = groups.where(sql, params)
     end
 
@@ -166,18 +173,18 @@ class Group < ActiveRecord::Base
     end
 
     if !user&.admin
-      is_staff = !!user&.staff?
-
-      if user.blank?
-        sql = "groups.members_visibility_level = :public"
-      elsif is_staff
-        sql = "groups.members_visibility_level IN (:public, :logged_on_users, :members, :staff)"
-      else
       sql = <<~SQL
         groups.id IN (
           SELECT id
             FROM groups
-            WHERE members_visibility_level IN (:public, :logged_on_users)
+           WHERE members_visibility_level = :public
+
+          UNION ALL
+
+          SELECT id
+            FROM groups
+           WHERE members_visibility_level = :logged_on_users
+             AND :user_id IS NOT NULL
 
           UNION ALL
 
@@ -188,15 +195,22 @@ class Group < ActiveRecord::Base
 
           UNION ALL
 
+          SELECT g.id
+            FROM groups g
+       LEFT JOIN group_users gu ON gu.group_id = g.id AND gu.user_id = :user_id AND gu.owner
+           WHERE g.members_visibility_level = :staff
+             AND (gu.id IS NOT NULL OR :is_staff)
+
+          UNION ALL
+
           SELECT g.id
             FROM groups g
             JOIN group_users gu ON gu.group_id = g.id AND gu.user_id = :user_id AND gu.owner
-            WHERE g.members_visibility_level IN (:staff, :owners)
+           WHERE g.members_visibility_level = :owners
         )
       SQL
-      end
 
-      params = Group.visibility_levels.to_h.merge(user_id: user&.id, is_staff: is_staff)
+      params = Group.visibility_levels.to_h.merge(user_id: user&.id, is_staff: !!user&.staff?)
       groups = groups.where(sql, params)
     end
 

config/locales/client.en.yml

@@ -3588,8 +3588,8 @@ en:
               title: "Who can see this group?"
               public: "Everyone"
               logged_on_users: "Logged on users"
-              members: "Group owners, members and moderators"
+              members: "Group owners, members"
-              staff: "Group owners and moderators"
+              staff: "Group owners and staff"
               owners: "Group owners"
               description: "Admins can see all groups."
             members_visibility_levels:

spec/models/group_spec.rb

@@ -698,7 +698,7 @@ describe Group do
 
       expect(can_view?(admin, group)).to eq(true)
       expect(can_view?(owner, group)).to eq(true)
-      expect(can_view?(moderator, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(false)
       expect(can_view?(member, group)).to eq(true)
       expect(can_view?(logged_on_user, group)).to eq(false)
       expect(can_view?(nil, group)).to eq(false)
@@ -763,7 +763,7 @@ describe Group do
 
       expect(can_view?(admin, group)).to eq(true)
       expect(can_view?(owner, group)).to eq(true)
-      expect(can_view?(moderator, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(false)
       expect(can_view?(member, group)).to eq(true)
       expect(can_view?(logged_on_user, group)).to eq(false)
       expect(can_view?(nil, group)).to eq(false)