Merge pull request #127 from prgrms-aibe-devcourse/feat/126-my-feedback

[feat] 멘토링 후기 페이지에 '나의 후기' 탭 추가

Author: kimsehee-8135

src/main/java/com/knoc/global/exception/ErrorCode.java

@@ -40,6 +40,7 @@ public enum ErrorCode {
     INVALID_IDEMPOTENCY_KEY(400, "유효하지 않은 멱등성 키입니다."),
     ORDER_INVALID_AMOUNT(400, "유효하지 않은 결제 금액입니다."),
     ORDER_INVALID_ORDER_NUMBER(400, "유효하지 않은 주문번호입니다."),
+    ORDER_CANNOT_BE_SETTLED(400, "현재 주문 상태에서는 정산을 진행할 수 없습니다."),
 
     // 리뷰 요청서 관련 (Review Request)
     REVIEW_REQUEST_ALREADY_EXISTS(409, "이미 해당 주문에 대한 리뷰 요청서가 존재합니다."),
@@ -53,6 +54,8 @@ public enum ErrorCode {
     // 리뷰 관련 (Review)
     REVIEW_ALREADY_EXISTS(409, "이미 해당 주문에 대한 후기가 존재합니다."),
     REVIEW_NOT_ALLOWED(403, "결제 완료된 주문만 후기를 작성할 수 있습니다."),
+    REVIEW_NOT_FOUND(404, "해당 주문에 대한 후기가 존재하지 않습니다."),
+    REVIEW_UPDATE_NOT_ALLOWED(403, "후기를 수정할 권한이 없습니다."),
 
     // GitHub 관련 (Github)
     GITHUB_PR_NOT_FOUND(404, "존재하지 않는 PR이거나 접근 권한이 없습니다."),

src/main/java/com/knoc/order/service/OrderService.java

@@ -280,7 +280,7 @@ public void settleOrder(Long orderId, Long juniorId) {
             throw new BusinessException(ErrorCode.NOT_JUNIOR_FOR_ORDER);
         }
         if (order.getStatus() != OrderStatus.PAID) {
-            throw new BusinessException(ErrorCode.ORDER_CANNOT_BE_PAID);
+            throw new BusinessException(ErrorCode.ORDER_CANNOT_BE_SETTLED);
         }
 
         order.updateStatus(OrderStatus.SETTLED);
@@ -296,7 +296,7 @@ public void settleOrder(Long orderId, Long juniorId) {
         eventPublisher.publishEvent(new ChatSystemEvent(
                 order.getChatRoom().getId(),
                 MessageType.ROOM_CLOSE,
-                MessageType.ROOM_CLOSE.getTemplate(),
+                null,
                 null
         ));
     }

src/main/java/com/knoc/reviewFeedback/controller/ReviewFeedbackController.java

@@ -1,5 +1,6 @@
 package com.knoc.reviewFeedback.controller;
 
+import com.knoc.reviewFeedback.dto.MyReviewPageResponse;
 import com.knoc.reviewFeedback.dto.ReviewPageDto;
 import com.knoc.reviewFeedback.service.ReviewFeedbackService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -9,6 +10,9 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.security.Principal;
 
 @Tag(name = "Review-Page-Controller", description = "멘토링 후기 공개 페이지")
 @Controller
@@ -27,4 +31,11 @@ public String reviews(Model model) {
         model.addAttribute("topSeniors", page.getTopSeniors());
         return "review/posts";
     }
+
+    @Operation(summary = "나의 멘토링 후기 목록 카드", description = "내가 작성한 후기 카드를 최신순으로 조회합니다.")
+    @GetMapping("/posts/me")
+    @ResponseBody
+    public MyReviewPageResponse myReviews(Principal principal) {
+        return reviewFeedbackService.getMyReviewCards(principal.getName());
+    }
 }

src/main/java/com/knoc/reviewFeedback/dto/MyReviewPageResponse.java

@@ -0,0 +1,11 @@
+package com.knoc.reviewFeedback.dto;
+
+import lombok.Builder;
+
+import java.util.List;
+
+public record MyReviewPageResponse(List<ReviewPageDto.ReviewCardDto> myReviews, int totalCount) {
+    @Builder
+    public MyReviewPageResponse {
+    }
+}

src/main/java/com/knoc/reviewFeedback/dto/ReviewPageDto.java

@@ -23,6 +23,7 @@ public static class ReviewCardDto {
         private final String timeAgo;
         private final byte rating;
         private final String content;
+        private final Long orderId;
     }
 
     @Getter

src/main/java/com/knoc/reviewFeedback/entity/ReviewFeedback.java

@@ -57,4 +57,9 @@ public ReviewFeedback(Order order, Member junior, SeniorProfile seniorProfile,
         this.rating = rating;
         this.comment = comment;
     }
+
+    public void update(byte rating, String comment) {
+        this.rating = rating;
+        this.comment = comment;
+    }
 }

src/main/java/com/knoc/reviewFeedback/repository/ReviewFeedbackRepository.java

@@ -26,4 +26,6 @@ public interface ReviewFeedbackRepository extends JpaRepository<ReviewFeedback,L
 
     @Query("SELECT r.seniorProfile FROM ReviewFeedback r WHERE r.createdAt >= :startOfMonth GROUP BY r.seniorProfile ORDER BY COUNT(r) DESC")
     List<SeniorProfile> findTop3ActiveSeniorsThisMonth(@Param("startOfMonth") LocalDateTime startOfMonth, org.springframework.data.domain.Pageable pageable);
+
+    List<ReviewFeedback> findByJunior_IdOrderByCreatedAtDesc(Long juniorId);
 }

