feat: 어드민 유저 관리 기능

JAEHEE25 · JAEHEE25 · commit 17cd5df4565a · 2026-01-09T17:36:31.000+09:00
- 코드리뷰 반영
diff --git a/src/main/java/com/example/solidconnection/admin/controller/AdminUserBanController.java b/src/main/java/com/example/solidconnection/admin/controller/AdminUserBanController.java
@@ -14,28 +14,27 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 @RequiredArgsConstructor
 @RequestMapping("/admin/users")
 @RestController
-@Slf4j
 public class AdminUserBanController {
 	private final AdminUserBanService adminUserBanService;
 
-	@PostMapping("/{userId}/ban")
+	@PostMapping("/{user-id}/ban")
 	public ResponseEntity<Void> banUser(
-            @PathVariable long userId,
-		    @Valid @RequestBody UserBanRequest request
+			@AuthorizedUser long adminId,
+			@PathVariable(name = "user-id") long userId,
+			@Valid @RequestBody UserBanRequest request
 	) {
-		adminUserBanService.banUser(userId, request);
+		adminUserBanService.banUser(userId, adminId, request);
 		return ResponseEntity.ok().build();
 	}
 
-    @PatchMapping("/{userId}/unban")
+    @PatchMapping("/{user-id}/unban")
     public ResponseEntity<Void> unbanUser(
             @AuthorizedUser long adminId,
-            @PathVariable long userId
+            @PathVariable(name = "user-id") long userId
     ) {
         adminUserBanService.unbanUser(userId, adminId);
         return ResponseEntity.ok().build();
diff --git a/src/main/java/com/example/solidconnection/admin/dto/UserBanRequest.java b/src/main/java/com/example/solidconnection/admin/dto/UserBanRequest.java
@@ -1,6 +1,5 @@
 package com.example.solidconnection.admin.dto;
 
-
 import com.example.solidconnection.siteuser.domain.UserBanDuration;
 
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminUserBanService.java b/src/main/java/com/example/solidconnection/admin/service/AdminUserBanService.java
@@ -1,5 +1,7 @@
 package com.example.solidconnection.admin.service;
 
+import static java.time.ZoneOffset.UTC;
+
 import com.example.solidconnection.admin.dto.UserBanRequest;
 import com.example.solidconnection.chat.repository.ChatMessageRepository;
 import com.example.solidconnection.common.exception.CustomException;
@@ -11,14 +13,10 @@
 import com.example.solidconnection.siteuser.domain.UserStatus;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.siteuser.repository.UserBanRepository;
-import static java.time.ZoneOffset.UTC;
-
 import java.time.ZonedDateTime;
 import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,18 +33,19 @@ public class AdminUserBanService {
     private final ChatMessageRepository chatMessageRepository;
 
     @Transactional
-    public void banUser(long userId, UserBanRequest request) {
-        ZonedDateTime now = ZonedDateTime.now(UTC);
-        validateNotAlreadyBanned(userId, now);
+    public void banUser(long userId, long adminId, UserBanRequest request) {
+        SiteUser user = siteUserRepository.findById(userId)
+                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+        validateNotAlreadyBanned(userId);
         validateReportExists(userId);
 
+        user.updateUserStatus(UserStatus.BANNED);
         updateReportedContentIsDeleted(userId, true);
-        createUserBan(userId, request, now);
-        updateUserStatus(userId, UserStatus.BANNED);
+        createUserBan(userId, adminId, request);
     }
 
-    private void validateNotAlreadyBanned(long userId, ZonedDateTime now) {
-        if (userBanRepository.existsByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfter(userId, now)) {
+    private void validateNotAlreadyBanned(long userId) {
+        if (userBanRepository.existsByBannedUserIdAndIsExpiredFalseAndExpiredAtAfter(userId, ZonedDateTime.now(UTC))) {
             throw new CustomException(ErrorCode.ALREADY_BANNED_USER);
         }
     }
@@ -62,42 +61,53 @@ private void updateReportedContentIsDeleted(long userId, boolean isDeleted) {
         chatMessageRepository.updateReportedChatMessagesIsDeleted(userId, isDeleted);
     }
 
-    private void createUserBan(long userId, UserBanRequest request, ZonedDateTime now) {
+    private void createUserBan(long userId, long adminId, UserBanRequest request) {
+        ZonedDateTime now = ZonedDateTime.now(UTC);
         ZonedDateTime expiredAt = now.plusDays(request.duration().getDays());
-        UserBan userBan = new UserBan(userId, request.duration(), expiredAt);
+        UserBan userBan = new UserBan(userId, adminId, request.duration(), expiredAt);
         userBanRepository.save(userBan);
     }
 
-    private void updateUserStatus(long userId, UserStatus status) {
-        SiteUser user = siteUserRepository.findById(userId)
-                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-        user.updateUserStatus(status);
-    }
-
     @Transactional
     public void unbanUser(long userId, long adminId) {
-        UserBan userBan = findBannedUser(userId, ZonedDateTime.now(UTC));
+        SiteUser user = siteUserRepository.findById(userId)
+                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+        UserBan userBan = findActiveBan(userId);
         userBan.manuallyUnban(adminId);
-        processUnban(userId);
+
+        user.updateUserStatus(UserStatus.REPORTED);
+        updateReportedContentIsDeleted(userId, false);
     }
 
-    private UserBan findBannedUser(long userId, ZonedDateTime now) {
+    private UserBan findActiveBan(long userId) {
         return userBanRepository
-                .findTopByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfterOrderByCreatedAtDesc(userId, now)
+                .findByBannedUserIdAndIsExpiredFalseAndExpiredAtAfter(userId, ZonedDateTime.now(UTC))
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_BANNED_USER));
     }
 
     @Transactional
     @Scheduled(cron = "0 0 0 * * *")
     public void expireUserBans() {
-        List<UserBan> expiredBans = userBanRepository.findAllByIsUnbannedFalseAndExpiredAtBefore(ZonedDateTime.now(UTC));
-        for (UserBan userBan : expiredBans) {
-           processUnban(userBan.getBannedUserId());
+        try {
+            ZonedDateTime now = ZonedDateTime.now(UTC);
+            List<Long> expiredUserIds = userBanRepository.findExpiredBannedUserIds(now);
+
+            if (expiredUserIds.isEmpty()) {
+                return;
+            }
+
+            userBanRepository.bulkExpireUserBans(now);
+            siteUserRepository.bulkUpdateUserStatus(expiredUserIds, UserStatus.REPORTED);
+            bulkUpdateReportedContentIsDeleted(expiredUserIds);
+            log.info("Finished processing expired blocks:: userIds={}", expiredUserIds);
+        } catch (Exception e) {
+            log.error("Failed to process expired blocks", e);
         }
     }
 
-    private void processUnban(long userId) {
-        updateReportedContentIsDeleted(userId, false);
-        updateUserStatus(userId, UserStatus.REPORTED);
+    private void bulkUpdateReportedContentIsDeleted(List<Long> expiredUserIds) {
+        postRepository.bulkUpdateReportedPostsIsDeleted(expiredUserIds, false);
+        chatMessageRepository.bulkUpdateReportedChatMessagesIsDeleted(expiredUserIds, false);
     }
+
 }
diff --git a/src/main/java/com/example/solidconnection/chat/repository/ChatMessageRepository.java b/src/main/java/com/example/solidconnection/chat/repository/ChatMessageRepository.java
@@ -57,4 +57,12 @@ WHERE cm.id IN (SELECT r.target_id FROM report r WHERE r.target_type = 'CHAT')
            AND cm.sender_id IN (SELECT cp.id FROM chat_participant cp WHERE cp.site_user_id = :siteUserId)
            """, nativeQuery = true)
     void updateReportedChatMessagesIsDeleted(@Param("siteUserId") long siteUserId, @Param("isDeleted") boolean isDeleted);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query(value = """
+           UPDATE chat_message cm SET cm.is_deleted = :isDeleted
+           WHERE cm.id IN (SELECT r.target_id FROM report r WHERE r.target_type = 'CHAT')
+           AND cm.sender_id IN (SELECT cp.id FROM chat_participant cp WHERE cp.site_user_id IN :siteUserIds)
+           """, nativeQuery = true)
+    void bulkUpdateReportedChatMessagesIsDeleted(@Param("siteUserIds") List<Long> siteUserIds, @Param("isDeleted") boolean isDeleted);
 }
diff --git a/src/main/java/com/example/solidconnection/common/interceptor/BannedUserInterceptor.java b/src/main/java/com/example/solidconnection/common/interceptor/BannedUserInterceptor.java
@@ -34,4 +34,4 @@ public boolean preHandle(
         }
         return true;
     }
-}
+}
diff --git a/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java
@@ -58,6 +58,14 @@ AND p.id IN (SELECT r.target_id FROM report r WHERE r.target_type = 'POST')
            """, nativeQuery = true)
     void updateReportedPostsIsDeleted(@Param("siteUserId") long siteUserId, @Param("isDeleted") boolean isDeleted);
 
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query(value = """
+               UPDATE post p SET p.is_deleted = :isDeleted
+               WHERE p.site_user_id IN :siteUserIds
+               AND p.id IN (SELECT r.target_id FROM report r WHERE r.target_type = 'POST')
+           """, nativeQuery = true)
+    void bulkUpdateReportedPostsIsDeleted(@Param("siteUserIds") List<Long> siteUserIds, @Param("isDeleted") boolean isDeleted);
+
     default Post getByIdUsingEntityGraph(Long id) {
         return findPostById(id)
                 .orElseThrow(() -> new CustomException(INVALID_POST_ID));
diff --git a/src/main/java/com/example/solidconnection/report/repository/ReportRepository.java b/src/main/java/com/example/solidconnection/report/repository/ReportRepository.java
@@ -3,8 +3,6 @@
 import com.example.solidconnection.report.domain.Report;
 import com.example.solidconnection.report.domain.TargetType;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 public interface ReportRepository extends JpaRepository<Report, Long> {
 
diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/UserBan.java b/src/main/java/com/example/solidconnection/siteuser/domain/UserBan.java
@@ -1,9 +1,9 @@
 package com.example.solidconnection.siteuser.domain;
 
-import java.time.ZonedDateTime;
+import static java.time.ZoneOffset.UTC;
 
+import java.time.ZonedDateTime;
 import com.example.solidconnection.common.BaseEntity;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -12,14 +12,12 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@AllArgsConstructor
 public class UserBan extends BaseEntity {
 
     @Id
@@ -29,31 +27,35 @@ public class UserBan extends BaseEntity {
     @Column(name = "banned_user_id", nullable = false)
     private Long bannedUserId;
 
+    @Column(name = "banned_by", nullable = false)
+    private Long bannedBy;
+
     @Column(name = "duration", nullable = false)
     @Enumerated(EnumType.STRING)
     private UserBanDuration duration;
 
     @Column(name = "expired_at", nullable = false)
     private ZonedDateTime expiredAt;
 
-    @Column(name = "is_unbanned", nullable = false)
-    private boolean isUnbanned = false;
+    @Column(name = "is_expired", nullable = false)
+    private boolean isExpired = false;
 
     @Column(name = "unbanned_by")
     private Long unbannedBy;
 
     @Column(name = "unbanned_at")
     private ZonedDateTime unbannedAt;
 
-    public UserBan(Long bannedUserId, UserBanDuration duration, ZonedDateTime expiredAt) {
+    public UserBan(Long bannedUserId, Long bannedBy, UserBanDuration duration, ZonedDateTime expiredAt) {
         this.bannedUserId = bannedUserId;
+        this.bannedBy = bannedBy;
         this.duration = duration;
         this.expiredAt = expiredAt;
     }
 
     public void manuallyUnban(Long adminId) {
-        this.isUnbanned = true;
+        this.isExpired = true;
         this.unbannedBy = adminId;
-        this.unbannedAt = ZonedDateTime.now();
+        this.unbannedAt = ZonedDateTime.now(UTC);
     }
 }
diff --git a/src/main/java/com/example/solidconnection/siteuser/repository/SiteUserRepository.java b/src/main/java/com/example/solidconnection/siteuser/repository/SiteUserRepository.java
@@ -2,10 +2,12 @@
 
 import com.example.solidconnection.siteuser.domain.AuthType;
 import com.example.solidconnection.siteuser.domain.SiteUser;
+import com.example.solidconnection.siteuser.domain.UserStatus;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -21,4 +23,8 @@ public interface SiteUserRepository extends JpaRepository<SiteUser, Long> {
     List<SiteUser> findUsersToBeRemoved(@Param("cutoffDate") LocalDate cutoffDate);
 
     List<SiteUser> findAllByIdIn(List<Long> ids);
+
+    @Modifying
+    @Query("UPDATE SiteUser u SET u.userStatus = :status WHERE u.id IN :userIds")
+    void bulkUpdateUserStatus(@Param("userIds") List<Long> userIds, @Param("status") UserStatus status);
 }
diff --git a/src/main/java/com/example/solidconnection/siteuser/repository/UserBanRepository.java b/src/main/java/com/example/solidconnection/siteuser/repository/UserBanRepository.java
@@ -1,17 +1,24 @@
 package com.example.solidconnection.siteuser.repository;
 
+import com.example.solidconnection.siteuser.domain.UserBan;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
-
-import com.example.solidconnection.siteuser.domain.UserBan;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface UserBanRepository extends JpaRepository<UserBan, Long> {
 
-    boolean existsByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfter(long bannedUserId, ZonedDateTime current);
+    boolean existsByBannedUserIdAndIsExpiredFalseAndExpiredAtAfter(long bannedUserId, ZonedDateTime now);
+
+    Optional<UserBan> findByBannedUserIdAndIsExpiredFalseAndExpiredAtAfter(long bannedUserId, ZonedDateTime now);
 
-    List<UserBan> findAllByIsUnbannedFalseAndExpiredAtBefore(ZonedDateTime current);
+    @Query("SELECT ub.bannedUserId FROM UserBan ub WHERE ub.isExpired = false AND ub.expiredAt < :current")
+    List<Long> findExpiredBannedUserIds(@Param("current") ZonedDateTime current);
 
-    Optional<UserBan> findTopByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfterOrderByCreatedAtDesc(long bannedUserId, ZonedDateTime current);
+    @Modifying
+    @Query("UPDATE UserBan ub SET ub.isExpired = true WHERE ub.isExpired = false AND ub.expiredAt < :current")
+    void bulkExpireUserBans(@Param("current") ZonedDateTime current);
 }
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,16 +2,18 @@ CREATE TABLE user_ban
 (
     id              BIGINT       NOT NULL AUTO_INCREMENT,
     banned_user_id  BIGINT       NOT NULL,
+    banned_by       BIGINT       NOT NULL,
     duration        VARCHAR(30)  NOT NULL,
-    expired_at      DATETIME(6)    NOT NULL,
-    is_unbanned     TINYINT(1)   NOT NULL DEFAULT 0,
+    expired_at      DATETIME(6)  NOT NULL,
+    is_expired      TINYINT(1)   NOT NULL DEFAULT 0,
     unbanned_by     BIGINT       NULL,
-    unbanned_at     DATETIME(6)    NULL,
-    created_at      DATETIME(6)    NOT NULL,
-    updated_at      DATETIME(6)    NOT NULL,
+    unbanned_at     DATETIME(6)  NULL,
+    created_at      DATETIME(6)  NOT NULL,
+    updated_at      DATETIME(6)  NOT NULL,
     PRIMARY KEY (id),
     CONSTRAINT fk_user_ban_banned_user_id FOREIGN KEY (banned_user_id) REFERENCES site_user (id),
-    CONSTRAINT fk_user_ban_unbanned_by_id FOREIGN KEY (unbanned_by) REFERENCES site_user (id)
+    CONSTRAINT fk_user_ban_banned_by_id FOREIGN KEY (banned_by) REFERENCES site_user (id),
+    CONSTRAINT fk_user_ban_unbanned_by_id FOREIGN KEY (unbanned_by) REFERENCES site_user (id),
 );
 
 ALTER TABLE site_user
diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminUserBanServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminUserBanServiceTest.java
diff --git a/src/test/java/com/example/solidconnection/common/interceptor/BannedUserInterceptorTest.java b/src/test/java/com/example/solidconnection/common/interceptor/BannedUserInterceptorTest.java
diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixture.java b/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixture.java
diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixtureBuilder.java b/src/test/java/com/example/solidconnection/siteuser/fixture/UserBanFixtureBuilder.java

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ public boolean preHandle(`
`34`	`34`	`}`
`35`	`35`	`return true;`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`