Merge pull request #100 from prgrms-web-devcourse-final-project/dev

KangDaegyeom · web-flow · commit 2829a95e79a4 · 2025-07-28T17:23:16.000+09:00
0728 배포
diff --git a/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/AdminController.java b/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/AdminController.java
@@ -46,6 +46,13 @@ public ResponseEntity<UsersListResponse> getUsers(
         return ResponseEntity.ok(response);
     }
 
+    @Operation(summary = "정지 회원 활성 상태로 변경하기")
+    @PatchMapping("v1/users/{userId}/state")
+    public ResponseEntity<?> updateUserSuspensionEndAt(@PathVariable Long userId){
+        adminService.updateUserSuspensionEndAtNow(userId);
+        return ResponseEntity.ok("회원을 활성 상태로 변경하였습니다.");
+    }
+
     @Operation(summary = "신고 내역 목록 조회")
     @GetMapping("v1/reports")
     public ResponseEntity<ReportsListResponse> getReports(
diff --git a/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/ReportDetailResponse.java b/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/ReportDetailResponse.java
@@ -4,6 +4,10 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDateTime;
+
+import static com.grepp.teamnotfound.util.TimeUtils.toKST;
+
 @Getter
 @Builder
 public class ReportDetailResponse {
@@ -20,6 +24,9 @@ public class ReportDetailResponse {
     private String reportedNickname;
     private String adminReason;
     private String reportedState;   // active, suspended, leave
+    private LocalDateTime createdAt;
+    private LocalDateTime reportedAt;          // 신고 처리일
+    private LocalDateTime suspensionEndAt;     // 회원 상태 정지 종료일
 
     public static ReportDetailResponse from(ReportDetailDto dto) {
         return ReportDetailResponse.builder()
@@ -35,6 +42,9 @@ public static ReportDetailResponse from(ReportDetailDto dto) {
                 .reportedNickname(dto.getReportedNickname())
                 .adminReason(dto.getAdminReason())
                 .reportedState(dto.getReportedState().name())
+                .createdAt(toKST(dto.getCreatedAt()))
+                .reportedAt(toKST(dto.getReportedAt()))
+                .suspensionEndAt(toKST(dto.getSuspensionEndAt()))
                 .build();
     }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/ReportsListResponse.java b/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/ReportsListResponse.java
@@ -1,23 +1,60 @@
 package com.grepp.teamnotfound.app.controller.api.admin.payload;
 
+import com.grepp.teamnotfound.app.model.report.code.ReportCategory;
+import com.grepp.teamnotfound.app.model.report.code.ReportState;
+import com.grepp.teamnotfound.app.model.report.code.ReportType;
 import com.grepp.teamnotfound.app.model.report.dto.ReportsListDto;
 import lombok.Builder;
 import lombok.Data;
+import lombok.Getter;
 import org.springframework.data.domain.Page;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import static com.grepp.teamnotfound.util.TimeUtils.toKST;
+
 @Data
 @Builder
 public class ReportsListResponse {
 
-    private List<ReportsListDto> reports;
+    private List<ReportsResponse> reports;
     private PageInfo pageInfo;
 
     public static ReportsListResponse of(Page<ReportsListDto> reportPage) {
+        List<ReportsResponse> reportsResponse = reportPage.getContent().stream()
+                .map(ReportsResponse::from)
+                .toList();
+
         return ReportsListResponse.builder()
-                .reports(reportPage.getContent())
+                .reports(reportsResponse)
                 .pageInfo(PageInfo.fromPage(reportPage))
                 .build();
     }
+
+    @Getter
+    @Builder
+    public static class ReportsResponse {
+        private Long reportId;
+        private String reporter;
+        private ReportType type;
+        private String reported;
+        private LocalDateTime createdAt;
+        private ReportCategory category;
+        private String reason;
+        private ReportState status;
+
+        public static ReportsResponse from(ReportsListDto dto) {
+            return ReportsResponse.builder()
+                    .reportId(dto.getReportId())
+                    .reporter(dto.getReporter())
+                    .type(dto.getType())
+                    .reported(dto.getReported())
+                    .createdAt(toKST(dto.getCreatedAt()))
+                    .category(dto.getCategory())
+                    .reason(dto.getReason())
+                    .status(dto.getStatus())
+                    .build();
+        }
+    }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/UsersListResponse.java b/src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/UsersListResponse.java
@@ -3,21 +3,57 @@
 import com.grepp.teamnotfound.app.model.user.dto.UsersListDto;
 import lombok.Builder;
 import lombok.Data;
+import lombok.Getter;
 import org.springframework.data.domain.Page;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import static com.grepp.teamnotfound.util.TimeUtils.toKST;
+
 @Data
 @Builder
 public class UsersListResponse {
 
-    private List<UsersListDto> users;
+    private List<UsersResponse> users;
     private PageInfo pageInfo;
 
     public static UsersListResponse of(Page<UsersListDto> userPage){
+        List<UsersResponse> usersResponses = userPage.getContent().stream()
+                .map(UsersResponse::from)
+                .toList();
+
         return UsersListResponse.builder()
-                .users(userPage.getContent())
+                .users(usersResponses)
                 .pageInfo(PageInfo.fromPage(userPage))
                 .build();
     }
+
+    @Getter
+    @Builder
+    public static class UsersResponse {
+        private Long userId;
+        private String email;
+        private String nickname;
+        private Long postCount;
+        private Long commentCount;
+        private LocalDateTime lastLoginDate;
+        private LocalDateTime joinDate;
+        private String status;
+        private LocalDateTime suspensionEndAt;
+
+        public static UsersResponse from(UsersListDto dto) { // 팩토리 메서드 변경
+            return UsersResponse.builder() // 빌더 이름 변경
+                    .userId(dto.getUserId())
+                    .email(dto.getEmail())
+                    .nickname(dto.getNickname())
+                    .postCount(dto.getPostCount())
+                    .commentCount(dto.getCommentCount())
+                    .lastLoginDate(toKST(dto.getLastLoginDate()))
+                    .joinDate(toKST(dto.getJoinDate()))
+                    .status(dto.getStatus())
+                    .suspensionEndAt(toKST(dto.getSuspensionEndAt()))
+                    .build();
+        }
+    }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/app/controller/api/dashboard/DashboardApiController.java b/src/main/java/com/grepp/teamnotfound/app/controller/api/dashboard/DashboardApiController.java
@@ -62,6 +62,10 @@ public ResponseEntity<?> getDashboardProfile(
         String analysis = aiAnalysisService.getAiAnalysis(petId, date);
         if (analysis == null) {
             List<String> notes = dashboardService.getWeekNotes(petId, date);
+            if (notes.isEmpty()) {
+                response.setAiAnalysis("최근 관찰노트가 없어서 감정분석을 받기 어려워요!");
+                return ResponseEntity.ok(response);
+            }
             String geminiResponse = geminiService.generateAnalysis(notes);
             AiAnalysis aiAnalysis = aiAnalysisService.createAnalysis(petId, geminiResponse);
             analysis = aiAnalysis.getContent();
diff --git a/src/main/java/com/grepp/teamnotfound/app/model/recommend/GeminiService.java b/src/main/java/com/grepp/teamnotfound/app/model/recommend/GeminiService.java
@@ -76,7 +76,7 @@ public String createPrompt(RecommendCheckDto checkDto){
             
             # 출력 형식 (Output Format)
             {
-              "recommendation": "여기에 반려견 정보를 제외한 맞춤형 제안 문구 3줄 이하"
+              "recommendation": "여기에 반려견 정보를 제외한 맞춤형 제안 문구 공백 포함 60자 이하"
             }
             """,
             // 반려견 정보
@@ -157,10 +157,6 @@ private String createAnalysisPrompt(List<String> notes) {
               "notes": [%s]
             }
             
-            # 출력 형식 (Output Format)
-            {
-              "recommendation": "여기에 강아지 입장에서 기분 요약"
-            }
             """, notes.toString()
         );
     }
diff --git a/src/main/java/com/grepp/teamnotfound/app/model/report/dto/ReportDetailDto.java b/src/main/java/com/grepp/teamnotfound/app/model/report/dto/ReportDetailDto.java
@@ -9,6 +9,8 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.OffsetDateTime;
+
 @Getter
 @Builder
 public class ReportDetailDto {
@@ -25,6 +27,9 @@ public class ReportDetailDto {
     private String reportedNickname;
     private String adminReason;
     private UserStateResponse reportedState;
+    private OffsetDateTime createdAt;
+    private OffsetDateTime reportedAt;          // 신고 처리일
+    private OffsetDateTime suspensionEndAt;     // 회원 상태 정지 종료일
 
 
     public static ReportDetailDto from(Report report, Article article) {
@@ -41,6 +46,9 @@ public static ReportDetailDto from(Report report, Article article) {
                 .reportedNickname(report.getReported().getNickname())
                 .adminReason(report.getAdminReason())
                 .reportedState(report.getReported().getUserState())
+                .createdAt(report.getCreatedAt())
+                .reportedAt(report.getReportedAt())
+                .suspensionEndAt(report.getReported().getSuspensionEndAt())
                 .build();
     }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/app/model/report/repository/ReportRepositoryImpl.java b/src/main/java/com/grepp/teamnotfound/app/model/report/repository/ReportRepositoryImpl.java
@@ -98,7 +98,7 @@ private OrderSpecifier<?> getOrderSpecifier(ReportsListSortBy sortBy, AdminListS
         }
 
         return switch (sortBy){
-            case REPORTED_AT -> direction.isAsc() ? report.reportedAt.asc() : report.reportedAt.desc();
+            case REPORTED_AT -> direction.isAsc() ? report.createdAt.asc() : report.createdAt.desc();
             case REPORTER_NICKNAME -> direction.isAsc() ? report.reporter.nickname.asc() : report.reporter.nickname.desc();
             case REPORTED_NICKNAME -> direction.isAsc() ? report.reported.nickname.asc() : report.reported.nickname.desc();
             case CONTENT_TYPE -> {
diff --git a/src/main/java/com/grepp/teamnotfound/app/model/user/AdminService.java b/src/main/java/com/grepp/teamnotfound/app/model/user/AdminService.java
@@ -23,6 +23,7 @@
 import com.grepp.teamnotfound.infra.error.exception.code.BoardErrorCode;
 import com.grepp.teamnotfound.infra.error.exception.code.ReplyErrorCode;
 import com.grepp.teamnotfound.infra.error.exception.code.ReportErrorCode;
+import com.grepp.teamnotfound.infra.error.exception.code.UserErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -236,4 +237,10 @@ public Page<ReportsListDto> getReportsList(ReportsListRequest request) {
         Pageable pageable = PageRequest.of(request.getPage() -1, request.getSize());
         return reportRepository.findReportListWithMeta(request, pageable);
     }
+
+    public void updateUserSuspensionEndAtNow(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));
+        user.updateSuspensionEndAtNow();
+    }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/app/model/user/entity/User.java b/src/main/java/com/grepp/teamnotfound/app/model/user/entity/User.java
@@ -6,6 +6,7 @@
 import com.grepp.teamnotfound.infra.entity.BaseEntity;
 import com.grepp.teamnotfound.infra.error.exception.BusinessException;
 import com.grepp.teamnotfound.infra.error.exception.code.ReportErrorCode;
+import com.grepp.teamnotfound.infra.error.exception.code.UserErrorCode;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -106,4 +107,15 @@ public void updateLastLoginAt() {
     public boolean isDeleted() {
         return this.deletedAt != null;
     }
+
+    public void updateSuspensionEndAtNow() {
+        OffsetDateTime now = OffsetDateTime.now();
+
+        if(this.suspensionEndAt == null || this.suspensionEndAt.isBefore(now)){
+            throw new BusinessException(UserErrorCode.USER_NOT_SUSPENDED);
+        }
+
+        this.suspensionEndAt = now;
+        this.updatedAt = suspensionEndAt;
+    }
 }
diff --git a/src/main/java/com/grepp/teamnotfound/infra/error/exception/code/UserErrorCode.java b/src/main/java/com/grepp/teamnotfound/infra/error/exception/code/UserErrorCode.java
@@ -18,7 +18,8 @@ public enum UserErrorCode implements BaseErrorCode{
     EMAIL_VERIFICATION_SEND_FAILED(HttpStatus.INTERNAL_SERVER_ERROR.value(), "USER_008", "이메일 전송에 실패했습니다."),
     USER_ACCESS_DENIED(HttpStatus.FORBIDDEN.value(), "USER_007", "해당 사용자 정보에 대한 접근 권한이 없습니다."),
     INVALID_PASSWORD_FORMAT(HttpStatus.BAD_REQUEST.value(), "USER_008", "비밀번호는 영문/숫자/특수문자를 포함한 8~20자여야 합니다."),
-    USER_REPORTED(HttpStatus.FORBIDDEN.value(), "USER_009", "신고로 인해 게시글/댓글 작성이 제한되었습니다.");
+    USER_REPORTED(HttpStatus.FORBIDDEN.value(), "USER_009", "신고로 인해 게시글/댓글 작성이 제한되었습니다."),
+    USER_NOT_SUSPENDED(HttpStatus.BAD_REQUEST.value(), "USER_010", "정지된 회원이 아닙니다.");
 
     private final int status;
     private final String code;
diff --git a/src/main/java/com/grepp/teamnotfound/util/TimeUtils.java b/src/main/java/com/grepp/teamnotfound/util/TimeUtils.java
@@ -0,0 +1,16 @@
+package com.grepp.teamnotfound.util;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+
+public class TimeUtils {
+
+    private static final ZoneId KST = ZoneId.of("Asia/Seoul");
+
+    public static LocalDateTime toKST(OffsetDateTime time) {
+        return time == null ?
+                null :
+                time.atZoneSameInstant(KST).toLocalDateTime();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public String createPrompt(RecommendCheckDto checkDto){`
`76`	`76`
`77`	`77`	`# 출력 형식 (Output Format)`
`78`	`78`	`{`
`79`		`- "recommendation": "여기에 반려견 정보를 제외한 맞춤형 제안 문구 3줄 이하"`
	`79`	`+ "recommendation": "여기에 반려견 정보를 제외한 맞춤형 제안 문구 공백 포함 60자 이하"`
`80`	`80`	`}`
`81`	`81`	`""",`
`82`	`82`	`// 반려견 정보`
`@@ -157,10 +157,6 @@ private String createAnalysisPrompt(List<String> notes) {`
`157`	`157`	`"notes": [%s]`
`158`	`158`	`}`
`159`	`159`
`160`		`- # 출력 형식 (Output Format)`
`161`		`- {`
`162`		`- "recommendation": "여기에 강아지 입장에서 기분 요약"`
`163`		`- }`
`164`	`160`	`""", notes.toString()`
`165`	`161`	`);`
`166`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private OrderSpecifier<?> getOrderSpecifier(ReportsListSortBy sortBy, AdminListS`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`return switch (sortBy){`
`101`		`- case REPORTED_AT -> direction.isAsc() ? report.reportedAt.asc() : report.reportedAt.desc();`
	`101`	`+ case REPORTED_AT -> direction.isAsc() ? report.createdAt.asc() : report.createdAt.desc();`
`102`	`102`	`case REPORTER_NICKNAME -> direction.isAsc() ? report.reporter.nickname.asc() : report.reporter.nickname.desc();`
`103`	`103`	`case REPORTED_NICKNAME -> direction.isAsc() ? report.reported.nickname.asc() : report.reported.nickname.desc();`
`104`	`104`	`case CONTENT_TYPE -> {`