Merge pull request #40 from classic-daramg/feature/19

Feature/19: 유저 및 포스트 interaction 관련 기능 구현

Author: hyobin-yang

src/main/java/com/daramg/server/auth/application/AuthService.java

@@ -4,12 +4,12 @@
 import com.daramg.server.auth.exception.AuthErrorStatus;
 import com.daramg.server.auth.util.JwtUtil;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import com.daramg.server.auth.domain.SignupVo;
 import com.daramg.server.auth.dto.LoginRequestDto;
 import com.daramg.server.auth.dto.PasswordRequestDto;
 import com.daramg.server.auth.dto.SignupRequestDto;
-import com.daramg.server.domain.user.repository.UserRepository;
+import com.daramg.server.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/daramg/server/auth/application/MailVerificationServiceImpl.java

@@ -9,7 +9,7 @@
 import com.daramg.server.auth.util.MimeMessageGenerator;
 import com.daramg.server.auth.util.VerificationCodeGenerator;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.domain.user.repository.UserRepository;
+import com.daramg.server.user.repository.UserRepository;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;

src/main/java/com/daramg/server/auth/filter/JwtAuthorizationFilter.java

@@ -4,8 +4,7 @@
 import com.daramg.server.auth.util.CookieUtil;
 import com.daramg.server.auth.util.JwtUtil;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.common.exception.UnauthorizedException;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.Cookie;

src/main/java/com/daramg/server/auth/presentation/AuthController.java

@@ -6,7 +6,7 @@
 import com.daramg.server.auth.exception.AuthErrorStatus;
 import com.daramg.server.auth.util.CookieUtil;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

src/main/java/com/daramg/server/auth/resolver/AuthUserResolver.java

@@ -2,7 +2,7 @@
 
 import com.daramg.server.auth.exception.AuthErrorStatus;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.core.MethodParameter;

src/main/java/com/daramg/server/auth/util/JwtUtil.java

@@ -10,7 +10,7 @@
 import com.daramg.server.auth.dto.TokenResponseDto;
 import com.daramg.server.auth.exception.AuthErrorStatus;
 import com.daramg.server.common.exception.BusinessException;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/com/daramg/server/comment/application/CommentService.java

@@ -0,0 +1,99 @@
+package com.daramg.server.comment.application;
+
+import com.daramg.server.comment.domain.Comment;
+import com.daramg.server.comment.domain.CommentLike;
+import com.daramg.server.comment.dto.CommentLikeResponseDto;
+import com.daramg.server.comment.repository.CommentLikeRepository;
+import com.daramg.server.comment.repository.CommentRepository;
+import com.daramg.server.common.application.EntityUtils;
+import com.daramg.server.common.exception.BusinessException;
+import com.daramg.server.post.domain.Post;
+import com.daramg.server.post.dto.CommentCreateDto;
+import com.daramg.server.post.dto.CommentReplyCreateDto;
+import com.daramg.server.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class CommentService {
+
+    private final EntityUtils entityUtils;
+    private final CommentRepository commentRepository;
+    private final CommentLikeRepository commentLikeRepository;
+
+    public void createComment(Long postId, CommentCreateDto request, User user){
+        Post post = entityUtils.getEntity(postId, Post.class);
+        if (post.isBlocked()){
+            throw new BusinessException("블락된 포스트에는 댓글을 남길 수 없습니다.");
+        }
+
+        Comment comment = Comment.of(
+                post,
+                user,
+                request.getContent(),
+                null
+        );
+
+        commentRepository.save(comment);
+        post.incrementCommentCount();
+    }
+
+    public void createReply(Long commentId, CommentReplyCreateDto request, User user){
+        Comment parentComment = entityUtils.getEntity(commentId, Comment.class);
+        if (parentComment.isDeleted() || parentComment.isBlocked()){
+            throw new BusinessException("삭제되었거나 블락된 댓글에는 대댓글을 남길 수 없습니다.");
+        }
+        Post post = parentComment.getPost();
+        if (post.isBlocked()){
+            throw new BusinessException("블락된 포스트에는 댓글을 남길 수 없습니다.");
+        }
+
+        Comment reply = Comment.of(
+                post,
+                user,
+                request.getContent(),
+                parentComment
+        );
+
+        commentRepository.save(reply);
+        post.incrementCommentCount();
+    }
+
+    public CommentLikeResponseDto toggleCommentLike(Long commentId, User user){
+        Comment comment = entityUtils.getEntity(commentId, Comment.class);
+        if (comment.isDeleted() || comment.isBlocked()){
+            throw new BusinessException("삭제되었거나 블락된 댓글에는 좋아요를 누를 수 없습니다.");
+        }
+
+        boolean alreadyLiked = commentLikeRepository
+                .existsByCommentIdAndUserId(commentId, user.getId());
+
+        if (alreadyLiked) {
+            commentLikeRepository.deleteByCommentIdAndUserId(commentId, user.getId());
+            comment.decrementLikeCount();
+            return new CommentLikeResponseDto(false, comment.getLikeCount());
+        }
+
+        commentLikeRepository.save(CommentLike.of(comment, user));
+        comment.incrementLikeCount();
+        return new CommentLikeResponseDto(true, comment.getLikeCount());
+    }
+
+    public void deleteComment(Long commentId, User user){
+        Comment comment = entityUtils.getEntity(commentId, Comment.class);
+
+        if (comment.isDeleted()){
+            throw new BusinessException("이미 삭제 처리된 댓글입니다.");
+        }
+        if (comment.getUser() == null || !comment.getUser().getId().equals(user.getId())){
+            throw new BusinessException("댓글을 작성한 유저만 댓글을 삭제할 수 있습니다.");
+        }
+
+        comment.softDelete();
+        commentLikeRepository.deleteAllByCommentId(commentId);
+        comment.resetLikeCount();
+    }
+}

