feat: 어드민 유저 관리 기능

JAEHEE25 · JAEHEE25 · commit 28594a707714 · 2026-01-03T16:39:37.000+09:00
- Report, UserBan 컬럼 수정
diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminUserBanService.java b/src/main/java/com/example/solidconnection/admin/service/AdminUserBanService.java
@@ -52,7 +52,7 @@ private void validateNotAlreadyBanned(long userId, ZonedDateTime now) {
     }
 
     private void validateReportExists(long userId) {
-        if (!reportRepository.existsReportByUserId(userId)) {
+        if (!reportRepository.existsByReportedId(userId)) {
             throw new CustomException(ErrorCode.REPORT_NOT_FOUND);
         }
     }
@@ -64,7 +64,7 @@ private void updateReportedContentIsDeleted(long userId, boolean isDeleted) {
 
     private void createUserBan(long userId, UserBanRequest request, ZonedDateTime now) {
         ZonedDateTime expiredAt = now.plusDays(request.duration().getDays());
-        UserBan userBan = new UserBan(userId, expiredAt);
+        UserBan userBan = new UserBan(userId, request.duration(), expiredAt);
         userBanRepository.save(userBan);
     }
 
diff --git a/src/main/java/com/example/solidconnection/report/domain/Report.java b/src/main/java/com/example/solidconnection/report/domain/Report.java
@@ -33,6 +33,9 @@ public class Report extends BaseEntity {
     @Column(name = "reporter_id")
     private long reporterId;
 
+    @Column(name = "reported_id")
+    private long reportedId;
+
     @Column(name = "report_type")
     @Enumerated(value = EnumType.STRING)
     private ReportType reportType;
@@ -44,9 +47,10 @@ public class Report extends BaseEntity {
     @Column(name = "target_id")
     private long targetId;
 
-    public Report(long reporterId, ReportType reportType, TargetType targetType, long targetId) {
+    public Report(long reporterId, long reportedId, ReportType reportType, TargetType targetType, long targetId) {
         this.reportType = reportType;
         this.reporterId = reporterId;
+        this.reportedId = reportedId;
         this.targetType = targetType;
         this.targetId = targetId;
     }
diff --git a/src/main/java/com/example/solidconnection/report/repository/ReportRepository.java b/src/main/java/com/example/solidconnection/report/repository/ReportRepository.java
@@ -10,17 +10,5 @@ public interface ReportRepository extends JpaRepository<Report, Long> {
 
     boolean existsByReporterIdAndTargetTypeAndTargetId(long reporterId, TargetType targetType, long targetId);
 
-    @Query("""
-            SELECT CASE WHEN COUNT(r) > 0 THEN true ELSE false END
-            FROM Report r
-            WHERE (r.targetType = 'POST' AND EXISTS (
-                SELECT 1 FROM Post p WHERE p.id = r.targetId AND p.siteUserId = :userId
-            ))
-            OR (r.targetType = 'CHAT' AND EXISTS (
-                SELECT 1 FROM ChatMessage cm
-                JOIN ChatParticipant cp ON cp.id = cm.senderId
-                WHERE cm.id = r.targetId AND cp.siteUserId = :userId
-            ))
-            """)
-    boolean existsReportByUserId(@Param("userId") long userId);
+    boolean existsByReportedId(long reportedId);
 }
diff --git a/src/main/java/com/example/solidconnection/report/service/ReportService.java b/src/main/java/com/example/solidconnection/report/service/ReportService.java
@@ -31,19 +31,24 @@ public class ReportService {
 
     @Transactional
     public void createReport(long reporterId, ReportRequest request) {
-        validateReporterExists(reporterId);
+        long reportedId = findReportedId(request.targetType(), request.targetId());
+        validateReporterAndReportedExists(reporterId, reportedId);
         validateTargetExists(request.targetType(), request.targetId());
         validateFirstReportByUser(reporterId, request.targetType(), request.targetId());
-        updateReportedUserStatus(request.targetType(), request.targetId());
+        updateUserStatusToReported(reportedId);
 
-        Report report = new Report(reporterId, request.reportType(), request.targetType(), request.targetId());
+        Report report = new Report(reporterId, reportedId, request.reportType(), request.targetType(), request.targetId());
         reportRepository.save(report);
     }
 
-    private void validateReporterExists(long reporterId) {
+    private void validateReporterAndReportedExists(long reporterId, long reportedId) {
         if (!siteUserRepository.existsById(reporterId)) {
             throw new CustomException(ErrorCode.USER_NOT_FOUND);
         }
+
+        if (!siteUserRepository.existsById(reportedId)) {
+            throw new CustomException(ErrorCode.USER_NOT_FOUND);
+        }
     }
 
     private void validateTargetExists(TargetType targetType, long targetId) {
@@ -63,12 +68,7 @@ private void validateFirstReportByUser(long reporterId, TargetType targetType, l
         }
     }
 
-    private void updateReportedUserStatus(TargetType targetType, long targetId) {
-        long targetUserId = findTargetUserId(targetType, targetId);
-        updateUserStatusToReported(targetUserId);
-    }
-
-    private long findTargetUserId(TargetType targetType, long targetId) {
+    private long findReportedId(TargetType targetType, long targetId) {
         return switch (targetType) {
             case POST -> findPostAuthorId(targetId);
             case CHAT -> findChatMessageSenderId(targetId);
diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/UserBan.java b/src/main/java/com/example/solidconnection/siteuser/domain/UserBan.java
@@ -23,6 +23,10 @@ public class UserBan extends BaseEntity {
     @Column(name = "banned_user_id", nullable = false)
     private Long bannedUserId;
 
+    @Column(name = "duration", nullable = false)
+    @Enumerated(EnumType.STRING)
+    private UserBanDuration duration;
+
     @Column(name = "expired_at", nullable = false)
     private ZonedDateTime expiredAt;
 
@@ -35,8 +39,9 @@ public class UserBan extends BaseEntity {
     @Column(name = "unbanned_at")
     private ZonedDateTime unbannedAt;
 
-    public UserBan(Long bannedUserId, ZonedDateTime expiredAt) {
+    public UserBan(Long bannedUserId, UserBanDuration duration, ZonedDateTime expiredAt) {
         this.bannedUserId = bannedUserId;
+        this.duration = duration;
         this.expiredAt = expiredAt;
     }
 
diff --git a/src/main/resources/db/migration/V40__create_user_ban_table.sql b/src/main/resources/db/migration/V40__create_user_ban_table.sql
@@ -2,6 +2,7 @@ CREATE TABLE user_ban
 (
     id              BIGINT       NOT NULL AUTO_INCREMENT,
     banned_user_id  BIGINT       NOT NULL,
+    duration        VARCHAR(30)  NOT NULL,
     expired_at      DATETIME(6)    NOT NULL,
     is_unbanned     TINYINT(1)   NOT NULL DEFAULT 0,
     unbanned_by     BIGINT       NULL,
@@ -14,4 +15,7 @@ CREATE TABLE user_ban
 );
 
 ALTER TABLE site_user
-    ADD COLUMN user_status VARCHAR(50) NOT NULL DEFAULT 'ACTIVE';
+    ADD COLUMN user_status VARCHAR(10) NOT NULL DEFAULT 'ACTIVE';
+
+ALTER TABLE report
+    ADD COLUMN reported_id BIGINT;
diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminUserBanServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminUserBanServiceTest.java
@@ -68,7 +68,7 @@ class AdminUserBanServiceTest {
     @BeforeEach
     void setUp() {
         admin = siteUserFixture.관리자();
-        reportedUser = siteUserFixture.사용자(1, "신고당한유저");
+        reportedUser = siteUserFixture.신고된_사용자("신고된사용자");
         reporter = siteUserFixture.사용자(2, "신고자");
         reportedPost = postFixture.게시글(
                 "신고될 게시글",
@@ -87,7 +87,7 @@ class 사용자_차단 {
         @Test
         void 사용자를_차단한다() {
             // given
-            reportFixture.신고(reporter.getId(), TargetType.POST, reportedPost.getId());
+            reportFixture.신고(reporter.getId(), reportedUser.getId(), TargetType.POST, reportedPost.getId());
             UserBanRequest request = new UserBanRequest(UserBanDuration.SEVEN_DAYS);
 
             // when
@@ -101,7 +101,7 @@ class 사용자_차단 {
         @Test
         void 이미_차단된_사용자는_다시_차단할_수_없다() {
             // given
-            reportFixture.신고(reporter.getId(), TargetType.POST, reportedPost.getId());
+            reportFixture.신고(reporter.getId(), reportedUser.getId(), TargetType.POST, reportedPost.getId());
             UserBanRequest request = new UserBanRequest(UserBanDuration.SEVEN_DAYS);
             adminUserBanService.banUser(reportedUser.getId(), request);
 
@@ -129,7 +129,7 @@ class 사용자_차단_해제 {
             @Test
             void 차단된_사용자를_수동으로_해제한다() {
                 // given
-                reportFixture.신고(reporter.getId(), TargetType.POST, reportedPost.getId());
+                reportFixture.신고(reporter.getId(), reportedUser.getId(), TargetType.POST, reportedPost.getId());
                 UserBanRequest request = new UserBanRequest(UserBanDuration.SEVEN_DAYS);
                 adminUserBanService.banUser(reportedUser.getId(), request);
 
@@ -144,7 +144,7 @@ class 사용자_차단_해제 {
             @Test
             void 차단_해제_정보가_올바르게_저장된다() {
                 // given
-                reportFixture.신고(reporter.getId(), TargetType.POST, reportedPost.getId());
+                reportFixture.신고(reporter.getId(), reportedUser.getId(), TargetType.POST, reportedPost.getId());
                 UserBanRequest request = new UserBanRequest(UserBanDuration.SEVEN_DAYS);
                 adminUserBanService.banUser(reportedUser.getId(), request);
                 ZonedDateTime beforeUnban = ZonedDateTime.now();
@@ -229,7 +229,7 @@ class 만료된_차단_자동_해제 {
                         boardFixture.자유게시판(),
                         reportedUser
                 );
-                reportFixture.신고(reporter.getId(), TargetType.POST, reportedPost.getId());
+                reportFixture.신고(reporter.getId(), reportedUser.getId(), TargetType.POST, reportedPost.getId());
                 adminUserBanService.banUser(reportedUser.getId(), new UserBanRequest(UserBanDuration.SEVEN_DAYS));
 
                 // when
@@ -261,4 +261,4 @@ class 만료된_차단_자동_해제 {
             }
         }
     }
-}
+}
diff --git a/src/test/java/com/example/solidconnection/report/fixture/ReportFixture.java b/src/test/java/com/example/solidconnection/report/fixture/ReportFixture.java
@@ -11,9 +11,10 @@ public class ReportFixture {
 
     private final ReportFixtureBuilder reportFixtureBuilder;
 
-    public Report 신고(long reporterId, TargetType targetType, long targetId) {
+    public Report 신고(long reporterId, long reportedId, TargetType targetType, long targetId) {
         return reportFixtureBuilder.report()
                 .reporterId(reporterId)
+                .reportedId(reportedId)
                 .targetType(targetType)
                 .targetId(targetId)
                 .create();
diff --git a/src/test/java/com/example/solidconnection/report/fixture/ReportFixtureBuilder.java b/src/test/java/com/example/solidconnection/report/fixture/ReportFixtureBuilder.java
@@ -14,6 +14,7 @@ public class ReportFixtureBuilder {
     private final ReportRepository reportRepository;
 
     private long reporterId;
+    private long reportedId;
     private TargetType targetType;
     private long targetId;
     private ReportType reportType = ReportType.ADVERTISEMENT;
@@ -27,6 +28,11 @@ public ReportFixtureBuilder reporterId(long reporterId) {
         return this;
     }
 
+     public ReportFixtureBuilder reportedId(long reportedId) {
+        this.reportedId = reportedId;
+        return this;
+    }
+
     public ReportFixtureBuilder targetType(TargetType targetType) {
         this.targetType = targetType;
         return this;
@@ -45,6 +51,7 @@ public ReportFixtureBuilder reasonType(ReportType reportType) {
     public Report create() {
         Report report = new Report(
                 reporterId,
+                reportedId,
                 reportType,
                 targetType,
                 targetId
diff --git a/src/test/java/com/example/solidconnection/report/service/ReportServiceTest.java b/src/test/java/com/example/solidconnection/report/service/ReportServiceTest.java
@@ -61,12 +61,14 @@ class ReportServiceTest {
     private ChatMessageFixture chatMessageFixture;
 
     private SiteUser siteUser;
+    private SiteUser reportedUser;
     private Post post;
     private ChatMessage chatMessage;
 
     @BeforeEach
     void setUp() {
         siteUser = siteUserFixture.사용자();
+        reportedUser = siteUserFixture.신고된_사용자("신고된사용자");
         Board board = boardFixture.자유게시판();
         post = postFixture.게시글(board, siteUser);
         ChatRoom chatRoom = chatRoomFixture.채팅방(false);
@@ -106,7 +108,7 @@ class 포스트_신고 {
         @Test
         void 이미_신고한_경우_예외가_발생한다() {
             // given
-            reportFixture.신고(siteUser.getId(), TargetType.POST, post.getId());
+            reportFixture.신고(siteUser.getId(), reportedUser.getId(), TargetType.POST, post.getId());
             ReportRequest request = new ReportRequest(ReportType.INSULT, TargetType.POST, post.getId());
 
             // when & then
@@ -148,7 +150,7 @@ class 채팅_신고 {
         @Test
         void 이미_신고한_경우_예외가_발생한다() {
             // given
-            reportFixture.신고(siteUser.getId(), TargetType.CHAT, chatMessage.getId());
+            reportFixture.신고(siteUser.getId(), reportedUser.getId(), TargetType.CHAT, chatMessage.getId());
             ReportRequest request = new ReportRequest(ReportType.INSULT, TargetType.CHAT, chatMessage.getId());
 
             // when & then
diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java
@@ -85,6 +85,18 @@ public class SiteUserFixture {
                 .create();
     }
 
+    public SiteUser 신고된_사용자(String nickname) {
+        return siteUserFixtureBuilder.siteUser()
+                .email("reported@example.com")
+                .authType(AuthType.EMAIL)
+                .nickname(nickname)
+                .profileImageUrl("profileImageUrl")
+                .role(Role.MENTEE)
+                .password("reported123")
+                .userStatus(UserStatus.REPORTED)
+                .create();
+    }
+
     public SiteUser 차단된_사용자(String nickname) {
         return siteUserFixtureBuilder.siteUser()
                 .email("banned@example.com")
diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixture.java b/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixture.java
@@ -1,6 +1,8 @@
 package com.example.solidconnection.siteuser.fixture;
 
 import com.example.solidconnection.siteuser.domain.UserBan;
+import com.example.solidconnection.siteuser.domain.UserBanDuration;
+
 import java.time.ZonedDateTime;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.test.context.TestComponent;
@@ -11,26 +13,21 @@ public class UserBanFixture {
 
     private final UserBanFixtureBuilder userBanFixtureBuilder;
 
-    public UserBan 차단(long bannedUserId, int days) {
-        return userBanFixtureBuilder.userBan()
-                .bannedUserId(bannedUserId)
-                .expiredAt(ZonedDateTime.now().plusDays(days))
-                .create();
-    }
-
     public UserBan 만료된_차단(long bannedUserId) {
         return userBanFixtureBuilder.userBan()
                 .bannedUserId(bannedUserId)
+                .duration(UserBanDuration.ONE_DAY)
                 .expiredAt(ZonedDateTime.now().minusDays(1))
                 .create();
     }
 
     public UserBan 수동_차단_해제(long bannedUserId, long adminId) {
         UserBan userBan = userBanFixtureBuilder.userBan()
                 .bannedUserId(bannedUserId)
+                .duration(UserBanDuration.SEVEN_DAYS)
                 .expiredAt(ZonedDateTime.now().plusDays(7))
                 .create();
         userBan.manuallyUnban(adminId);
         return userBan;
     }
-}
+}
diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixtureBuilder.java b/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixtureBuilder.java
@@ -1,6 +1,7 @@
 package com.example.solidconnection.siteuser.fixture;
 
 import com.example.solidconnection.siteuser.domain.UserBan;
+import com.example.solidconnection.siteuser.domain.UserBanDuration;
 import com.example.solidconnection.siteuser.repository.UserBanRepository;
 import java.time.ZonedDateTime;
 import lombok.RequiredArgsConstructor;
@@ -13,6 +14,7 @@ public class UserBanFixtureBuilder {
     private final UserBanRepository userBanRepository;
 
     private Long bannedUserId;
+    private UserBanDuration duration;
     private ZonedDateTime expiredAt;
 
     public UserBanFixtureBuilder userBan() {
@@ -24,13 +26,18 @@ public UserBanFixtureBuilder bannedUserId(Long bannedUserId) {
         return this;
     }
 
+    public UserBanFixtureBuilder duration(UserBanDuration duration) {
+        this.duration = duration;
+        return this;
+    }
+
     public UserBanFixtureBuilder expiredAt(ZonedDateTime expiredAt) {
         this.expiredAt = expiredAt;
         return this;
     }
 
     public UserBan create() {
-        UserBan userBan = new UserBan(bannedUserId, expiredAt);
+        UserBan userBan = new UserBan(bannedUserId, duration, expiredAt);
         return userBanRepository.save(userBan);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private void validateNotAlreadyBanned(long userId, ZonedDateTime now) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private void validateReportExists(long userId) {`
`55`		`- if (!reportRepository.existsReportByUserId(userId)) {`
	`55`	`+ if (!reportRepository.existsByReportedId(userId)) {`
`56`	`56`	`throw new CustomException(ErrorCode.REPORT_NOT_FOUND);`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -64,7 +64,7 @@ private void updateReportedContentIsDeleted(long userId, boolean isDeleted) {`
`64`	`64`
`65`	`65`	`private void createUserBan(long userId, UserBanRequest request, ZonedDateTime now) {`
`66`	`66`	`ZonedDateTime expiredAt = now.plusDays(request.duration().getDays());`
`67`		`- UserBan userBan = new UserBan(userId, expiredAt);`
	`67`	`+ UserBan userBan = new UserBan(userId, request.duration(), expiredAt);`
`68`	`68`	`userBanRepository.save(userBan);`
`69`	`69`	`}`
`70`	`70`