feat: 사용자 정지/경고 기능 구현

gotcha-auth/src/main/java/gotcha_auth/dto/TokenDto.java

@@ -1,17 +1,23 @@
 package gotcha_auth.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.time.LocalDateTime;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public record TokenDto(
         String accessToken,
         String refreshToken,
         LocalDateTime accessTokenExpiredAt,
-        boolean autoSignIn
+        boolean autoSignIn,
+        Object warningDetails
 ) {
     public static TokenDto of(String accessToken, String refreshToken, LocalDateTime accessTokenExpiredAt) {
-        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, false);
+        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, false, null);
     }
     public static TokenDto of(String accessToken, String refreshToken, LocalDateTime accessTokenExpiredAt, boolean autoSignIn) {
-        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, autoSignIn);
+        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, autoSignIn, null);
+    }
+    public static TokenDto of(String accessToken, String refreshToken, LocalDateTime accessTokenExpiredAt, boolean autoSignIn, Object warningDetails) {
+        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, autoSignIn, warningDetails);
     }
 }

gotcha-auth/src/main/java/gotcha_auth/jwt/JwtHelper.java

@@ -46,7 +46,7 @@ private TokenDto getTokenDto(User user, String uuid, String username, boolean au
         userService.updateLastLogout(user, accessTokenExpiredAt);
 
         refreshTokenService.saveRefreshToken(uuid, refreshToken);
-        return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt, autoSignIn);
+        return TokenDto.of(accessToken, refreshToken, accessTokenExpiredAt, autoSignIn);
     }
 
     public TokenDto reissueToken(String refreshToken) {
@@ -75,7 +75,7 @@ public TokenDto reissueToken(String refreshToken) {
         refreshTokenService.deleteRefreshToken(refreshToken);
         refreshTokenService.saveRefreshToken(uuid, newRefreshToken);
 
-        return new TokenDto(newAccessToken, newRefreshToken, newAccessTokenExpiredAt, autoSignIn);
+        return TokenDto.of(newAccessToken, newRefreshToken, newAccessTokenExpiredAt, autoSignIn);
     }
 
     public void removeToken(String accessToken, String refreshToken, HttpServletResponse response) {

gotcha-common/src/main/java/gotcha_common/exception/ExceptionRes.java

@@ -13,7 +13,7 @@ public record ExceptionRes(
         String code,
         HttpStatus status,
         String message,
-        Map<String, String> fields
+        Map<String, Object> fields
 ) {
     public static ExceptionRes from(ExceptionCode error){
         return ExceptionRes.builder()
@@ -23,7 +23,7 @@ public static ExceptionRes from(ExceptionCode error){
                 .build();
     }
 
-    public static ExceptionRes from(ExceptionCode error, Map<String, String> fields) {
+    public static ExceptionRes from(ExceptionCode error, Map<String, Object> fields) {
         return ExceptionRes.builder()
                 .status(error.getStatus())
                 .code(error.getCode())

gotcha-common/src/main/java/gotcha_common/exception/GlobalExceptionHandler.java

@@ -94,7 +94,7 @@ public ResponseEntity<?> handleFieldValidationException(FieldValidationException
                 log.warn("[Field Validation Exception] {}: {}", field, message)
         );
         ExceptionCode error = GlobalExceptionCode.FIELD_VALIDATION_ERROR;
-        return ResponseEntity.status(error.getStatus()).body(ExceptionRes.from(error, e.getFieldErrors()));
+        return ResponseEntity.status(error.getStatus()).body(ExceptionRes.from(error, new HashMap<>(e.getFieldErrors())));
     }
 
 }

gotcha-domain/src/main/java/gotcha_domain/report/UserReport.java

@@ -33,12 +33,11 @@ public class UserReport extends BaseTimeEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    private UserReportType userReportType;
-
-    @NotNull
+    public UserReportType userReportType;
+
     @Column(columnDefinition = "TEXT")
     private String detail;
-
+  
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
@@ -58,4 +57,5 @@ public UserReport(UserReportType userReportType, String detail, List<ChatMessage
     public static UserReport of(UserReportType userReportType, String detail, List<ChatMessage> chatLog, User user) {
         return new UserReport(userReportType, detail, chatLog, user);
     }
+
 }

gotcha-domain/src/main/java/gotcha_domain/report/UserReportType.java

@@ -1,9 +1,18 @@
 package gotcha_domain.report;
 
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
 public enum UserReportType {
-    BAD_LANGUAGE, // 욕설
-    HATE_SPEECH, // 혐오 발언
-    INAPPROPRIATE_NAME, // 불쾌감을 주거나 부적절한 이름
-    SPAM, // 도배
-    OTHER // 기타
+    BAD_LANGUAGE("욕설"),
+    HATE_SPEECH("혐오 발언"),
+    INAPPROPRIATE_NAME("불쾌감을 주거나 부적절한 이름"),
+    SPAM("도배"),
+    OTHER("기타. 신고 기록을 참조하세요.");
+
+    String reason;
+
+    public String getReason() {
+        return reason;
+    }
 }

gotcha-domain/src/main/java/gotcha_domain/sanction/SanctionType.java

@@ -0,0 +1,32 @@
+package gotcha_domain.sanction;
+
+import gotcha_domain.user.User;
+
+public enum SanctionType {
+    WARNING {
+        @Override
+        public void apply(User user, Long days) {
+            user.incrementWarningCount();
+        }
+    },
+    TEMP_BAN {
+        @Override
+        public void apply(User user, Long days) {
+            user.suspendUser(days);
+        }
+    },
+    TEMP_BAN_CANCEL {
+        @Override
+        public void apply(User user, Long days) {
+            user.unsuspendUser(); // 정지 취소(즉시 해제)
+        }
+    },
+    PERM_BAN {
+        @Override
+        public void apply(User user, Long days) {
+            user.banUser();
+        }
+    };
+
+    public abstract void apply(User user, Long days);
+}

gotcha-domain/src/main/java/gotcha_domain/sanction/UserSanction.java

@@ -0,0 +1,74 @@
+package gotcha_domain.sanction;
+
+import gotcha_common.entity.BaseTimeEntity;
+import gotcha_domain.report.UserReport;
+import gotcha_domain.user.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserSanction extends BaseTimeEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 제재를 받은 유저
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    // 조치를 내린 관리자
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "admin_id", nullable = false)
+    private User admin;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "sanction_type", nullable = false)
+    private SanctionType sanctionType;
+
+    // 제재 사유
+    @Column(nullable = false, columnDefinition = "TEXT")
+    private String reason;
+
+    // 제재 만료 일시
+    @Column(name = "expire_duration")
+    private Long expireDuration;
+
+    // 근거가 된 신고(nullable)
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_report_id")
+    private UserReport userReport;
+
+    @Column(name = "is_read", nullable = false)
+    private boolean isRead = false;
+
+    @Builder
+    public UserSanction(User user, User admin, SanctionType sanctionType, String reason, Long expireDuration, UserReport userReport) {
+        this.user = user;
+        this.admin = admin;
+        this.sanctionType = sanctionType;
+        this.reason = reason;
+        this.expireDuration = expireDuration;
+        this.userReport = userReport;
+    }
+
+    public void markAsRead() {
+        this.isRead = true;
+    }
+
+
+}

gotcha-domain/src/main/java/gotcha_domain/user/User.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import gotcha_common.entity.BaseTimeEntity;
+import gotcha_common.exception.CustomException;
 import gotcha_domain.achivement.UserAchievement;
 import gotcha_domain.friend.Friend;
 import gotcha_domain.friend.FriendRequest;
@@ -52,12 +53,12 @@ public class User extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private Role role;
 
-    private Integer warningCount;
+    private Integer warningCount = 0;
 
     @Setter
     private LocalDateTime lastLogout;
 
-    private Boolean isLocked;
+//    private Boolean isLocked; // UserStatus로 대체
 
     @Setter
     private int level;
@@ -72,6 +73,13 @@ public class User extends BaseTimeEntity {
     @Column(name = "chat_option", nullable = false)
     private ChatOption chatOption = ChatOption.ALLOW_ALL;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "user_status", nullable = false)
+    private UserStatus userStatus = UserStatus.ACTIVE;
+
+    @Column(name = "suspension_end_date")
+    private LocalDateTime suspensionEndDate;
+
     @Enumerated(EnumType.STRING)
     @Column(name = "private_chat_option", nullable = false)
     private PrivateChatOption privateChatOption = PrivateChatOption.ALLOW;
@@ -139,7 +147,35 @@ public void updateChatSettings(ChatOption chatOption, PrivateChatOption privateC
         this.privateChatOption = privateChatOption;
     }
 
+    public void incrementWarningCount() {
+        this.warningCount++;
+    }
+
+    public void suspendUser(long days) {
+        this.userStatus = UserStatus.SUSPENDED;
+        this.suspensionEndDate = LocalDateTime.now().plusDays(days);
+    }
+
+    public void unsuspendUser() {
+        this.userStatus = UserStatus.ACTIVE;
+        this.suspensionEndDate = null;
+    }
 
+    public void banUser(){
+        this.userStatus = UserStatus.BANNED;
+        this.suspensionEndDate = null;
+    }
+
+    @JsonIgnore
+    public boolean isSuspensionExpired() {
+        return suspensionEndDate != null && suspensionEndDate.isBefore(LocalDateTime.now());
+    }
+
+    public void checkSuspensionAndUnsuspend() {
+        if (isSuspensionExpired()) {
+            unsuspendUser();
+        }
+    }
     @Override
     public boolean equals(Object o) {
         if (this == o) {

gotcha-domain/src/main/java/gotcha_domain/user/UserStatus.java

@@ -0,0 +1,5 @@
+package gotcha_domain.user;
+
+public enum UserStatus {
+    ACTIVE, SUSPENDED, BANNED
+}

gotcha-socket/src/main/java/socket_server/common/exception/SocketGlobalExceptionHandler.java

@@ -12,6 +12,8 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 
+import java.util.HashMap;
+
 import static gotcha_common.exception.exceptionCode.GlobalExceptionCode.USER_NOT_FOUND;
 import static socket_server.common.constants.WebSocketConstants.*;
 
@@ -27,7 +29,7 @@ public void handleSocketFieldValidationException(
             SimpMessageHeaderAccessor accessor
     ) {
         log.warn("[WebSocket FieldValidationException] {} - {}", e.getSource(), e.getFieldErrors());
-        sendErrorToUser(e.getSource(), accessor, ExceptionRes.from(GlobalExceptionCode.FIELD_VALIDATION_ERROR, e.getFieldErrors()));
+        sendErrorToUser(e.getSource(), accessor, ExceptionRes.from(GlobalExceptionCode.FIELD_VALIDATION_ERROR, new HashMap<>(e.getFieldErrors())));
     }
 
     @MessageExceptionHandler(SocketCustomException.class)

gotcha/src/main/java/Gotcha/domain/auth/api/AuthApi.java

@@ -130,13 +130,54 @@ ResponseEntity<?> guestSignUp(@Valid @RequestBody SignUpReq signUpReq,
 
     @Operation(summary = "로그인", description = "로그인 API")
     @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "로그인 성공",
+            @ApiResponse(responseCode = "200", description = "로그인 성공. 읽지 않은 경고가 있을 경우 warningDetails가 함께 반환됩니다.",
                     content = @Content(mediaType = "application/json", examples = {
-                            @ExampleObject(value = """
+                            @ExampleObject(name = "일반 로그인 성공", value = """
                                     {
                                           "expiredAt": "2025-04-10T06:57:45",
                                           "accessToken": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QGdtYWlsLmNvbSIsInJvbGUiOiJVU0VSIiwidXNlcklkIjo1LCJpc3MiOiJnb3RjaGEhIiwiaWF0IjoxNzQ0MjY2NDY1LCJleHAiOjE3NDQyNjgyNjV9.u8RTE1VFsxZjQNB_dsc3ibSKqoHQGbC9-ppbOQUvzVY"
                                     }
+                                    """),
+                            @ExampleObject(name = "경고 메시지가 있는 로그인 성공", value = """
+                                    {
+                                        "accessToken": "Bearer eyJhbGciOiJIxzI1NiJ9...",
+                                        "refreshToken": "Bearer eyJhbGciOiJIUzI1NiJ9...",
+                                        "accessTokenExpiredAt": "2025-11-13T15:00:00",
+                                        "autoSignIn": false,
+                                        "warningDetails": {
+                                            "id": 1,
+                                            "targetUserName": "nickname123",
+                                            "adminUserName": "admin",
+                                            "sanctionType": "WARNING",
+                                            "reason": "부적절한 언어 사용",
+                                            "expiresAt": null,
+                                            "createdAt": "2025-11-13T14:00:00"
+                                        }
+                                    }
+                                    """)
+                    })),
+            @ApiResponse(responseCode = "403", description = "계정이 정지됨. details에 상세 정보가 포함됩니다(일시 정지일 경우 만료 기간 포함).",
+                    content = @Content(mediaType = "application/json", examples = {
+                            @ExampleObject(name = "일시 정지", value = """
+                                    {
+                                        "code": "AUTH-403-002",
+                                        "status": "FORBIDDEN",
+                                        "message": "계정이 일시 정지되었습니다.",
+                                        "details": {
+                                            "reason": "스팸 메시지 발송",
+                                            "expiresAt": "2025-12-25T00:00:00"
+                                        }
+                                    }
+                                    """),
+                            @ExampleObject(name = "영구 정지", value = """
+                                    {
+                                        "code": "AUTH-403-003",
+                                        "status": "FORBIDDEN",
+                                        "message": "계정이 영구 정지되었습니다.",
+                                        "details": {
+                                            "reason": "스팸 메시지 발송"
+                                        }
+                                    }
                                     """)
                     })),
             @ApiResponse(responseCode = "422", description = "유효성검사 실패",