db refactoring: merge getMessages with isSubscribed query

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/juick/service/MessagesService.java b/src/main/java/com/juick/service/MessagesService.java
index 88f79c14..6881c924 100644
--- a/src/main/java/com/juick/service/MessagesService.java
+++ b/src/main/java/com/juick/service/MessagesService.java
@@ -67,11 +67,10 @@ public interface MessagesService {
     @CacheEvict(value = { "discover", "discussions", "messages", "replies" }, allEntries = true)
     void setReadOnly(int mid, boolean readonly);
 
-    boolean isSubscribed(int uid, int mid);
-
     int getMessagePrivacy(int mid);
 
     Optional<Message> getMessage(int mid);
+    Optional<Message> getMessage(int uid, int mid);
 
     Message getReply(int mid, int rid);
 
@@ -121,8 +120,8 @@ public interface MessagesService {
 
     List<Integer> getUserSearch(User visitor, int UID, String search, int privacy, int page);
 
-    @Cacheable(value = "messages", key="{ #visitor.uid, #mids.hashCode() }")
-    List<Message> getMessages(User visitor, List<Integer> mids);
+    @Cacheable(value = "messages", key="{ #uid, #mids.hashCode() }")
+    List<Message> getMessages(int uid, List<Integer> mids);
     @Cacheable(value = "replies", key="{ #user.uid, #mid }")
     List<Message> getReplies(User user, int mid);