Browse Source

bugfix: fix some bugs

ggbocoder 2 years ago
parent
commit
0e706efc2a

+ 2 - 2
src/main/java/cn/seecoder/fdroidrepository/Controller/LikeController.java

@@ -34,7 +34,7 @@ public class LikeController {
      * @param postId commentId
      * @param userId userId
      */
-    @GetMapping("/")
+    @GetMapping("/post")
     public SingleResult<Map> like(@RequestParam String postId, @RequestParam String userId){
         likeService.operateLike2Redis(userId,postId);
         boolean isLike= likeService.userPostStatus(postId, userId);
@@ -44,7 +44,7 @@ public class LikeController {
                 .setTopic(TOPIC_LIKE)
                 .setUserId(Long.parseLong(userId))
                 .setEntityId(Long.parseLong(postId))
-                .setUserId(forumPost.getUserId())
+                .setEntityUserId(forumPost.getUserId())
                 .setData("postId",postId);
             eventProducer.fireEvent(event);
         }

+ 11 - 5
src/main/java/cn/seecoder/fdroidrepository/event/EventConsumer.java

@@ -37,12 +37,18 @@ public class EventConsumer {
             logger.error("消息格式错误!");
             return;
         }
-        switch (event.getTopic()){
-            case TOPIC_FOLLOW:
+        String topic = event.getTopic();
+        switch (topic){
+            case TOPIC_LIKE:
                 User follower = userService.loadUserByUserId((int) event.getEntityUserId());
-                String mailAddr = follower.getEmail();
-                User followee = userService.loadUserByUserId((int) event.getUserId());
-                mailService.followMail(mailAddr,followee.getUsername());
+                if(follower!=null){
+                    String mailAddr = follower.getEmail();
+                    User followee = userService.loadUserByUserId((int) event.getUserId());
+                    mailService.followMail(mailAddr,followee.getUsername());
+                }else {
+                    logger.error("no user find for Id "+event.getEntityUserId());
+                }
+
         }
 
     }

+ 23 - 0
src/test/java/cn/seecoder/fdroidrepository/Service/ServiceImpl/UserServiceTest.java

@@ -0,0 +1,23 @@
+package cn.seecoder.fdroidrepository.Service.ServiceImpl;
+
+import cn.seecoder.fdroidrepository.DataObject.User;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class UserServiceTest {
+
+    @Autowired
+    private UserService userService;
+
+    @Test
+    void loadUserByUserId() {
+        User user = userService.loadUserByUserId(1);
+        Assertions.assertEquals("ggbo",user.getUsername());
+
+    }
+}