src/main/java/com/knoc/reviewFeedback/service/ReviewFeedbackService.java

@@ -2,9 +2,12 @@
 
 import com.knoc.global.exception.BusinessException;
 import com.knoc.global.exception.ErrorCode;
+import com.knoc.member.Member;
+import com.knoc.member.MemberRepository;
 import com.knoc.order.entity.Order;
 import com.knoc.order.entity.OrderStatus;
 import com.knoc.order.repository.OrderRepository;
+import com.knoc.reviewFeedback.dto.MyReviewPageResponse;
 import com.knoc.reviewFeedback.dto.ReviewPageDto;
 import com.knoc.senior.entity.SeniorProfile;
 import com.knoc.senior.repository.SeniorProfileRepository;
@@ -29,6 +32,7 @@ public class ReviewFeedbackService {
     private final ReviewFeedbackRepository reviewFeedbackRepository;
     private final OrderRepository orderRepository;
     private final SeniorProfileRepository seniorProfileRepository;
+    private final MemberRepository memberRepository;
 
     @Transactional
     public void createReview(ReviewFeedbackRequestDto dto, Long juniorId) {
@@ -66,6 +70,19 @@ public void createReview(ReviewFeedbackRequestDto dto, Long juniorId) {
 
     }
 
+    @Transactional
+    public void updateReview(Long orderId, ReviewFeedbackRequestDto dto, Long juniorId) {
+        ReviewFeedback feedback = reviewFeedbackRepository.findByOrderId(orderId)
+                .orElseThrow(() -> new BusinessException(ErrorCode.REVIEW_NOT_FOUND));
+
+        if (!feedback.getJunior().getId().equals(juniorId)) {
+            throw new BusinessException(ErrorCode.REVIEW_UPDATE_NOT_ALLOWED);
+        }
+
+        // rating/comment validation은 DTO(@Min/@Max) + 컨트롤러 @Valid에서 처리된다는 전제
+        feedback.update(dto.getRating(), dto.getComment());
+    }
+
     public ReviewPageDto getReviewPage() {
         List<ReviewFeedback> feedbacks = reviewFeedbackRepository.findAllByOrderByCreatedAtDesc();
 
@@ -90,6 +107,7 @@ private List<ReviewPageDto.ReviewCardDto> mapToCards(List<ReviewFeedback> feedba
                 .timeAgo(timeAgo(r.getCreatedAt()))
                 .rating(r.getRating())
                 .content(r.getComment())
+                .orderId(r.getOrder().getId())
                 .build()
         ).toList();
     }
@@ -112,4 +130,12 @@ private String timeAgo(LocalDateTime createdAt) {
         return (days / 30) + "개월 전";
     }
 
+    public MyReviewPageResponse getMyReviewCards(String email) {
+        Long juniorId = memberRepository.findByEmail(email)
+                .map(Member::getId)
+                .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));
+
+        List<ReviewFeedback> myFeedbacks = reviewFeedbackRepository.findByJunior_IdOrderByCreatedAtDesc(juniorId);
+        return new MyReviewPageResponse(mapToCards(myFeedbacks), myFeedbacks.size());
+    }
 }

src/main/java/com/knoc/workspace/WorkspaceController.java

@@ -25,9 +25,13 @@ public class WorkspaceController {
 
     @Operation(summary = "워크스페이스 페이지 조회", description = "해당 주문(orderId)에 대한 워크스페이스 화면을 렌더링합니다.")
     @GetMapping("/orders/{orderId}")
-    public String workspace(@PathVariable Long orderId, Principal principal, Model model) {
+    public String workspace(@PathVariable Long orderId,
+                            @RequestParam(value = "reviewOnly", required = false) String reviewOnly,
+                            Principal principal,
+                            Model model) {
         WorkspaceDto dto = workspaceFacadeService.getWorkspaceData(orderId, principal.getName());
         model.addAttribute("workspace", dto);
+        model.addAttribute("openReviewOnlyModal", "1".equals(reviewOnly) || "true".equalsIgnoreCase(reviewOnly));
         return "workspace/workspace";
     }
 
@@ -74,6 +78,17 @@ public ResponseEntity<Void> submitFeedback(@PathVariable Long orderId,
         return ResponseEntity.ok().build();
     }
 
+    @Operation(summary = "후기 수정", description = "주니어가 이미 작성한 후기를 수정합니다.")
+    @PatchMapping("/orders/{orderId}/feedback")
+    @ResponseBody
+    @PreAuthorize("hasRole('USER')")
+    public ResponseEntity<Void> updateFeedback(@PathVariable Long orderId,
+                                               @RequestBody ReviewFeedbackRequestDto dto,
+                                               Principal principal) {
+        workspaceFacadeService.updateFeedback(orderId, principal.getName(), dto);
+        return ResponseEntity.ok().build();
+    }
+
     @Operation(summary = "후기 조회", description = "제출된 후기(평점/코멘트) 정보를 조회합니다.")
     @GetMapping("/orders/{orderId}/feedback")
     @ResponseBody

src/main/java/com/knoc/workspace/WorkspaceFacadeService.java

@@ -222,6 +222,13 @@ public void submitFeedback(Long orderId, String email, ReviewFeedbackRequestDto
         ));
     }
 
+    @Transactional
+    public void updateFeedback(Long orderId, String email, ReviewFeedbackRequestDto dto) {
+        Member member = memberRepository.findByEmail(email)
+                .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND));
+        reviewFeedbackService.updateReview(orderId, dto, member.getId());
+    }
+
     @Transactional(readOnly = true)
     public ReviewFeedbackResponse getReviewFeedback(Long orderId, String email) {
         Order order = orderRepository.findById(orderId)