[Feature] 일반 회원(Customer) Refund 생성/조회 구현

src/main/java/com/irum/come2us/domain/order/domain/repository/OrderRepository.java

@@ -4,9 +4,10 @@
 import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
-@Repository
 public interface OrderRepository extends JpaRepository<Order, UUID> {
-    Optional<Order> findByOrderId(UUID orderId);
+    @Query("SELECT o FROM Order o JOIN FETCH o.deliveryAddress da WHERE o.orderId =: orderId")
+    Optional<Order> findOrderWithAddress(@Param("orderId") UUID orderId);
 }

src/main/java/com/irum/come2us/domain/refund/application/service/RefundService.java

@@ -0,0 +1,119 @@
+package com.irum.come2us.domain.refund.application.service;
+
+import com.irum.come2us.domain.order.domain.entity.Order;
+import com.irum.come2us.domain.order.domain.entity.OrderDetail;
+import com.irum.come2us.domain.order.domain.repository.OrderDetailRepository;
+import com.irum.come2us.domain.order.domain.repository.OrderRepository;
+import com.irum.come2us.domain.refund.domain.entity.Refund;
+import com.irum.come2us.domain.refund.domain.entity.enums.RefundStatus;
+import com.irum.come2us.domain.refund.domain.repository.RefundRepository;
+import com.irum.come2us.domain.refund.presentation.dto.request.RefundCreateRequest;
+import com.irum.come2us.domain.refund.presentation.dto.request.StoreRefundStatusRequest;
+import com.irum.come2us.domain.refund.presentation.dto.response.*;
+import com.irum.come2us.global.presentation.advice.exception.CommonException;
+import com.irum.come2us.global.presentation.advice.exception.errorcode.OrderErrorCode;
+import com.irum.come2us.global.presentation.advice.exception.errorcode.RefundErrorCode;
+import com.irum.come2us.global.util.MemberUtil;
+import java.util.List;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+@Slf4j
+public class RefundService {
+
+    private final MemberUtil memberUtil;
+    private final RefundRepository refundRepository;
+    private final OrderRepository orderRepository;
+    private final OrderDetailRepository orderDetailRepository;
+
+    // Customer
+    public void createRefund(UUID orderId, RefundCreateRequest request) {
+        assertNoRefundExistsByOrder(orderId);
+        Order order = getValidOrder(orderId);
+        refundRepository.save(
+                Refund.create(
+                        request.reason(),
+                        request.description(),
+                        order.getPayment().getAmount())); // Payment 도메인 Getter 삽입 필요
+    }
+
+    @Transactional(readOnly = true)
+    public RefundDetailResponse findRefundDetail(UUID orderId) {
+        Order order = getValidOrderWithAddress(orderId);
+        Refund refund = getValidRefund(orderId);
+        List<OrderDetail> orderDetails = orderDetailRepository.findAllByOrder(order);
+        return RefundDetailResponse.of(order, orderDetails, refund);
+    }
+
+    // Owner
+    @Transactional(readOnly = true)
+    public StoreRefundListResponse findRefundListByStatus(RefundStatus status) {
+        List<Refund> refunds = refundRepository.findByRefundStatus(status);
+
+        var orderList =
+                refunds.stream()
+                        .map(
+                                refund -> {
+                                    var order = refund.getOrder();
+                                    var products = List.<RefundProductList>of();
+
+                                    return new RefundOrderList(
+                                            order.getOrderId(),
+                                            order.getDeliveryAddress().getRecipientName(),
+                                            order.getCreatedAt(),
+                                            refund.getCreatedAt(),
+                                            refund.getRefundStatus(),
+                                            refund.getPrice(),
+                                            products);
+                                })
+                        .toList();
+
+        int total = refunds.stream().mapToInt(Refund::getPrice).sum();
+
+        return new StoreRefundListResponse(orderList, String.valueOf(total), false, null);
+    }
+
+    public void changeRefundStatus(UUID refundId, StoreRefundStatusRequest request) {
+        Refund refund =
+                refundRepository
+                        .findById(refundId)
+                        .orElseThrow(() -> new CommonException(RefundErrorCode.REFUND_NOT_FOUND));
+
+        refund.updateStatus(request.refundStatus());
+    }
+
+    private void assertNoRefundExistsByOrder(UUID orderId) {
+        if (refundRepository.existsByOrderId(orderId))
+            throw new CommonException(RefundErrorCode.REFUND_ALREADY_EXISTS);
+    }
+
+    private Order getValidOrder(UUID orderId) {
+        Order order =
+                orderRepository
+                        .findById(orderId)
+                        .orElseThrow(() -> new CommonException(OrderErrorCode.ORDER_NOT_FOUND));
+        memberUtil.assertMemberResourceAccess(order.getMember());
+        return order;
+    }
+
+    private Order getValidOrderWithAddress(UUID orderId) {
+        Order order =
+                orderRepository
+                        .findOrderWithAddress(orderId)
+                        .orElseThrow(() -> new CommonException(OrderErrorCode.ORDER_NOT_FOUND));
+        memberUtil.assertMemberResourceAccess(order.getMember());
+        return order;
+    }
+
+    private Refund getValidRefund(UUID orderId) {
+        return refundRepository
+                .findByOrderId(orderId)
+                .orElseThrow(() -> new CommonException(RefundErrorCode.REFUND_NOT_FOUND));
+    }
+}

src/main/java/com/irum/come2us/domain/refund/domain/repository/RefundRepository.java

