diff options
Diffstat (limited to 'users/app/models')
| -rw-r--r-- | users/app/models/user.rb | 13 | ||||
| -rw-r--r-- | users/app/models/user_message.rb | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb index fe3a127..fc63ae9 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -13,6 +13,9 @@ class User < CouchRest::Model::Base property :desired_service_level_code, Integer, :accessible => true property :effective_service_level_code, Integer, :accessible => true + property :message_ids_to_see, [String] + property :message_ids_seen, [String] + before_save :update_effective_service_level validates :login, :password_salt, :password_verifier, @@ -74,6 +77,7 @@ class User < CouchRest::Model::Base def messages(unseen = true) +=begin user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [self.id, false]).all : UserMessage.by_user_id(:key => self.id).all messages = [] @@ -81,6 +85,15 @@ class User < CouchRest::Model::Base messages << Message.find(um.message.id) end messages +=end + + message_ids = unseen ? self.message_ids_to_see : self.message_ids_to_see + self.message_ids_seen # TODO check unique? + + messages = [] + message_ids.each do |message_id| + messages << Message.find(message_id) + end + messages end diff --git a/users/app/models/user_message.rb b/users/app/models/user_message.rb index 37aae0b..51ca46c 100644 --- a/users/app/models/user_message.rb +++ b/users/app/models/user_message.rb @@ -1,4 +1,5 @@ -class UserMessage < CouchRest::Model::Base +# TODO WOULD NOT USE anymore, in proposed alternate, so delete file. +class XXXXUserMessage < CouchRest::Model::Base use_database :user_messages belongs_to :user |