1 files changed, 16 insertions, 14 deletions

diff --git a/app/models/event.rb b/app/models/event.rb
index 94a22e3..b8651a8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,25 +1,27 @@
 class Event < ApplicationRecord
-  
-  # Associations
-  
-  has_many    :occurrences
-  belongs_to  :node
-  
-  # Callbacks
-  
-  after_save  :generate_occurences
-  
-  # Instance Methods
-  
+  include RruleHumanizer
+
+  belongs_to :node, optional: true
+  has_many   :occurrences, dependent: :destroy
+  acts_as_taggable_on :tags
+
+  validates :title, presence: true, unless: -> { node_id.present? }
+
+  after_save :generate_occurrences
+
   def occurrences_in_range start_time, end_time
     self.occurrences.where(
       "start_time > ? AND end_time < ?",
       start_time, end_time
     )
-  end 
+  end
+
+  def display_title
+    title.presence || node&.head&.title || "Untitled event"
+  end
 
   private
-    def generate_occurences
+    def generate_occurrences
       Occurrence.generate self
     end
 end