Move TOC check to scope

Author: gnclmorais

app/models/invitation_manager.rb

@@ -29,17 +29,13 @@ def send_meeting_emails(meeting)
 
   def invite_students_to_event(event, chapter)
     chapter_students(chapter).each do |student|
-      next unless student.accepted_toc_at
-
       invitation = Invitation.new(event: event, member: student, role: 'Student')
       EventInvitationMailer.invite_student(event, student, invitation).deliver_now if invitation.save
     end
   end
 
   def invite_coaches_to_event(event, chapter)
     chapter_coaches(chapter).each do |coach|
-      next unless coach.accepted_toc_at
-
       invitation = Invitation.new(event: event, member: coach, role: 'Coach')
       EventInvitationMailer.invite_coach(event, coach, invitation).deliver_now if invitation.save
     end

app/models/member.rb

@@ -20,6 +20,7 @@ class Member < ApplicationRecord
   validates :email, uniqueness: true
   validates :about_you, length: { maximum: 255 }
 
+  scope :accepted_toc, -> { where.not(accepted_toc_at: nil) }
   scope :order_by_email, -> { order(:email) }
   scope :subscribers, -> { joins(:subscriptions).order('created_at desc').uniq }
   scope :not_banned, lambda {
@@ -32,7 +33,9 @@ class Member < ApplicationRecord
                                 .where('meeting_invitations.meeting_id = ? and meeting_invitations.attending = ?',
                                        meeting.id, true)
                             }
-  scope :in_group, ->(members) { not_banned.joins(:groups).where(groups: { id: members.select(:id) }) }
+  scope :in_group, lambda { |members|
+    not_banned.accepted_toc.joins(:groups).where(groups: { id: members.select(:id) })
+  }
 
   scope :with_skill, ->(skill_name) { tagged_with(skill_name) }