…g/server/domain/interaction/Comment.java …aramg/server/comment/domain/Comment.javasrc/main/java/com/daramg/server/domain/interaction/Comment.java renamed to src/main/java/com/daramg/server/comment/domain/Comment.java src/main/java/com/daramg/server/domain/interaction/Comment.java renamed to src/main/java/com/daramg/server/comment/domain/Comment.java

@@ -1,11 +1,10 @@
-package com.daramg.server.domain.interaction;
+package com.daramg.server.comment.domain;
 
 import com.daramg.server.common.domain.BaseEntity;
-import com.daramg.server.domain.post.domain.Post;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.post.domain.Post;
+import com.daramg.server.user.domain.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.lang.NonNull;
@@ -27,8 +26,14 @@ public class Comment extends BaseEntity<Comment> {
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
+    @Column(name = "content", nullable = false, length = 500)
+    private String content;
+
+    @Column(name = "is_deleted", nullable = false)
+    private boolean isDeleted = false;
+
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent_comment_id")
+    @JoinColumn(name = "parent_comment_id", nullable = true)
     private Comment parentComment;
 
     @OneToMany(mappedBy = "parentComment", cascade = CascadeType.ALL, orphanRemoval = true)
@@ -40,10 +45,35 @@ public class Comment extends BaseEntity<Comment> {
     @Column(name = "is_blocked", nullable = false)
     private boolean isBlocked = false;
 
-    @Builder
-    public Comment(@NonNull Post post, @NonNull User user, Comment parentComment) {
+    private Comment(Post post, User user, String content, Comment parentComment) {
         this.post = post;
         this.user = user;
+        this.content = content;
         this.parentComment = parentComment;
     }
+
+    public static Comment of(@NonNull Post post,
+                             @NonNull User user,
+                             @NonNull String content,
+                             Comment parentComment) {
+        return new Comment(post, user, content, parentComment);
+    }
+
+    public void incrementLikeCount() {
+        likeCount++;
+    }
+
+    public void decrementLikeCount() {
+        if(likeCount > 0){
+            likeCount--;
+        }
+    }
+
+    public void softDelete() {
+        this.isDeleted = true;
+    }
+
+    public void resetLikeCount() {
+        this.likeCount = 0;
+    }
 }

…rver/domain/interaction/CommentLike.java …g/server/comment/domain/CommentLike.javasrc/main/java/com/daramg/server/domain/interaction/CommentLike.java renamed to src/main/java/com/daramg/server/comment/domain/CommentLike.java src/main/java/com/daramg/server/domain/interaction/CommentLike.java renamed to src/main/java/com/daramg/server/comment/domain/CommentLike.java

@@ -1,7 +1,7 @@
-package com.daramg.server.domain.interaction;
+package com.daramg.server.comment.domain;
 
 import com.daramg.server.common.domain.BaseEntity;
-import com.daramg.server.domain.user.domain.User;
+import com.daramg.server.user.domain.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -29,9 +29,12 @@ public class CommentLike extends BaseEntity<CommentLike> {
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
-    @Builder
-    public CommentLike(@NonNull Comment comment, @NonNull User user) {
+    private CommentLike(@NonNull Comment comment, @NonNull User user) {
         this.comment = comment;
         this.user = user;
     }
+
+    public static CommentLike of(Comment comment, User user) {
+        return new CommentLike(comment, user);
+    }
 }

src/main/java/com/daramg/server/comment/dto/CommentLikeResponseDto.kt

@@ -0,0 +1,6 @@
+package com.daramg.server.comment.dto
+
+data class CommentLikeResponseDto(
+    val isLiked: Boolean,
+    val likeCount: Int
+)