Evict caches on user changes, fix tests

5 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/com/juick/service/CrosspostService.java b/src/main/java/com/juick/service/CrosspostService.java
index 28b9e8ab..a8e66a68 100644
--- a/src/main/java/com/juick/service/CrosspostService.java
+++ b/src/main/java/com/juick/service/CrosspostService.java
@@ -20,6 +20,7 @@ package com.juick.service;
 import com.juick.ExternalToken;
 import com.juick.model.ApplicationStatus;
 import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.cache.annotation.CacheEvict;
 
 import javax.annotation.Nonnull;
 import java.util.Optional;
@@ -72,15 +73,18 @@ public interface CrosspostService {
 
     String getTelegramNameByHash(String hash);
 
+    @CacheEvict(value = "users_by_name", allEntries = true)
     boolean setFacebookUser(String hash, int uid);
 
     String getVKNameByHash(String hash);
 
     boolean setVKUser(String hash, int uid);
 
+    @CacheEvict(value = "users_by_name", allEntries = true)
     boolean setTelegramUser(String hash, int uid);
 
     String getJIDByHash(String hash);
 
+    @CacheEvict(value = "users_by_name", allEntries = true)
     boolean setJIDUser(String hash, int uid);
 }
diff --git a/src/main/java/com/juick/service/EmailService.java b/src/main/java/com/juick/service/EmailService.java
index 0708cd96..26f26d59 100644
--- a/src/main/java/com/juick/service/EmailService.java
+++ b/src/main/java/com/juick/service/EmailService.java
@@ -17,12 +17,15 @@
 
 package com.juick.service;
 
+import org.springframework.cache.annotation.CacheEvict;
+
 import java.util.List;
 
 /**
  * Created by vitalyster on 09.12.2016.
  */
 public interface EmailService {
+    @CacheEvict(value = "users_by_name", allEntries = true)
     boolean verifyAddressByCode(Integer userId, String code);
     boolean addVerificationCode(Integer userId, String account, String code);
     boolean addEmail(Integer userId, String email);
diff --git a/src/main/java/com/juick/service/PrivacyQueriesService.java b/src/main/java/com/juick/service/PrivacyQueriesService.java
index 17dd6a9b..b208c446 100644
--- a/src/main/java/com/juick/service/PrivacyQueriesService.java
+++ b/src/main/java/com/juick/service/PrivacyQueriesService.java
@@ -19,6 +19,7 @@ package com.juick.service;
 
 import com.juick.Tag;
 import com.juick.User;
+import org.springframework.cache.annotation.CacheEvict;
 
 /**
  * Created by aalexeev on 11/13/16.
@@ -28,7 +29,9 @@ public interface PrivacyQueriesService {
         Removed, Added
     }
 
+    @CacheEvict(value = { "discussions", "messages", "replies" }, allEntries = true)
     PrivacyResult blacklistUser(User user, User target);
 
+    @CacheEvict(value = { "discussions", "messages", "replies" }, allEntries = true)
     PrivacyResult blacklistTag(User user, Tag tag);
 }
diff --git a/src/main/java/com/juick/service/SubscriptionService.java b/src/main/java/com/juick/service/SubscriptionService.java
index 8bc8d071..b9bfcabd 100644
--- a/src/main/java/com/juick/service/SubscriptionService.java
+++ b/src/main/java/com/juick/service/SubscriptionService.java
@@ -21,6 +21,7 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.model.NotifyOpts;
+import org.springframework.cache.annotation.CacheEvict;
 
 import java.util.List;
 
@@ -37,6 +38,7 @@ public interface SubscriptionService {
 
     List<User> getUsersSubscribedToUserRecommendations(int uid, Message msg);
 
+    @CacheEvict(value = { "discussions" }, allEntries = true)
     boolean subscribeMessage(Message message, User user);
 
     boolean unSubscribeMessage(int mid, int vuid);
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index de742447..0064a589 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1909,7 +1909,9 @@ public class ServerTests {
     @Test
     public void verifiedUsersTest(){
         assertThat(userService.getUserByName("ugnich").isVerified(), is(false));
-        jdbcTemplate.update("INSERT INTO facebook(user_id, fb_id) VALUES(?, ?)", ugnich.getUid(), "100001866137681");
+        crosspostService.addFacebookState("12345", "http://localhost");
+        crosspostService.createFacebookUser(12345, "12345", "5678", "ugnich");
+        crosspostService.setFacebookUser("12345", ugnich.getUid());
         assertThat(userService.getUserByName("ugnich").isVerified(), is(true));
     }
     @Test