Merge pull request #183 from checkmo2025/feat/182/getWithdrawal

MODUGGAGI · web-flow · commit d355a261d4cd · 2026-03-01T17:40:54.000+09:00
[Feat] 신고 목록 조회 기능 추가
diff --git a/src/main/java/checkmo/authentication/AuthenticationAPI.java b/src/main/java/checkmo/authentication/AuthenticationAPI.java
@@ -1,5 +1,8 @@
 package checkmo.authentication;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public interface AuthenticationAPI {
 
     /**
@@ -12,7 +15,7 @@ public interface AuthenticationAPI {
     /**
      * 특정 회원의 인증 계정을 비활성화하고 세션을 만료시킵니다.
      */
-    void deactivateMember(String memberId);
+    void deactivateMember(String memberId, HttpServletRequest request, HttpServletResponse response);
 
     /**
      * 특정 회원의 인증 관련 데이터(계정 정보, 권한, 토큰 등)를 완전히 삭제합니다.
diff --git a/src/main/java/checkmo/authentication/AuthenticationEvent.java b/src/main/java/checkmo/authentication/AuthenticationEvent.java
@@ -16,6 +16,10 @@ public record SendVerificationEmail(String email, String verificationCode, Verif
     public record SendTempPassword(String email, String tempPassword){
     }
 
+    @Builder
+    public record ReactivateMember(String id) {
+    }
+
     public enum VerificationType {
         SIGN_UP, UPDATE_EMAIL
     }
diff --git a/src/main/java/checkmo/authentication/internal/AuthenticationAPIImpl.java b/src/main/java/checkmo/authentication/internal/AuthenticationAPIImpl.java
@@ -3,7 +3,10 @@
 import checkmo.authentication.AuthenticationAPI;
 import checkmo.authentication.internal.repository.AuthRepository;
 import checkmo.authentication.internal.security.jwt.TokenCacheService;
+import checkmo.authentication.internal.service.command.AuthSessionCommandService;
 import checkmo.authentication.internal.service.command.AuthUserCommandService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +15,7 @@
 public class AuthenticationAPIImpl implements AuthenticationAPI {
 
     private final AuthUserCommandService authUserCommandService;
+    private final AuthSessionCommandService authSessionCommandService;
     private final TokenCacheService tokenCacheService;
     private final AuthRepository authRepository;
 
@@ -27,8 +31,8 @@ public void completeProfile(String memberId) {
     }
 
     @Override
-    public void deactivateMember(String memberId) {
-        tokenCacheService.deleteRefreshToken(memberId);
+    public void deactivateMember(String memberId, HttpServletRequest request, HttpServletResponse response) {
+        authSessionCommandService.logout(request, response);
         authUserCommandService.deactivateMember(memberId);
     }
 
diff --git a/src/main/java/checkmo/authentication/internal/config/SecurityConfig.java b/src/main/java/checkmo/authentication/internal/config/SecurityConfig.java
@@ -48,6 +48,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .requestMatchers(HttpMethod.GET, "/api/books/**").permitAll()
                         .requestMatchers(HttpMethod.GET, "/api/book-stories/me", "/api/book-stories/following", "/api/book-stories/clubs/**").authenticated()
                         .requestMatchers(HttpMethod.GET, "/api/book-stories", "/api/book-stories/*", "/api/book-stories/search/*", "/api/book-stories/members/*").permitAll()
+                        .requestMatchers(HttpMethod.GET, "/api/news/me").authenticated()
                         .requestMatchers(HttpMethod.GET, "/api/news/**").permitAll()
                         .requestMatchers(HttpMethod.GET, "/api/members/me", "/api/members/me/**").authenticated()
                         .requestMatchers(HttpMethod.GET, "/api/members/*").permitAll()
diff --git a/src/main/java/checkmo/authentication/internal/entity/AuthUser.java b/src/main/java/checkmo/authentication/internal/entity/AuthUser.java
@@ -34,6 +34,10 @@ public void deactivate() {
         this.deactivatedAt = LocalDateTime.now();
     }
 
+    public void reactivate() {
+        this.deactivatedAt = null;
+    }
+
     public void completeProfile() {
         this.profileCompleted = true;
     }
diff --git a/src/main/java/checkmo/authentication/internal/repository/AuthRepository.java b/src/main/java/checkmo/authentication/internal/repository/AuthRepository.java
@@ -7,6 +7,7 @@
 public interface AuthRepository extends JpaRepository<AuthUser, String> {
 
     Optional<AuthUser> findByEmail(String email);
+    Optional<AuthUser> findByIdAndDeactivatedAtIsNotNull(String id);
 
     boolean existsByEmail(String email);
 }
diff --git a/src/main/java/checkmo/authentication/internal/security/auth/CustomUserDetailsService.java b/src/main/java/checkmo/authentication/internal/security/auth/CustomUserDetailsService.java
@@ -27,8 +27,7 @@ public UserDetails loadUserByUsername(String email) throws UsernameNotFoundExcep
                 .orElseThrow(() -> new UsernameNotFoundException(
                         "해당 이메일을 가진 사용자를 찾을 수 없습니다: " + email));
 
-        // 비활성화된 계정, 탈퇴한 계정 등의 상태 검증
-        validateMemberStatus(user);
+        // 로그인 성공 시점 자동 복구 정책 때문에 로그인 단계에서는 비활성 상태를 차단하지 않는다.
         return new PrincipalDetails(user);
     }
 
diff --git a/src/main/java/checkmo/authentication/internal/security/auth/PrincipalDetails.java b/src/main/java/checkmo/authentication/internal/security/auth/PrincipalDetails.java
@@ -60,7 +60,7 @@ public boolean isCredentialsNonExpired() {
 
     @Override
     public boolean isEnabled() {
-        return user.getDeactivatedAt() == null;
+        return true;
     }
 
     // OAuth2User methods
diff --git a/src/main/java/checkmo/authentication/internal/security/jwt/JwtAuthenticationFilter.java b/src/main/java/checkmo/authentication/internal/security/jwt/JwtAuthenticationFilter.java
@@ -1,6 +1,7 @@
 package checkmo.authentication.internal.security.jwt;
 
 import checkmo.authentication.internal.exception.AuthErrorStatus;
+import checkmo.authentication.internal.exception.AuthException;
 import checkmo.authentication.internal.repository.AuthRepository;
 import checkmo.common.apiPayload.ApiResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -99,6 +100,10 @@ protected void doFilterInternal(
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 log.info("[JWT 필터] Access Token 유효성 검사 통과");
             }
+        } catch (AuthException e) {
+            log.warn("[JWT 필터] 비활성/유효하지 않은 회원 토큰 감지: {}", e.getMessage());
+            clearInvalidSession(response, accessToken);
+            SecurityContextHolder.clearContext();
         } catch (ExpiredJwtException e) { // Access Token이 존재하지만 만료된 경우
             log.warn("[JWT 필터] Access Token 만료됨: {}", e.getMessage());
             reissueAccessToken(request, response); // Refresh Token을 사용해 재발급 시도
@@ -107,6 +112,14 @@ protected void doFilterInternal(
         filterChain.doFilter(request, response);
     }
 
+    private void clearInvalidSession(HttpServletResponse response, String accessToken) {
+        if (StringUtils.hasText(accessToken)) {
+            tokenCacheService.saveBlacklistToken(accessToken);
+        }
+        jwtCookieUtil.deleteTokenFromCookie(response, "accessToken");
+        jwtCookieUtil.deleteTokenFromCookie(response, "refreshToken");
+    }
+
     // Access Token이 만료된 경우, Refresh Token을 사용해 재발급
     private void reissueAccessToken(HttpServletRequest request, HttpServletResponse response) {
         // 쿠키에서 Refresh Token 추출
diff --git a/src/main/java/checkmo/authentication/internal/security/jwt/JwtLoginProcessor.java b/src/main/java/checkmo/authentication/internal/security/jwt/JwtLoginProcessor.java
@@ -1,6 +1,7 @@
 package checkmo.authentication.internal.security.jwt;
 
 import checkmo.authentication.internal.security.auth.PrincipalDetails;
+import checkmo.authentication.internal.service.command.AuthReactivationCommandService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
@@ -13,9 +14,15 @@ public class JwtLoginProcessor {
     private final JwtTokenProvider jwtTokenProvider;
     private final JwtCookieUtil jwtCookieUtil;
     private final TokenCacheService tokenCacheService;
+    private final AuthReactivationCommandService authReactivationCommandService;
 
     // 로그인 성공 시 JWT 토큰 생성 및 쿠키 설정
     public void processLogin(HttpServletResponse response, Authentication authentication) {
+        String userId = ((PrincipalDetails) authentication.getPrincipal()).getUser().getId();
+
+        // 인증 성공 시점에만 계정 자동 복구
+        authReactivationCommandService.reactivateIfDeactivated(userId);
+
         // JWT 토큰 생성
         JwtToken jwtToken = jwtTokenProvider.generateToken(authentication);
 
@@ -26,8 +33,6 @@ public void processLogin(HttpServletResponse response, Authentication authentica
         jwtCookieUtil.addTokenToCookie(response, "refreshToken", jwtToken.getRefreshToken(), refreshTokenMaxAge);
 
         // RefreshToken Redis에 저장
-        String userId = ((PrincipalDetails) authentication.getPrincipal()).getUser().getId();
         tokenCacheService.saveRefreshToken(userId, jwtToken.getRefreshToken());
     }
 }
-
diff --git a/src/main/java/checkmo/authentication/internal/service/command/AuthReactivationCommandService.java b/src/main/java/checkmo/authentication/internal/service/command/AuthReactivationCommandService.java
@@ -0,0 +1,29 @@
+package checkmo.authentication.internal.service.command;
+
+import checkmo.authentication.AuthenticationEvent;
+import checkmo.authentication.internal.repository.AuthRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class AuthReactivationCommandService {
+
+    private final AuthRepository authRepository;
+    private final ApplicationEventPublisher eventPublisher;
+
+    public void reactivateIfDeactivated(String memberId) {
+        authRepository.findByIdAndDeactivatedAtIsNotNull(memberId)
+                .ifPresent(authUser -> {
+                    authUser.reactivate();
+                    eventPublisher.publishEvent(
+                            AuthenticationEvent.ReactivateMember.builder()
+                                    .id(memberId)
+                                    .build()
+                    );
+                });
+    }
+}
diff --git a/src/main/java/checkmo/member/MemberAPI.java b/src/main/java/checkmo/member/MemberAPI.java
@@ -89,4 +89,12 @@ Map<String, BasicInfoWithFollow> fetchMemberBasicInfoWithFollowByMemberId(
      * @return 관심 카테고리 정보
      */
     InterestCategoryInfo fetchInterestCategory(String memberId);
-}
+
+    /**
+     * 회원 ID로 회원의 이메일을 조회합니다.
+     *
+     * @param memberId 회원 ID
+     * @return 회원 이메일
+     */
+    String fetchMemberEmail(String memberId);
+}
diff --git a/src/main/java/checkmo/member/internal/MemberAPIImpl.java b/src/main/java/checkmo/member/internal/MemberAPIImpl.java
@@ -163,6 +163,12 @@ public InterestCategoryInfo fetchInterestCategory(String memberId) {
                 .build();
     }
 
