fix : likeCommentIfNew는 Optional을 리턴하도록 수정한다.

team-offonoff · Feb 29, 2024 · a29355b · a29355b
1 parent 15004e0
commit a29355b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/life/offonoff/ab/application/service/CommentService.java b/src/main/java/life/offonoff/ab/application/service/CommentService.java
@@ -24,6 +24,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 import static life.offonoff.ab.application.service.common.LengthInfo.COMMENT_CONTENT;
 
 @RequiredArgsConstructor
@@ -138,18 +140,19 @@ public CommentReactionResponse likeCommentForMember(final Long memberId, final L
     private CommentReactionResponse doLike(Member liker, Comment comment) {
 
         liker.cancelHateIfExists(comment);
-        LikedComment likedComment = liker.likeCommentIfNew(comment);
+        Optional<LikedComment> optionalLikedComment = liker.likeCommentIfNew(comment);
 
-        publishCommentLikedEventIfNotNull(likedComment);
+        publishCommentLikedEventIfPresent(optionalLikedComment);
 
         return new CommentReactionResponse(comment.getLikeCount(), comment.getHateCount(), true, false);
     }
 
-    private void publishCommentLikedEventIfNotNull(LikedComment likedComment) {
-        if (likedComment == null) {
-            return;
+    private void publishCommentLikedEventIfPresent(Optional<LikedComment> optional) {
+        if (optional.isPresent()) {
+            LikedComment likedComment = optional.get();
+
+            eventPublisher.publishEvent(new CommentLikedEvent(likedComment);
         }
-        eventPublisher.publishEvent(new CommentLikedEvent(likedComment));
     }
 
     private CommentReactionResponse cancelLike(Member liker, Comment comment) {

diff --git a/src/main/java/life/offonoff/ab/domain/member/Member.java b/src/main/java/life/offonoff/ab/domain/member/Member.java
@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -113,16 +114,17 @@ public void addComment(Comment comment) {
         comments.add(comment);
     }
 
-    public LikedComment likeCommentIfNew(Comment comment) {
+    public Optional<LikedComment> likeCommentIfNew(Comment comment) {
         if (likeAlready(comment)) {
-            return null;
+            return Optional.empty();
         }
 
         LikedComment likedComment = new LikedComment(this, comment);
         comment.increaseLikeCount();
 
         likedComments.add(likedComment);
-        return likedComment;
+
+        return Optional.of(likedComment);
     }
 
     public void hateCommentIfNew(Comment comment) {