moved query to scope

robsdudeson · Nov 9, 2017 · 66cd80a · 66cd80a
1 parent fdb665e
commit 66cd80a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/models/meeting.rb b/app/models/meeting.rb
@@ -4,16 +4,17 @@ class Meeting < ActiveRecord::Base
 
   attr_accessor :crb_times
 
+  scope :future_meetings, -> { where(["DATE(time) >= ?", Date.today]).order('time ASC') }
   scope :lecture, -> { where(["format = ?", "Lecture"]) }
   scope :current_month_crb, -> { where(["DATE(time) >? AND DATE(time)<?", Time.now.beginning_of_month, Time.now.end_of_month]).order('time ASC').limit(1) }
   def self.add_speaker_to_next_meeting(name, title, url)
     find_or_create_next_date.speakers.create!({name: name, title:title, url: url})
   end
 
   def self.find_or_create_next_date
-    @next_crb = Meeting.where(["DATE(time) >= ?", Date.today]).order('time ASC').first
+    @next_crb = future_meetings.first
     if @next_crb.blank?
-      if Meeting.current_month_crb.blank?
+      if current_month_crb.blank?
         next_month = 0
       else
         next_month = 1
@@ -26,7 +27,7 @@ def self.find_or_create_next_date
       e         = curr_time.end_of_month
       crb_time  = (s..e).select{|d| d.wday == 1}[2] + 18.5.hours
 
-      Meeting.find_or_create_by(time: crb_time)
+      find_or_create_by(time: crb_time)
     else
       @next_crb
     end