Adding unread_for? to message with tests

2 files changed, 9 insertions, 1 deletions

diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index c52dac0..14395b9 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -92,7 +92,6 @@ class Discussion < ActiveRecord::Base
 
   def mark_as_read_for(user)
     speaker = Speaker.find_or_create_by_user_id_and_discussion_id(user.id, self.id)
-    # flag.update_attributes(:updat => Time.zone.now)
     speaker.touch
   end
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 436775b..b57cca8 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -12,6 +12,15 @@ class Message < ActiveRecord::Base
   def visible_for? user
     self.created_at.to_i >= self.discussion.user_invited_at(user).to_i
   end
+  
+  def unread_for? user
+    speaker = self.discussion.find_speaker_by_user(user)
+    if speaker
+      self.created_at.to_i >= speaker.updated_at.to_i
+    else
+      true
+    end
+  end
 
   private