[Feat] 회원 탈퇴 구현 및 투표 조회시 투표 득표수 보여주도록 수정

src/main/java/konkuk/thip/book/adapter/out/persistence/BookCommandPersistenceAdapter.java

@@ -92,4 +92,9 @@ public void deleteSavedBook(Long userId, Long bookId) {
     public void deleteAllByIdInBatch(Set<Long> unusedBookIds) {
         bookJpaRepository.deleteAllByIdInBatch(unusedBookIds);
     }
+
+    @Override
+    public void deleteAllSavedBookByUserId(Long userId) {
+        savedBookJpaRepository.deleteAllByUserId(userId);
+    }
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/SavedBookJpaRepository.java

@@ -13,5 +13,9 @@ public interface SavedBookJpaRepository extends JpaRepository<SavedBookJpaEntity
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("DELETE FROM SavedBookJpaEntity s WHERE s.userJpaEntity.userId = :userId AND s.bookJpaEntity.bookId = :bookId")
-    void deleteByUserIdAndBookId(Long userId, Long bookId);
+    void deleteByUserIdAndBookId(@Param("userId") Long userId, @Param("bookId") Long bookId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("DELETE FROM SavedBookJpaEntity s WHERE s.userJpaEntity.userId = :userId")
+    void deleteAllByUserId(@Param("userId") Long userId);
 }

src/main/java/konkuk/thip/book/application/port/out/BookCommandPort.java

@@ -29,4 +29,6 @@ default Book getByIsbnOrThrow(String isbn){
     void deleteSavedBook(Long userId, Long bookId);
 
     void deleteAllByIdInBatch(Set<Long> unusedBookIds);
+
+    void deleteAllSavedBookByUserId(Long userId);
 }

src/main/java/konkuk/thip/comment/adapter/out/jpa/CommentJpaEntity.java

@@ -10,9 +10,6 @@
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Entity
 @Table(name = "comments")
 @Getter
@@ -34,11 +31,15 @@ public class CommentJpaEntity extends BaseJpaEntity {
     @Column(name = "report_count", nullable = false)
     private int reportCount = 0;
 
+    /**
+     * -- SETTER --
+     *  회원 탈퇴용
+     */
+    @Setter
     @Builder.Default
     @Column(name = "like_count", nullable = false)
     private int likeCount = 0;
 
-    //TODO 상속구조 해지하면서 postType만 가질지, postId + postType가질지 논의 필요
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "post_id", nullable = false)
     private PostJpaEntity postJpaEntity;
@@ -58,11 +59,6 @@ public class CommentJpaEntity extends BaseJpaEntity {
     @JoinColumn(name = "parent_id")
     private CommentJpaEntity parent;
 
-    // 삭제용 댓글 좋아요 양방향 매핑 관계
-    @Builder.Default
-    @OneToMany(mappedBy = "commentJpaEntity", cascade = CascadeType.REMOVE, orphanRemoval = true)
-    private List<CommentLikeJpaEntity> commentLikeList = new ArrayList<>();
-
     public CommentJpaEntity updateFrom(Comment comment) {
         this.reportCount = comment.getReportCount();
         this.likeCount = comment.getLikeCount();

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentCommandPersistenceAdapter.java

@@ -17,7 +17,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
@@ -57,17 +58,6 @@ public Long save(Comment comment) {
         ).getCommentId();
     }
 
-    private PostJpaEntity findPostJpaEntity(PostType postType, Long postId) {
-        return switch (postType) {
-            case FEED -> feedJpaRepository.findByPostId(postId)
-                    .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
-            case RECORD -> recordJpaRepository.findByPostId(postId)
-                    .orElseThrow(() -> new EntityNotFoundException(RECORD_NOT_FOUND));
-            case VOTE -> voteJpaRepository.findByPostId(postId)
-                    .orElseThrow(() -> new EntityNotFoundException(VOTE_NOT_FOUND));
-        };
-    }
-
     @Override
     public Optional<Comment> findById(Long id) {
         return commentJpaRepository.findByCommentId(id)
@@ -97,4 +87,37 @@ public void softDeleteAllByPostId(Long postId) {
         commentJpaRepository.softDeleteAllByPostId(postId);
     }
 
+    @Override
+    public void deleteAllByUserId(Long userId) {
+        // 1. 탈퇴 유저가 작성한 댓글과 연관된 게시글을 JOIN FETCH로 함께 조회
+        List<CommentJpaEntity> commentsWithPosts = commentJpaRepository.findAllCommentsWithPostsByUserId(userId);
+        if (commentsWithPosts == null || commentsWithPosts.isEmpty()) {
+            return; //early return
+        }
+
+        // 2. 삭제될 댓글이 어느 Post에 몇 개씩 붙어있는지 집계 (postId 기준 추천)
+        Map<PostJpaEntity, Long> decMap = commentsWithPosts.stream()
+                .collect(Collectors.groupingBy(CommentJpaEntity::getPostJpaEntity, Collectors.counting()));
+
+        // 3. 댓글 수를 집계만큼 한 번에 감소
+        for (PostJpaEntity p : decMap.keySet()) {
+            long dec = decMap.getOrDefault(p, 0L);
+            p.setCommentCount(Math.max(0, p.getCommentCount() - (int) dec));
+        }
+
+        // 4. 탈퇴한 유저의 모든 댓글, 댓글의 좋아요 삭제
+        commentLikeJpaRepository.deleteAllByCommentAuthorUserId(userId);
+        commentJpaRepository.softDeleteAllByUserId(userId);
+    }
+
+    private PostJpaEntity findPostJpaEntity(PostType postType, Long postId) {
+        return switch (postType) {
+            case FEED -> feedJpaRepository.findByPostId(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
+            case RECORD -> recordJpaRepository.findByPostId(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(RECORD_NOT_FOUND));
+            case VOTE -> voteJpaRepository.findByPostId(postId)
+                    .orElseThrow(() -> new EntityNotFoundException(VOTE_NOT_FOUND));
+        };
+    }
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentLikeCommandPersistenceAdapter.java

@@ -11,6 +11,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
@@ -47,4 +49,17 @@ public void deleteAllByCommentId(Long commentId) {
         commentLikeJpaRepository.deleteAllByCommentId(commentId);
     }
 
+    @Override
+    public void deleteAllByUserId(Long userId) {
+        // 1. 탈퇴 유저가 좋아요 누른 댓글 ID 리스트 조회
+        List<Long> likedCommentIds = commentLikeJpaRepository.findAllCommentIdsByUserId(userId);
+        if (likedCommentIds == null || likedCommentIds.isEmpty()) {
+            return; //early return
+        }
+        // 2. 탈퇴한 유저의 모든 댓글 좋아요 관계 삭제
+        commentLikeJpaRepository.deleteAllByLikerUserId(userId);
+        // 3. 탈퇴 유저가 좋아요 누른 댓글의 좋아요 수 감소
+        commentJpaRepository.bulkDecrementLikeCountByIds(likedCommentIds);
+    }
+
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentJpaRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface CommentJpaRepository extends JpaRepository<CommentJpaEntity, Long>, CommentQueryRepository {
@@ -19,4 +20,21 @@ public interface CommentJpaRepository extends JpaRepository<CommentJpaEntity, Lo
     @Query("UPDATE CommentJpaEntity c SET c.status = 'INACTIVE' WHERE c.postJpaEntity.postId = :postId")
     void softDeleteAllByPostId(@Param("postId") Long postId);
 
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("UPDATE CommentJpaEntity c SET c.status = 'INACTIVE' WHERE c.userJpaEntity.userId = :userId")
+    void softDeleteAllByUserId(@Param("userId") Long userId);
+
+    @Query("SELECT c FROM CommentJpaEntity c JOIN FETCH c.postJpaEntity p " +
+            "WHERE c.userJpaEntity.userId = :userId")
+    List<CommentJpaEntity> findAllCommentsWithPostsByUserId(@Param("userId") Long userId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("UPDATE CommentJpaEntity c SET c.status = 'INACTIVE' WHERE c.postJpaEntity.postId IN :postIds")
+    void softDeleteAllByPostIds(@Param("postIds") List<Long> postIds);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("UPDATE CommentJpaEntity c " +
+            "SET c.likeCount = CASE WHEN c.likeCount > 0 THEN c.likeCount - 1 ELSE 0 END " +
+            "WHERE c.commentId IN :likedCommentIds")
+    void bulkDecrementLikeCountByIds(@Param("likedCommentIds") List<Long> likedCommentIds);
 }

src/main/java/konkuk/thip/comment/adapter/out/persistence/repository/CommentLikeJpaRepository.java

@@ -40,4 +40,31 @@ WHERE cl.commentJpaEntity.commentId IN (
            )
            """)
     void deleteAllByPostId(@Param("postId") Long postId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("""
+       DELETE FROM CommentLikeJpaEntity cl
+       WHERE cl.commentJpaEntity.commentId IN (
+           SELECT c.commentId FROM CommentJpaEntity c
+           WHERE c.userJpaEntity.userId = :userId
+       )
+       """)
+    void deleteAllByCommentAuthorUserId(@Param("userId") Long userId);
+
+     @Modifying(clearAutomatically = true, flushAutomatically = true)
+     @Query("DELETE FROM CommentLikeJpaEntity cl WHERE cl.userJpaEntity.userId = :userId")
+    void deleteAllByLikerUserId(@Param("userId") Long userId);
+
+    @Query("SELECT cl.commentJpaEntity.commentId FROM CommentLikeJpaEntity cl WHERE cl.userJpaEntity.userId = :userId")
+    List<Long> findAllCommentIdsByUserId(@Param("userId") Long userId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("""
+       DELETE FROM CommentLikeJpaEntity cl
+       WHERE cl.commentJpaEntity.commentId IN (
+           SELECT c.commentId FROM CommentJpaEntity c
+           WHERE c.postJpaEntity.postId IN :postIds
+       )
+       """)
+    void deleteAllByPostIds(@Param("postIds") List<Long> postIds);
 }

src/main/java/konkuk/thip/comment/application/port/out/CommentCommandPort.java

@@ -24,4 +24,6 @@ default Comment getByIdOrThrow(Long id) {
     void delete(Comment comment);
 
     void softDeleteAllByPostId(Long postId);
+
+    void deleteAllByUserId(Long userId);
 }

src/main/java/konkuk/thip/comment/application/port/out/CommentLikeCommandPort.java

@@ -5,4 +5,5 @@ public interface CommentLikeCommandPort {
     void save(Long userId, Long commentId);
     void delete(Long userId, Long commentId);
     void deleteAllByCommentId(Long commentId);
+    void deleteAllByUserId(Long userId);
 }

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -23,6 +23,7 @@ public enum ErrorCode implements ResponseCode {
     AUTH_LOGIN_FAILED(HttpStatus.UNAUTHORIZED, 40104, "로그인에 실패했습니다."),
     AUTH_UNSUPPORTED_SOCIAL_LOGIN(HttpStatus.UNAUTHORIZED, 40105, "지원하지 않는 소셜 로그인입니다."),
     AUTH_INVALID_LOGIN_TOKEN_KEY(HttpStatus.UNAUTHORIZED, 40106, "유효하지 않은 로그인 토큰 키입니다."),
+    AUTH_BLACKLIST_TOKEN(HttpStatus.UNAUTHORIZED, 40107, "블랙리스트에 등록된 토큰입니다."),
 
     JSON_PROCESSING_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 50100, "JSON 직렬화/역직렬화에 실패했습니다."),
     AWS_BUCKET_BASE_URL_NOT_CONFIGURED(HttpStatus.INTERNAL_SERVER_ERROR, 50101, "aws s3 bucket base url 설정이 누락되었습니다."),
@@ -48,6 +49,9 @@ public enum ErrorCode implements ResponseCode {
     USER_NICKNAME_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, 70006, "다른 사용자가 이미 사용중인 닉네임입니다."),
     USER_ALREADY_SIGNED_UP(HttpStatus.BAD_REQUEST, 70007, "이미 가입된 사용자입니다."),
     USER_NOT_SIGNED_UP(HttpStatus.BAD_REQUEST, 70008, "가입되지 않은 사용자입니다."),
+    USER_CANNOT_DELETE_ROOM_HOST(HttpStatus.BAD_REQUEST, 70009, "모집/진행 중인 방의 방장은 회원탈퇴를 할 수 없습니다."),
+    USER_ALREADY_DELETED(HttpStatus.BAD_REQUEST, 70010, "이미 삭제된 사용자 입니다."),
+    USER_OAUTH2ID_CANNOT_BE_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 70011, "유저의 OAuth2Id 값이 null일 수 없습니다."),
 
     /**
      * 75000 : follow error

src/main/java/konkuk/thip/common/security/annotation/AuthToken.java

@@ -0,0 +1,10 @@
+package konkuk.thip.common.security.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AuthToken {}

src/main/java/konkuk/thip/common/security/argument_resolver/AuthTokenArgumentResolver.java

@@ -0,0 +1,40 @@
+package konkuk.thip.common.security.argument_resolver;
+
+import jakarta.servlet.http.HttpServletRequest;
+import konkuk.thip.common.exception.AuthException;
+import konkuk.thip.common.security.annotation.AuthToken;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+import static konkuk.thip.common.exception.code.ErrorCode.AUTH_TOKEN_NOT_FOUND;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class AuthTokenArgumentResolver implements HandlerMethodArgumentResolver {
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(AuthToken.class)
+            && parameter.getParameterType().equals(String.class);
+    }
+
+    @Override
+    public String resolveArgument(MethodParameter parameter,
+                                  ModelAndViewContainer mavContainer,
+                                  NativeWebRequest webRequest,
+                                  WebDataBinderFactory binderFactory) {
+
+        Object token = ((HttpServletRequest) webRequest.getNativeRequest()).getAttribute("token");
+        if (token == null) {
+            throw new AuthException(AUTH_TOKEN_NOT_FOUND);
+        }
+        return (String) token;
+    }
+}

src/main/java/konkuk/thip/common/security/constant/AuthParameters.java

@@ -12,6 +12,7 @@ public enum AuthParameters {
     GOOGLE_PROVIDER_ID_KEY("sub"),
     JWT_ACCESS_TOKEN_KEY("userId"),
     JWT_SIGNUP_TOKEN_KEY("oauth2Id"),
+    JWT_TOKEN_ATTRIBUTE("token"),
     REDIRECT_SIGNUP_URL("/signup"),
     REDIRECT_HOME_URL("/feed"),
 

src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java

@@ -8,6 +8,7 @@
 import konkuk.thip.common.security.oauth2.CustomOAuth2User;
 import konkuk.thip.common.security.oauth2.LoginUser;
 import konkuk.thip.common.security.util.JwtUtil;
+import konkuk.thip.user.application.port.UserTokenBlacklistQueryPort;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -27,6 +28,7 @@
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     private final JwtUtil jwtUtil;
+    private final UserTokenBlacklistQueryPort userTokenBlacklistQueryPort;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request,
@@ -38,6 +40,10 @@ protected void doFilterInternal(HttpServletRequest request,
                 throw new AuthException(AUTH_TOKEN_NOT_FOUND);
             }
 
+            if (userTokenBlacklistQueryPort.isTokenBlacklisted(token)) {
+                throw new AuthException(AUTH_BLACKLIST_TOKEN);
+            }
+
             if (!jwtUtil.validateToken(token)) {
                 throw new AuthException(AUTH_INVALID_TOKEN);
             }
@@ -46,6 +52,7 @@ protected void doFilterInternal(HttpServletRequest request,
                 throw new AuthException(AUTH_EXPIRED_TOKEN);
             }
 
+            request.setAttribute(JWT_TOKEN_ATTRIBUTE.getValue(), token);
             LoginUser loginUser = jwtUtil.getLoginUser(token);
 
             if (loginUser.userId() != null) {

src/main/java/konkuk/thip/common/security/util/JwtUtil.java

@@ -1,9 +1,6 @@
 package konkuk.thip.common.security.util;
 
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.*;
 import konkuk.thip.common.security.oauth2.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -86,4 +83,17 @@ public LoginUser getLoginUser(String token) {
         }
         return LoginUser.createExistingUser(oauth2Id, userId);
     }
+
+    public Date getExpirationAllowExpired(String token) {
+        try {
+            Jws<Claims> jwt = Jwts.parser()
+                    .verifyWith(secretKey)
+                    .build()
+                    .parseSignedClaims(token);
+            return jwt.getPayload().getExpiration();
+        } catch (ExpiredJwtException e) {
+            return e.getClaims().getExpiration();
+        }
+    }
+
 }

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -35,7 +35,12 @@ public enum SwaggerResponseDescription {
             USER_NICKNAME_UPDATE_TOO_FREQUENT,
             USER_NICKNAME_ALREADY_EXISTS
     ))),
-
+    USER_DELETE(new LinkedHashSet<>(Set.of(
+            USER_CANNOT_DELETE_ROOM_HOST,
+            USER_NOT_FOUND,
+            USER_ALREADY_DELETED,
+            USER_OAUTH2ID_CANNOT_BE_NULL
+    ))),
 
     // Follow
     CHANGE_FOLLOW_STATE(new LinkedHashSet<>(Set.of(
@@ -348,6 +353,7 @@ public enum SwaggerResponseDescription {
 //                AUTH_TOKEN_NOT_FOUND
 //                AUTH_LOGIN_FAILED,
 //                AUTH_UNSUPPORTED_SOCIAL_LOGIN,
+//                AUTH_BLACKLIST_TOKEN,
 
 //                JSON_PROCESSING_ERROR
         )));