+    @Override
+    public String fetchMemberEmail(String memberId) {
+        Member member = memberQueryService.retrieveMember(memberId);
+        return member.getEmail();
+    }
+
     private MemberExternalDTO.BasicInfo withdrawnBasicInfo() {
         return MemberExternalDTO.BasicInfo.builder()
                 .nickname(WITHDRAWN_MEMBER_NICKNAME)
diff --git a/src/main/java/checkmo/member/internal/converter/MemberConverter.java b/src/main/java/checkmo/member/internal/converter/MemberConverter.java
@@ -6,6 +6,7 @@
 import checkmo.member.web.dto.MemberResponseDTO.BasicInfoWithDescription;
 import checkmo.member.web.dto.MemberResponseDTO.BasicInfoWithFollow;
 import checkmo.member.web.dto.MemberResponseDTO.DetailInfo;
+import checkmo.member.web.dto.MemberResponseDTO.MyReportInfo;
 import checkmo.member.web.dto.MemberResponseDTO.RecommendedMember;
 import checkmo.member.web.dto.MemberResponseDTO.ReportInfo;
 import checkmo.member.web.dto.MemberResponseDTO.othersDetailInfo;
@@ -69,4 +70,14 @@ public static ReportInfo toReportInfo(MemberReport report) {
                 .createdAt(report.getCreatedAt())
                 .build();
     }
+
+    public static MyReportInfo toMyReportInfo(MemberReport report) {
+        return MyReportInfo.builder()
+                .reportedMemberNickname(report.getReportedMember().getNickName())
+                .reportedMemberProfileImageUrl(report.getReportedMember().getImgUrl())
+                .reportType(report.getReportType().name())
+                .content(report.getContent())
+                .reportDate(report.getCreatedAt())
+                .build();
+    }
 }
