🔀 :: (#35) 자신의 게시물에 알람 가는 버그 수정 (#103)

* 🐛 :: 자신의 게시물에 알람 가는 버그 수정 * ♻️ :: 코드 정렬
team-xquare · Jun 2, 2023 · 03b3842 · 03b3842
1 parent ebb5be5
commit 03b3842
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 24 deletions.
diff --git a/feed-domain/src/main/java/com/xquare/v1servicefeed/comment/api/impl/CommentApiImpl.java b/feed-domain/src/main/java/com/xquare/v1servicefeed/comment/api/impl/CommentApiImpl.java
@@ -43,31 +43,39 @@ public class CommentApiImpl implements CommentApi {
     @Override
     public void saveComment(CreateCommentDomainRequest request) {
         Feed feed = queryFeedSpi.queryFeedById(request.getFeedId());
+        UUID userId = securitySpi.getCurrentUserId();
 
         commandCommentSpi.saveComment(
                 Comment.builder()
                         .content(request.getContent())
                         .feedId(feed.getId())
-                        .userId(securitySpi.getCurrentUserId())
+                        .userId(userId)
                         .createAt(LocalDateTime.now())
                         .updatedAt(LocalDateTime.now())
                         .build()
         );
 
-        if (feed.getType().equals(CategoryEnum.NOTICE.getName())) {
-            sendNotification(FEED_NOTICE_COMMENT, feed);
-        } else {
-            sendNotification(FEED_BAMBOO_COMMENT, feed);
+        if(feed.getUserId().equals(userId)) {
+            sendNotification(feed);
         }
     }
 
-    private void sendNotification(String topic, Feed feed) {
-        notificationSpi.sendNotification(
-                feed.getUserId(),
-                topic,
-                CONTENT,
-                feed.getId().toString()
-        );
+    private void sendNotification(Feed feed) {
+        if (feed.getType().equals(CategoryEnum.NOTICE.getName())) {
+            notificationSpi.sendNotification(
+                    feed.getUserId(),
+                    FEED_NOTICE_COMMENT,
+                    CONTENT,
+                    feed.getId().toString()
+            );
+        } else {
+            notificationSpi.sendNotification(
+                    feed.getUserId(),
+                    FEED_BAMBOO_COMMENT,
+                    CONTENT,
+                    feed.getId().toString()
+            );
+        }
     }
 
     @Override

diff --git a/feed-domain/src/main/java/com/xquare/v1servicefeed/feedlike/api/impl/FeedLikeApiImpl.java b/feed-domain/src/main/java/com/xquare/v1servicefeed/feedlike/api/impl/FeedLikeApiImpl.java
@@ -40,24 +40,31 @@ public void saveFeedLike(UUID feedId) {
         commandFeedLikeSpi.saveFeedLike(
                 FeedLike.builder()
                         .feedId(feed.getId())
-                        .userId(securitySpi.getCurrentUserId())
+                        .userId(userId)
                         .build()
         );
 
-        if (feed.getType().equals(CategoryEnum.NOTICE.getName())) {
-            sendNotification(FEED_NOTICE_LIKE, feed);
-        } else {
-            sendNotification(FEED_BAMBOO_LIKE, feed);
+        if (!feed.getUserId().equals(userId)) {
+            sendNotification(feed);
         }
     }
 
-    private void sendNotification(String topic, Feed feed) {
-        notificationSpi.sendNotification(
-                feed.getUserId(),
-                topic,
-                CONTENT,
-                feed.getId().toString()
-        );
+    private void sendNotification(Feed feed) {
+        if (feed.getType().equals(CategoryEnum.NOTICE.getName())) {
+            notificationSpi.sendNotification(
+                    feed.getUserId(),
+                    FEED_NOTICE_LIKE,
+                    CONTENT,
+                    feed.getId().toString()
+            );
+        } else {
+            notificationSpi.sendNotification(
+                    feed.getUserId(),
+                    FEED_BAMBOO_LIKE,
+                    CONTENT,
+                    feed.getId().toString()
+            );
+        }
     }
 
     @Override