@@ -1,20 +1,16 @@
 package com.irum.come2us.domain.refund.domain.repository;
 
-import com.irum.come2us.domain.order.domain.entity.Order;
 import com.irum.come2us.domain.refund.domain.entity.Refund;
-import com.irum.come2us.domain.refund.domain.entity.enums.RefundStatus;
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
-@Repository
 public interface RefundRepository extends JpaRepository<Refund, UUID> {
-    List<Refund> findByRefundStatus(RefundStatus status);
+    @Query("SELECT COUNT(r)>0 FROM Refund r WHERE r.order.orderId =: orderId")
+    boolean existsByOrderId(@Param("orderId") UUID orderId);
 
-    // RefundRepository 추후 orderRepository에서 가져오는 것으로 변경 예정
-    // public interface OrderRepository extends JpaRepository<Order, UUID> {..}
-    Optional<Order> findByOrder_OrderId(@Param("orderId") UUID orderId);
+    @Query("SELECT r FROM Refund r WHERE r.order.orderId =: orderId")
+    Optional<Refund> findByOrderId(@Param("orderId") UUID orderId);
 }

src/main/java/com/irum/come2us/domain/refund/presentation/controller/StoreRefundController.java → src/main/java/com/irum/come2us/domain/refund/presentation/controller/RefundController.java

@@ -1,35 +1,50 @@
 package com.irum.come2us.domain.refund.presentation.controller;
 
-import com.irum.come2us.domain.refund.application.service.StoreRefundService;
+import com.irum.come2us.domain.refund.application.service.RefundService;
 import com.irum.come2us.domain.refund.domain.entity.enums.RefundStatus;
-import com.irum.come2us.domain.refund.presentation.dto.request.StoreRefundCreateRequest;
+import com.irum.come2us.domain.refund.presentation.dto.request.RefundCreateRequest;
 import com.irum.come2us.domain.refund.presentation.dto.request.StoreRefundStatusRequest;
-import com.irum.come2us.domain.refund.presentation.dto.response.StoreRefundDetailResponse;
+import com.irum.come2us.domain.refund.presentation.dto.response.RefundDetailResponse;
 import com.irum.come2us.domain.refund.presentation.dto.response.StoreRefundListResponse;
-import com.irum.come2us.domain.refund.presentation.dto.response.StoreRefundResponse;
+import jakarta.validation.Valid;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/refund/owner")
+@RequestMapping("/refund")
 @RequiredArgsConstructor
-public class StoreRefundController {
-    private final StoreRefundService refundService;
+public class RefundController {
+    private final RefundService refundService;
 
+    // Common
+    @PostMapping("/{orderId}")
+    public ResponseEntity<Void> registerRefund(
+            @PathVariable UUID orderId, @Valid @RequestBody RefundCreateRequest request) {
+        refundService.createRefund(orderId, request);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+    @GetMapping("/{orderId}/detail")
+    public RefundDetailResponse getRefundDetail(@PathVariable UUID orderId) {
+        return refundService.findRefundDetail(orderId);
+    }
+
+    // Owner
     @PatchMapping("/{refund-id}") // 환불 상태 변경
     public ResponseEntity<Void> patchRefundStatus(
             @PathVariable("refund-id") UUID refundId,
             @RequestBody StoreRefundStatusRequest request) {
-        refundService.patchRefundStatus(refundId, request);
-        return ResponseEntity.ok().build();
+        refundService.changeRefundStatus(refundId, request);
+        return ResponseEntity.noContent().build();
     }
 
     @GetMapping("/list/{refundStatus}") // 환불 요청 목록
-    public ResponseEntity<StoreRefundListResponse> getRefundList(
+    public StoreRefundListResponse getRefundList(
             @RequestParam(name = "status", required = false) RefundStatus status) {
-        return ResponseEntity.ok(refundService.getRefundListByStatus(status));
+        return refundService.findRefundListByStatus(status);
     }
 
     //    @GetMapping("/list/processing") // 환불 진행중 목록
@@ -42,17 +57,4 @@ public ResponseEntity<StoreRefundListResponse> getRefundList(
     //        return ResponseEntity.ok(refundService.getRefundListByStatus(RefundStatus.COMPLETED));
     //    }
 
-    @PostMapping("/{order-id}") // 환불 요청
-    public ResponseEntity<StoreRefundResponse> createRefund(
-            @PathVariable("order-id") UUID orderId, @RequestBody StoreRefundCreateRequest request) {
-        StoreRefundResponse response = refundService.createRefund(orderId, request);
-        return ResponseEntity.ok().build();
-    }
-
-    @GetMapping("/{refund-id}") // 환불 상세 보기
-    public ResponseEntity<StoreRefundDetailResponse> getRefundDatil(
-            @PathVariable("refund-id") UUID refundId) {
-        StoreRefundDetailResponse response = refundService.getRefundDetail(refundId);
-        return ResponseEntity.ok(response);
-    }
 }

src/main/java/com/irum/come2us/domain/refund/presentation/dto/request/RefundCreateRequest.java

@@ -0,0 +1,9 @@
+package com.irum.come2us.domain.refund.presentation.dto.request;
+
+import com.irum.come2us.domain.refund.domain.entity.enums.RefundReason;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+public record RefundCreateRequest(
+        @NotNull(message = "환불 사유는 필수 입력값입니다.") RefundReason reason,
+        @Nullable String description) {}