diff --git a/src/main/java/checkmo/member/internal/entity/Member.java b/src/main/java/checkmo/member/internal/entity/Member.java
@@ -130,6 +130,10 @@ public void deactivate() {
         this.deactivatedAt = LocalDateTime.now();
     }
 
+    public void reactivate() {
+        this.deactivatedAt = null;
+    }
+
     public boolean isDeactivated() {
         return deactivatedAt != null;
     }
diff --git a/src/main/java/checkmo/member/internal/listener/MemberEventListener.java b/src/main/java/checkmo/member/internal/listener/MemberEventListener.java
@@ -19,4 +19,10 @@ public class MemberEventListener {
     public void createMember(AuthenticationEvent.CreateMember event) {
         memberCommandService.createMember(event.id(), event.email());
     }
+
+    @EventListener
+    @Transactional(propagation = Propagation.MANDATORY)
+    public void reactivateMember(AuthenticationEvent.ReactivateMember event) {
+        memberCommandService.reactivateIfDeactivated(event.id());
+    }
 }
diff --git a/src/main/java/checkmo/member/internal/repository/MemberReportRepository.java b/src/main/java/checkmo/member/internal/repository/MemberReportRepository.java
@@ -7,7 +7,7 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
-public interface MemberReportRepository extends JpaRepository<MemberReport, Long> {
+public interface MemberReportRepository extends JpaRepository<MemberReport, Long>, MemberReportRepositoryCustom {
 
     @EntityGraph(attributePaths = {"reportedMember"})
     List<MemberReport> findByReportedMemberNickName(String nickName);
diff --git a/src/main/java/checkmo/member/internal/repository/MemberReportRepositoryCustom.java b/src/main/java/checkmo/member/internal/repository/MemberReportRepositoryCustom.java
@@ -0,0 +1,9 @@
+package checkmo.member.internal.repository;
+
+import checkmo.member.internal.entity.MemberReport;
+import java.util.List;
+
+public interface MemberReportRepositoryCustom {
+
+    List<MemberReport> findMyReports(String reporterId, Long cursorId, int pageSize);
+}
diff --git a/src/main/java/checkmo/member/internal/repository/MemberReportRepositoryCustomImpl.java b/src/main/java/checkmo/member/internal/repository/MemberReportRepositoryCustomImpl.java
@@ -0,0 +1,35 @@
+package checkmo.member.internal.repository;
+
+import static checkmo.member.internal.entity.QMemberReport.memberReport;
+
+import checkmo.member.internal.entity.MemberReport;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class MemberReportRepositoryCustomImpl implements MemberReportRepositoryCustom {
+
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public List<MemberReport> findMyReports(String reporterId, Long cursorId, int pageSize) {
+        return queryFactory
+                .selectFrom(memberReport)
+                .join(memberReport.reportedMember).fetchJoin()
+                .where(
+                        memberReport.reporter.id.eq(reporterId),
+                        cursorCondition(cursorId)
+                )
+                .orderBy(memberReport.id.desc())
+                .limit(pageSize)
+                .fetch();
+    }
+
+    private BooleanExpression cursorCondition(Long cursorId) {
+        return cursorId != null ? memberReport.id.lt(cursorId) : null;
+    }
+}
diff --git a/src/main/java/checkmo/member/internal/service/MemberQueryFacade.java b/src/main/java/checkmo/member/internal/service/MemberQueryFacade.java
@@ -7,6 +7,7 @@
 import checkmo.member.internal.entity.Follow;
 import checkmo.member.internal.entity.Member;
 import checkmo.member.internal.entity.MemberInterestCategory;
+import checkmo.member.internal.entity.MemberReport;
 import checkmo.member.internal.repository.projection.MemberBasicInfoProjection;
 import checkmo.member.internal.service.query.MemberFollowQueryService;
 import checkmo.member.internal.service.query.MemberQueryService;
@@ -15,6 +16,8 @@
 import checkmo.member.web.dto.MemberResponseDTO;
 import checkmo.member.web.dto.MemberResponseDTO.BasicInfoWithFollow;
 import checkmo.member.web.dto.MemberResponseDTO.DetailInfo;
+import checkmo.member.web.dto.MemberResponseDTO.MyReportInfo;
+import checkmo.member.web.dto.MemberResponseDTO.MyReportList;
 import checkmo.member.web.dto.MemberResponseDTO.RecommendedMember;
 import checkmo.member.web.dto.MemberResponseDTO.RecommendedMemberList;
 import checkmo.member.web.dto.MemberResponseDTO.ReportInfo;
@@ -185,6 +188,24 @@ public ReportList retrieveReportsByMemberNickname(String nickname) {
                 .build();
     }
 
+    public MyReportList retrieveMyReports(String memberId, Long cursorId) {
+        CursorResult<MemberReport> reportCursorResult = CursorPagingHelper.getPage(
+                size -> memberReportQueryService.retrieveMyReports(memberId, cursorId, size),
+                MemberReport::getId,
+                DEFAULT_PAGE_SIZE
+        );
+
+        List<MyReportInfo> reportInfos = reportCursorResult.content().stream()
+                .map(MemberConverter::toMyReportInfo)
+                .toList();
+
+        return MyReportList.builder()
+                .reports(reportInfos)
+                .hasNext(reportCursorResult.hasNext())
+                .nextCursor(reportCursorResult.nextCursor())
+                .build();
+    }
+
     public MemberResponseDTO.LoginStatus retrieveLoginStatus(String memberId) {
         Member member = memberQueryService.retrieveMember(memberId);
 
diff --git a/src/main/java/checkmo/member/internal/service/command/MemberCommandService.java b/src/main/java/checkmo/member/internal/service/command/MemberCommandService.java
diff --git a/src/main/java/checkmo/member/internal/service/query/MemberReportQueryService.java b/src/main/java/checkmo/member/internal/service/query/MemberReportQueryService.java
diff --git a/src/main/java/checkmo/member/web/controller/MemberController.java b/src/main/java/checkmo/member/web/controller/MemberController.java
diff --git a/src/main/java/checkmo/member/web/dto/MemberResponseDTO.java b/src/main/java/checkmo/member/web/dto/MemberResponseDTO.java
diff --git a/src/main/java/checkmo/news/internal/repository/NewsQueryRepository.java b/src/main/java/checkmo/news/internal/repository/NewsQueryRepository.java
diff --git a/src/main/java/checkmo/news/internal/repository/NewsQueryRepositoryImpl.java b/src/main/java/checkmo/news/internal/repository/NewsQueryRepositoryImpl.java
diff --git a/src/main/java/checkmo/news/internal/service/NewsQueryFacade.java b/src/main/java/checkmo/news/internal/service/NewsQueryFacade.java
diff --git a/src/main/java/checkmo/news/internal/service/query/NewsQueryService.java b/src/main/java/checkmo/news/internal/service/query/NewsQueryService.java
diff --git a/src/main/java/checkmo/news/web/controller/NewsController.java b/src/main/java/checkmo/news/web/controller/NewsController.java
diff --git a/src/main/resources/db/seed/local/V20260301__insert_member_report_seed.sql b/src/main/resources/db/seed/local/V20260301__insert_member_report_seed.sql

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ public record SendVerificationEmail(String email, String verificationCode, Verif`
`16`	`16`	`public record SendTempPassword(String email, String tempPassword){`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ @Builder`
	`20`	`+ public record ReactivateMember(String id) {`
	`21`	`+ }`
	`22`	`+`
`19`	`23`	`public enum VerificationType {`
`20`	`24`	`SIGN_UP, UPDATE_EMAIL`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ public void deactivate() {`
`34`	`34`	`this.deactivatedAt = LocalDateTime.now();`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public void reactivate() {`
	`38`	`+ this.deactivatedAt = null;`
	`39`	`+ }`
	`40`	`+`
`37`	`41`	`public void completeProfile() {`
`38`	`42`	`this.profileCompleted = true;`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`public interface AuthRepository extends JpaRepository<AuthUser, String> {`
`8`	`8`
`9`	`9`	`Optional<AuthUser> findByEmail(String email);`
	`10`	`+ Optional<AuthUser> findByIdAndDeactivatedAtIsNotNull(String id);`
`10`	`11`
`11`	`12`	`boolean existsByEmail(String email);`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public UserDetails loadUserByUsername(String email) throws UsernameNotFoundExcep`
`27`	`27`	`.orElseThrow(() -> new UsernameNotFoundException(`
`28`	`28`	`"해당 이메일을 가진 사용자를 찾을 수 없습니다: " + email));`
`29`	`29`
`30`		`- // 비활성화된 계정, 탈퇴한 계정 등의 상태 검증`
`31`		`- validateMemberStatus(user);`
	`30`	`+ // 로그인 성공 시점 자동 복구 정책 때문에 로그인 단계에서는 비활성 상태를 차단하지 않는다.`
`32`	`31`	`return new PrincipalDetails(user);`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public boolean isCredentialsNonExpired() {`
`60`	`60`
`61`	`61`	`@Override`
`62`	`62`	`public boolean isEnabled() {`
`63`		`- return user.getDeactivatedAt() == null;`
	`63`	`+ return true;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// OAuth2User methods`