Make unread_count for received messages not include archived messages

3 files changed, 12 insertions, 1 deletions

diff --git a/app/models/message.rb b/app/models/message.rb
index edd65a1..99dfcef 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -153,6 +153,7 @@ class Message < ActiveRecord::Base
       self.archived_by_recipient = true
     end
   end
+  
   protected
     def send_email_notification_if_required
       if recipient.wants_email_notifications? and (recipient != sender)
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a823b0..ff3d30b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,7 +87,10 @@ class User < ActiveRecord::Base
     end
     
     def unread_count
-      count(:all, :conditions => {:aasm_state => "unread"})
+      count(:all, :conditions => {
+        :aasm_state => "unread",
+        :archived_by_recipient => false,
+      })
     end
   end
   
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 5b7f896..dc2fb09 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -291,6 +291,13 @@ class UserTest < ActiveSupport::TestCase
       assert_equal(1, @recipient.received_messages.unread_count)
     end
     
+    should "not include archived messages in the unread count" do
+      msg = @recipient.received_messages.unread.first
+      msg.archived_by(@recipient)
+      msg.save!
+      assert_equal(0, @recipient.received_messages.unread_count)
+    end
+    
     context 'Top level messages' do
       setup do
         @sender = Factory.create(:user)