Merge branch 'erdgeist-revive-events'

1 files changed, 13 insertions, 11 deletions

diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb
index 3baf447..c6a2380 100644
--- a/app/models/occurrence.rb
+++ b/app/models/occurrence.rb
@@ -1,19 +1,19 @@
-# TODO Make a gem out of the c wrapper
 require 'chaos_calendar'
 
 class Occurrence < ApplicationRecord
   
   # Associations
   
-  belongs_to :node
+  belongs_to :node,  optional: true
   belongs_to :event
-  
+
   # Class Methods
   
   def self.find_in_range start_time, end_time
-    includes(:node)
-      .where("start_time > ? AND end_time < ?", start_time, end_time)
-      .order("start_time")
+    joins(:event)
+      .includes(:node)
+      .where("occurrences.start_time > ? AND occurrences.end_time < ?", start_time, end_time)
+      .order("occurrences.start_time")
   end
 
   def self.find_next
@@ -27,6 +27,7 @@ class Occurrence < ApplicationRecord
   # event are then calculated and created.
   def self.generate event
     self.where(:event_id => event.id).delete_all
+    return if event.start_time.nil?
     
     node        = event.node
     duration    = (event.end_time - event.start_time)
@@ -36,7 +37,7 @@ class Occurrence < ApplicationRecord
       self.create(
         :start_time => occurrence,
         :end_time   => (occurrence + duration),
-        :node_id    => node.id,
+        :node_id    => node&.id,
         :event_id   => event.id
       )
     end
@@ -49,10 +50,11 @@ class Occurrence < ApplicationRecord
   # Return value is always an array of Time objects.
   def self.generate_dates event
     if event.rrule && !event.rrule.empty?
-      ChaosCalendar::occurrences( 
+      ChaosCalendar::occurrences_for_timezone( 
         event.start_time, 
         (Time.now + 5.years), 
-        event.rrule
+        event.rrule,
+        Time.zone.tzinfo.identifier
       )
     else
       [event.start_time]
@@ -64,7 +66,7 @@ class Occurrence < ApplicationRecord
   # Instance Methods
   
   def summary
-    node.head.title
+    node&.head&.title || event.display_title
   end
-  
+
 end