group.rb in openstax_accounts-6.1.5

- old
+ new

@@ -24,21 +24,17 @@
     has_many :member_group_nestings, dependent: :destroy,
              class_name: 'OpenStax::Accounts::GroupNesting', primary_key: :openstax_uid,
              foreign_key: :container_group_id, inverse_of: :container_group
     has_many :member_groups, through: :member_group_nestings
 
-    validates :openstax_uid, :uniqueness => true, :presence => true
-    validates_presence_of :requestor, :unless => :syncing_or_stubbing
-    validates_uniqueness_of :name, :allow_nil => true,
-                                   :unless => :syncing_or_stubbing
+    validates :openstax_uid, uniqueness: true, presence: true
+    validates_presence_of :requestor, unless: :syncing_or_stubbing
+    validates_uniqueness_of :name, allow_nil: true, unless: :syncing_or_stubbing
 
-    before_validation :create_openstax_accounts_group,
-                      :on => :create, :unless => :syncing_or_stubbing
-    before_update :update_openstax_accounts_group,
-                  :unless => :syncing_or_stubbing
-    before_destroy :destroy_openstax_accounts_group,
-                   :unless => :syncing_or_stubbing
+    before_validation :create_openstax_accounts_group, on: :create, unless: :syncing_or_stubbing
+    before_update :update_openstax_accounts_group, unless: :syncing_or_stubbing
+    before_destroy :destroy_openstax_accounts_group, unless: :syncing_or_stubbing
 
     scope :visible_for, lambda { |account|
       next where(is_public: true) unless account.is_a? OpenStax::Accounts::Account
 
       includes(:group_members).includes(:group_owners)
@@ -61,26 +57,28 @@
       return false unless account.is_a? OpenStax::Accounts::Account
       !account.group_members.where(group_id: subtree_group_ids).first.nil?
     end
 
     def add_owner(account)
-      return false unless account.is_a? OpenStax::Accounts::Account
+      return unless account.is_a? OpenStax::Accounts::Account
       go = GroupOwner.new
       go.group = self
       go.user = account
-      return false unless go.valid?
+      return unless go.valid?
       go.save if persisted?
       group_owners << go
+      go
     end
 
     def add_member(account)
-      return false unless account.is_a? OpenStax::Accounts::Account
+      return unless account.is_a? OpenStax::Accounts::Account
       gm = GroupMember.new
       gm.group = self
       gm.user = account
-      return false unless gm.valid?
+      return unless gm.valid?
       gm.save if persisted?
       group_members << gm
+      gm
     end
 
     def supertree_group_ids
       return cached_supertree_group_ids unless cached_supertree_group_ids.nil?
       return [] unless persisted?