Refactor/#57 user

src/main/java/com/hyetaekon/hyetaekon/common/config/SecurityPath.java

@@ -31,7 +31,8 @@ public class SecurityPath {
       "/api/posts/*",
       "/api/search/history",
       "/api/search/history/*",
-      "/api/mongo/services/matched"
+      "/api/mongo/services/matched",
+      "/api/users/reports"
   };
 
   // hasRole("ADMIN")

src/main/java/com/hyetaekon/hyetaekon/common/exception/ErrorCode.java

@@ -16,8 +16,12 @@ public enum ErrorCode {
     INVALID_CREDENTIALS(HttpStatus.UNAUTHORIZED, "AUTH-006", "유효하지 않은 사용자 이름 또는 비밀번호입니다."),
     INVALID_SECRET_KEY(HttpStatus.UNAUTHORIZED, "AUTH-007", "유효하지 않은 비밀 키입니다."),
     DELETE_USER_DENIED(HttpStatus.FORBIDDEN, "AUTH-008", "회원 탈퇴가 거부되었습니다."),
-    ROLE_NOT_FOUND(HttpStatus.FORBIDDEN, "AUTH-009", "권한 정보가 없습니다."),
-    BLACKLIST_TOKEN(HttpStatus.UNAUTHORIZED, "AUTH-010", "사용할 수 없는 액세스 토큰입니다."),
+    CANNOT_REPORT_SELF(HttpStatus.BAD_REQUEST, "AUTH-009","자기 자신을 신고할 수 없습니다."),
+    ROLE_NOT_FOUND(HttpStatus.FORBIDDEN, "AUTH-010", "권한 정보가 없습니다."),
+    BLACKLIST_TOKEN(HttpStatus.UNAUTHORIZED, "AUTH-011", "사용할 수 없는 액세스 토큰입니다."),
+    REPORT_NOT_FOUND(HttpStatus.NOT_FOUND, "AUTH-012", "해당 신고 내역을 찾을 수 없습니다."),
+    REPORT_ALREADY_PROCESSED(HttpStatus.BAD_REQUEST, "AUTH-013", "이미 처리된 신고입니다."),
+    INVALID_REPORT_REQUEST(HttpStatus.BAD_REQUEST, "AUTH-014","잘못된 신고 요청입니다."),
 
     // 계정 관련
     DUPLICATED_REAL_ID(HttpStatus.CONFLICT, "ACCOUNT-001", "이미 존재하는 아이디입니다."),

src/main/java/com/hyetaekon/hyetaekon/user/controller/UserAdminController.java

@@ -1,8 +1,11 @@
 package com.hyetaekon.hyetaekon.user.controller;
 
+import com.hyetaekon.hyetaekon.common.exception.ErrorCode;
+import com.hyetaekon.hyetaekon.common.exception.GlobalException;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserAdminResponseDto;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserReportResponseDto;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserSuspendRequestDto;
+import com.hyetaekon.hyetaekon.user.entity.ReportStatus;
 import com.hyetaekon.hyetaekon.user.service.UserAdminService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +35,7 @@ public ResponseEntity<Page<UserAdminResponseDto>> getAllUsers(
      */
     @PostMapping("/users/{userId}/suspend")
     public ResponseEntity<Void> suspendUser(
-        @PathVariable Long userId,
+        @PathVariable("userId") Long userId,
         @RequestBody UserSuspendRequestDto requestDto) {
         userAdminService.suspendUser(userId, requestDto);
         return ResponseEntity.ok().build();
@@ -42,7 +45,7 @@ public ResponseEntity<Void> suspendUser(
      * 정지 해제
      */
     @PutMapping("/users/{userId}/unsuspend")
-    public ResponseEntity<Void> unsuspendUser(@PathVariable Long userId) {
+    public ResponseEntity<Void> unsuspendUser(@PathVariable("userId") Long userId) {
         userAdminService.unsuspendUser(userId);
         return ResponseEntity.ok().build();
     }
@@ -77,4 +80,42 @@ public ResponseEntity<Page<UserReportResponseDto>> getUserReports(
         return ResponseEntity.ok(userAdminService.getUserReports(page, size));
     }
 
+    /**
+     * 상태별 신고 내역 조회
+     */
+    @GetMapping("/users/reports/status/{status}")
+    public ResponseEntity<Page<UserReportResponseDto>> getReportsByStatus(
+        @PathVariable("status") ReportStatus status,
+        @RequestParam(defaultValue = "0") int page,
+        @RequestParam(defaultValue = "10") int size) {
+        return ResponseEntity.ok(userAdminService.getReportsByStatus(status, page, size));
+    }
+
+    /**
+     * 신고 승인 처리
+     */
+    @PostMapping("/users/reports/{reportId}/resolve")
+    public ResponseEntity<Void> resolveReport(
+        @PathVariable("reportId") Long reportId,
+        @RequestParam(defaultValue = "false") boolean suspendUser,
+        @RequestBody(required = false) UserSuspendRequestDto suspendRequestDto) {
+
+        // 사용자 정지 요청이 있지만 정지 정보가 없는 경우
+        if (suspendUser && suspendRequestDto == null) {
+            throw new GlobalException(ErrorCode.INVALID_REPORT_REQUEST);
+        }
+
+        userAdminService.resolveReport(reportId, suspendUser, suspendRequestDto);
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * 신고 거부 처리
+     */
+    @PostMapping("/users/reports/{reportId}/reject")
+    public ResponseEntity<Void> rejectReport(@PathVariable("reportId") Long reportId) {
+        userAdminService.rejectReport(reportId);
+        return ResponseEntity.ok().build();
+    }
+
 }

src/main/java/com/hyetaekon/hyetaekon/user/controller/UserController.java

@@ -72,12 +72,12 @@ public ResponseEntity<Void> updateMyPassword(
   @DeleteMapping("/users/me")
   public ResponseEntity<Void> deleteUser(
       @AuthenticationPrincipal CustomUserDetails customUserDetails,
-      @RequestBody String deleteReason,
+      @RequestBody UserDeleteRequestDto deleteRequestDto,
       @CookieValue(name = "refreshToken", required = false) String refreshToken,
       @RequestHeader("Authorization") String authHeader
   ) {
     String accessToken = authHeader.replace("Bearer ", "");
-    userService.deleteUser(customUserDetails.getId(), deleteReason, accessToken, refreshToken);
+    userService.deleteUser(customUserDetails.getId(), deleteRequestDto.getDeleteReason(), accessToken, refreshToken);
 
     return ResponseEntity.noContent().build();
   }

src/main/java/com/hyetaekon/hyetaekon/user/controller/UserReportController.java

@@ -0,0 +1,29 @@
+package com.hyetaekon.hyetaekon.user.controller;
+
+import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
+import com.hyetaekon.hyetaekon.user.dto.UserReportRequestDto;
+import com.hyetaekon.hyetaekon.user.service.UserReportService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/users/reports")
+@RequiredArgsConstructor
+public class UserReportController {
+    private final UserReportService userReportService;
+
+    @PostMapping
+    public ResponseEntity<Void> reportUser(
+        @AuthenticationPrincipal CustomUserDetails userDetails,
+        @Valid @RequestBody UserReportRequestDto reportRequestDto
+    ) {
+        Long reporterId = userDetails.getId();
+        userReportService.reportUser(reporterId, reportRequestDto);
+        return ResponseEntity.ok().build();
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/user/dto/UserDeleteRequestDto.java

@@ -0,0 +1,14 @@
+package com.hyetaekon.hyetaekon.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserDeleteRequestDto {
+    private String deleteReason;
+}

src/main/java/com/hyetaekon/hyetaekon/user/dto/UserReportRequestDto.java

@@ -0,0 +1,21 @@
+package com.hyetaekon.hyetaekon.user.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserReportRequestDto {
+    @NotNull(message = "신고 대상 사용자 ID는 필수입니다.")
+    private Long reportedUserId;
+
+    @NotNull(message = "신고 사유는 필수입니다.")
+    private String reason;
+
+    private String content;
+}

src/main/java/com/hyetaekon/hyetaekon/user/dto/admin/UserReportProcessDto.java

@@ -0,0 +1,21 @@
+package com.hyetaekon.hyetaekon.user.dto.admin;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserReportProcessDto {
+    private boolean suspendUser; // 신고 처리 시 사용자 정지 여부
+
+    // 사용자 정지시 필요한 정보 (suspendUser가 true일 때)
+    private LocalDateTime suspendStartAt;
+    private LocalDateTime suspendEndAt;
+    private String suspendReason;
+}

src/main/java/com/hyetaekon/hyetaekon/user/entity/ReportStatus.java

@@ -0,0 +1,17 @@
+package com.hyetaekon.hyetaekon.user.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum ReportStatus {
+    PENDING("처리 대기중"),
+    RESOLVED("처리 완료"),
+    REJECTED("거부됨");
+
+    private final String description;
+
+    ReportStatus(String description) {
+        this.description = description;
+    }
+
+}

src/main/java/com/hyetaekon/hyetaekon/user/entity/UserReport.java

@@ -35,11 +35,22 @@ public class UserReport {
     private String content;
 
     @Column(name = "status", length = 20)
-    private String status;
+    @Enumerated(EnumType.STRING)
+    private ReportStatus status;
 
     @Column(name = "created_at")
     private LocalDateTime createdAt;
 
     @Column(name = "processed_at")
     private LocalDateTime processedAt;
+
+    public void resolve() {
+        this.status = ReportStatus.RESOLVED;
+        this.processedAt = LocalDateTime.now();
+    }
+
+    public void reject() {
+        this.status = ReportStatus.REJECTED;
+        this.processedAt = LocalDateTime.now();
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/user/mapper/UserAdminMapper.java

@@ -18,5 +18,6 @@ public interface UserAdminMapper {
     // UserReport Entity -> 신고 내역 DTO 변환
     @Mapping(source = "reporter.nickname", target = "reporterNickname")
     @Mapping(source = "reported.nickname", target = "reportedNickname")
+    @Mapping(source = "status.description", target = "status")
     UserReportResponseDto toReportResponseDto(UserReport userReport);
 }

src/main/java/com/hyetaekon/hyetaekon/user/repository/UserReportRepository.java

@@ -1,11 +1,15 @@
 package com.hyetaekon.hyetaekon.user.repository;
 
 
+import com.hyetaekon.hyetaekon.user.entity.ReportStatus;
 import com.hyetaekon.hyetaekon.user.entity.UserReport;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface UserReportRepository extends JpaRepository<UserReport, Long> {
-    // 기본 CRUD 메서드 사용
+    // 상태별 신고 목록 조회
+    Page<UserReport> findByStatus(ReportStatus status, Pageable pageable);
 }

src/main/java/com/hyetaekon/hyetaekon/user/service/UserAdminService.java

@@ -3,8 +3,10 @@
 import com.hyetaekon.hyetaekon.common.exception.ErrorCode;
 import com.hyetaekon.hyetaekon.common.exception.GlobalException;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserAdminResponseDto;
+import com.hyetaekon.hyetaekon.user.dto.admin.UserReportProcessDto;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserReportResponseDto;
 import com.hyetaekon.hyetaekon.user.dto.admin.UserSuspendRequestDto;
+import com.hyetaekon.hyetaekon.user.entity.ReportStatus;
 import com.hyetaekon.hyetaekon.user.entity.User;
 import com.hyetaekon.hyetaekon.user.entity.UserReport;
 import com.hyetaekon.hyetaekon.user.mapper.UserAdminMapper;
@@ -107,7 +109,7 @@ public Page<UserAdminResponseDto> getWithdrawnUsers(int page, int size) {
     }
 
     /**
-     * 신고 내역 조회
+     * 신고 내역 조회 (전체)
      */
     @Transactional(readOnly = true)
     public Page<UserReportResponseDto> getUserReports(int page, int size) {
@@ -116,5 +118,60 @@ public Page<UserReportResponseDto> getUserReports(int page, int size) {
         return reportPage.map(userAdminMapper::toReportResponseDto);
     }
 
+    /**
+     * 상태별 신고 내역 조회
+     */
+    @Transactional(readOnly = true)
+    public Page<UserReportResponseDto> getReportsByStatus(ReportStatus status, int page, int size) {
+        Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
+        Page<UserReport> reportPage = userReportRepository.findByStatus(status, pageable);
+        return reportPage.map(userAdminMapper::toReportResponseDto);
+    }
+
+    /**
+     * 신고 승인 처리
+     */
+    @Transactional
+    public void resolveReport(Long reportId, boolean suspendUser, UserSuspendRequestDto suspendRequestDto) {
+        UserReport report = userReportRepository.findById(reportId)
+            .orElseThrow(() -> new GlobalException(ErrorCode.REPORT_NOT_FOUND));
+
+        // 이미 처리된 신고인지 확인
+        if (report.getStatus() != ReportStatus.PENDING) {
+            throw new GlobalException(ErrorCode.REPORT_ALREADY_PROCESSED);
+        }
+
+        // 신고 승인 처리
+        report.resolve();
+
+        // 신고당한 사용자 정지 처리 여부 확인
+        if (suspendUser && suspendRequestDto != null) {
+            User reportedUser = report.getReported();
+            suspendUser(reportedUser.getId(), suspendRequestDto);
+            log.info("신고에 따른 사용자 {} 정지 처리 완료", reportedUser.getId());
+        }
+
+        userReportRepository.save(report);
+        log.info("신고 {} 승인 처리 완료", reportId);
+    }
+
+    /**
+     * 신고 거부 처리
+     */
+    @Transactional
+    public void rejectReport(Long reportId) {
+        UserReport report = userReportRepository.findById(reportId)
+            .orElseThrow(() -> new GlobalException(ErrorCode.REPORT_NOT_FOUND));
+
+        // 이미 처리된 신고인지 확인
+        if (report.getStatus() != ReportStatus.PENDING) {
+            throw new GlobalException(ErrorCode.REPORT_ALREADY_PROCESSED);
+        }
+
+        report.reject();
+        userReportRepository.save(report);
+        log.info("신고 {} 거부 처리 완료", reportId);
+    }
+
 
 }