feat: 어드민 차단 기능

Author: JAEHEE25

src/main/java/com/example/solidconnection/admin/controller/AdminUserBanController.java

@@ -1,7 +1,12 @@
 package com.example.solidconnection.admin.controller;
 
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.example.solidconnection.admin.dto.UserBanRequest;
 import com.example.solidconnection.admin.service.AdminUserBanService;

src/main/java/com/example/solidconnection/admin/service/AdminUserBanService.java

@@ -36,7 +36,7 @@ public class AdminUserBanService {
 
     @Transactional
     public void banUser(long userId, UserBanRequest request) {
-        ZonedDateTime now = ZonedDateTime.now(UTC); //TODO UTC 확인
+        ZonedDateTime now = ZonedDateTime.now(UTC);
         validateNotAlreadyBanned(userId, now);
         validateReportExists(userId);
 
@@ -45,27 +45,6 @@ public void banUser(long userId, UserBanRequest request) {
         updateUserStatus(userId, UserStatus.BANNED);
     }
 
-    @Transactional
-    public void unbanUser(long userId, long adminId) {
-        UserBan userBan = findBannedUser(userId, ZonedDateTime.now(UTC));
-        userBan.manuallyUnban(adminId);
-        processUnban(userId);
-    }
-
-    @Transactional
-    @Scheduled(cron = "0 0 0 * * *")
-    public void expireUserBans() {
-        List<UserBan> expiredBans = userBanRepository.findAllByIsUnbannedFalseAndExpiredAtBefore(ZonedDateTime.now(UTC));
-        for (UserBan userBan : expiredBans) {
-           processUnban(userBan.getBannedUserId());
-        }
-    }
-
-    public void processUnban(long userId) {
-        updateReportedContentIsDeleted(userId, false);
-        updateUserStatus(userId, UserStatus.REPORTED);
-    }
-
     private void validateNotAlreadyBanned(long userId, ZonedDateTime now) {
         if (userBanRepository.existsByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfter(userId, now)) {
             throw new CustomException(ErrorCode.ALREADY_BANNED_USER);
@@ -89,15 +68,36 @@ private void createUserBan(long userId, UserBanRequest request, ZonedDateTime no
         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));
+        userBan.manuallyUnban(adminId);
+        processUnban(userId);
+    }
+
     private UserBan findBannedUser(long userId, ZonedDateTime now) {
         return userBanRepository
                 .findTopByBannedUserIdAndIsUnbannedFalseAndExpiredAtAfterOrderByCreatedAtDesc(userId, now)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_BANNED_USER));
     }
 
-    private void updateUserStatus(long userId, UserStatus status) {
-        SiteUser user = siteUserRepository.findById(userId)
-                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-        user.updateUserStatus(status);
+    @Transactional
+    @Scheduled(cron = "0 0 0 * * *")
+    public void expireUserBans() {
+        List<UserBan> expiredBans = userBanRepository.findAllByIsUnbannedFalseAndExpiredAtBefore(ZonedDateTime.now(UTC));
+        for (UserBan userBan : expiredBans) {
+           processUnban(userBan.getBannedUserId());
+        }
+    }
+
+    private void processUnban(long userId) {
+        updateReportedContentIsDeleted(userId, false);
+        updateUserStatus(userId, UserStatus.REPORTED);
     }
 }

src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java

@@ -72,7 +72,7 @@ public class SiteUser extends BaseEntity {
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
-    private UserStatus userStatus;
+    private UserStatus userStatus = UserStatus.ACTIVE;
 
     public SiteUser(
             String email,

src/test/java/com/example/solidconnection/report/service/ReportServiceTest.java

@@ -4,8 +4,10 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 
 import com.example.solidconnection.chat.domain.ChatMessage;
+import com.example.solidconnection.chat.domain.ChatParticipant;
 import com.example.solidconnection.chat.domain.ChatRoom;
 import com.example.solidconnection.chat.fixture.ChatMessageFixture;
+import com.example.solidconnection.chat.fixture.ChatParticipantFixture;
 import com.example.solidconnection.chat.fixture.ChatRoomFixture;
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.common.exception.ErrorCode;
@@ -52,6 +54,9 @@ class ReportServiceTest {
     @Autowired
     private ChatRoomFixture chatRoomFixture;
 
+    @Autowired
+    private ChatParticipantFixture chatParticipantFixture;
+
     @Autowired
     private ChatMessageFixture chatMessageFixture;
 
@@ -65,7 +70,8 @@ void setUp() {
         Board board = boardFixture.자유게시판();
         post = postFixture.게시글(board, siteUser);
         ChatRoom chatRoom = chatRoomFixture.채팅방(false);
-        chatMessage = chatMessageFixture.메시지("채팅", siteUser.getId(), chatRoom);
+        ChatParticipant chatParticipant = chatParticipantFixture.참여자(siteUser.getId(), chatRoom);
+        chatMessage = chatMessageFixture.메시지("채팅", chatParticipant.getId(), chatRoom);
     }
 
     @Nested