Introduce helpful scopes (#538)

Introduce a couple of helpful scopes to ExternalUser and Group

- **Introduce members_of scope**
- **Introduce active scope to users and groups**

Author: xjunior

audiences/app/models/audiences/external_user.rb

@@ -25,6 +25,12 @@ class ExternalUser < ApplicationRecord
       Audiences::Notifications.publish(*[*contexts, *group_contexts, *match_all_contexts].uniq)
     end
 
+    scope :active, -> { where(active: true) }
+
+    scope :members_of, ->(*groups) do
+      where(id: Audiences::GroupMembership.where(group_id: groups.pluck(:id)).select(:external_user_id))
+    end
+
     scope :search, ->(display_name) do
       where(arel_table[:display_name].matches("%#{display_name}%"))
     end
@@ -41,7 +47,7 @@ class ExternalUser < ApplicationRecord
                .group_by(&:resource_type)
                .values
                .reduce(self) do |scope, groups|
-        scope.where(id: Audiences::GroupMembership.where(group_id: groups.pluck(:id)).select(:external_user_id))
+        scope.members_of(*groups)
       end
     end
 

audiences/app/models/audiences/group.rb

@@ -9,6 +9,8 @@ class Group < ApplicationRecord
     validates :external_id, presence: true
     validates :scim_id, presence: true
 
+    scope :active, -> { where(active: true) }
+
     scope :search, ->(display_name) do
       where(arel_table[:display_name].matches("%#{display_name}%"))
     end

audiences/lib/audiences/configuration.rb

@@ -33,10 +33,10 @@ module Audiences
   #     config.default_users_scope = -> { includes(:groups).merge(Audiences::Group.where(scim_id: ALLOWED_GROUPS)) }
   #   end
   #
-  # This configuration defaults to `-> { where(active: true) }`
+  # This configuration defaults to `-> { active }`
   #
   config_accessor :default_users_scope do
-    ->(*) { where(active: true) }
+    ->(*) { active }
   end
 
   # Defines a default scope for groups, so the groups that are part of an audience can
@@ -56,10 +56,10 @@ module Audiences
   #     config.default_groups_scope = -> { where(scim_id: ALLOWED_GROUPS) }
   #   end
   #
-  # This configuration defaults to `-> { where(active: true) }`
+  # This configuration defaults to `-> { active }`
   #
   config_accessor :default_groups_scope do
-    ->(*) { where(active: true) }
+    ->(*) { active }
   end
 
   # These are the user attributes that will be exposed in the audiences endpoints.