From b17387a17669bfc9afce7435653cd8c29c686999 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 12 Jul 2014 09:12:48 +0200 Subject: some cleanup of the messages api and cuke feature --- app/models/message.rb | 4 ++++ app/models/user.rb | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'app/models') diff --git a/app/models/message.rb b/app/models/message.rb index 424f094..2478f3f 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -26,4 +26,8 @@ class Message < CouchRest::Model::Base def unread_by?(user) user_ids_to_show.include?(user.id) end + + def as_json(*args, &block) + {"id" => id, "text" => text}.as_json(*args, &block) + end end diff --git a/app/models/user.rb b/app/models/user.rb index 6bc5841..9ac7d3d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -92,12 +92,9 @@ class User < CouchRest::Model::Base Ticket.for_user(self).limit(count).all #defaults to having most recent updated first end - def messages(unseen = true) + def messages #TODO for now this only shows unseen messages. Will we ever want seen ones? Is it necessary to store? - - # we don't want to emit all the userids associated with a message, so only emit id and text. - Message.by_user_ids_to_show.key(self.id).map { |message| [message.id, message.text] } - + Message.by_user_ids_to_show.key(self.id) end # DEPRECATED -- cgit v1.2.3