Merge branch 'GoodSpace-Kr:main' into main

Author: borntocode2

src/main/java/goodspace/backend/admin/controller/OrderManageController.java

@@ -3,7 +3,6 @@
 import goodspace.backend.admin.dto.order.OrderInfoResponseDto;
 import goodspace.backend.admin.dto.order.OrderUpdateRequestDto;
 import goodspace.backend.admin.service.order.OrderManageService;
-import goodspace.backend.order.dto.OrderPaymentIssueDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -65,37 +64,4 @@ public ResponseEntity<Void> acceptOrder(@RequestParam Long orderId) {
 
         return ResponseEntity.noContent().build();
     }
-
-    @PostMapping("/payment/issue")
-    @Operation(
-            summary = "결제 에러 이슈",
-            description = "개발자가 해결해야할 결제 이슈입니다."
-    )
-    public ResponseEntity<Void> paymentIssue(@RequestParam Long orderId, @RequestParam Long tid) {
-        orderManageService.createPaymentIssue(orderId, tid);
-
-        return ResponseEntity.noContent().build();
-    }
-
-    @DeleteMapping("/payment/Issue")
-    @Operation(
-            summary = "결제 에러 이슈 삭제",
-            description = "개발자가 결제 에러 이슈를 해결하여 삭제합니다."
-    )
-    public ResponseEntity<Void> deletePaymentIssue(@RequestParam Long issueId) {
-        orderManageService.deletePaymentIssue(issueId);
-
-        return ResponseEntity.noContent().build();
-    }
-
-    @GetMapping("/payment/issue")
-    @Operation(
-            summary = "결제 에러 이슈 확인",
-            description = "결제 에러 이슈 리스트를 확인합니다."
-    )
-    public ResponseEntity<List<OrderPaymentIssueDto>> getPaymentIssues() {
-        return ResponseEntity.ok(orderManageService.getOrderPaymentIssues());
-
-
-    }
 }

src/main/java/goodspace/backend/admin/controller/PaymentIssueController.java

@@ -0,0 +1,50 @@
+package goodspace.backend.admin.controller;
+
+import goodspace.backend.admin.dto.order.PaymentIssueResponseDto;
+import goodspace.backend.admin.service.issue.PaymentIssueService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/payment-issue")
+@RequiredArgsConstructor
+public class PaymentIssueController {
+    private final PaymentIssueService paymentIssueService;
+
+    @GetMapping
+    @Operation(
+            summary = "결제 에러 이슈 조회",
+            description = "결제중 발생한 문제를 모두 조회합니다."
+    )
+    public ResponseEntity<List<PaymentIssueResponseDto>> findPaymentIssues() {
+        List<PaymentIssueResponseDto> response = paymentIssueService.find();
+
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping
+    @Operation(
+            summary = "결제 에러 이슈 생성",
+            description = "개발자가 해결해야 할 결제 이슈를 생성합니다."
+    )
+    public ResponseEntity<Void> createPaymentIssue(@RequestParam Long orderId, @RequestParam Long tid) {
+        paymentIssueService.create(orderId, tid);
+
+        return ResponseEntity.noContent().build();
+    }
+
+    @DeleteMapping
+    @Operation(
+            summary = "결제 에러 이슈 해결(삭제)",
+            description = "결제 에러 이슈를 해결했다 판단하고 삭제합니다."
+    )
+    public ResponseEntity<Void> deletePaymentIssue(@RequestParam Long issueId) {
+        paymentIssueService.remove(issueId);
+
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/goodspace/backend/admin/dto/order/PaymentIssueResponseDto.java

@@ -0,0 +1,19 @@
+package goodspace.backend.admin.dto.order;
+
+import goodspace.backend.order.domain.OrderPaymentIssue;
+import lombok.Builder;
+
+@Builder
+public record PaymentIssueResponseDto(
+    Long issueId,
+    Long orderId,
+    Long tid
+) {
+    public static PaymentIssueResponseDto from(OrderPaymentIssue orderPaymentIssue) {
+        return PaymentIssueResponseDto.builder()
+                .issueId(orderPaymentIssue.getId())
+                .orderId(orderPaymentIssue.getOrderId())
+                .tid(orderPaymentIssue.getTid())
+                .build();
+    }
+}

src/main/java/goodspace/backend/admin/service/issue/PaymentIssueService.java

@@ -0,0 +1,13 @@
+package goodspace.backend.admin.service.issue;
+
+import goodspace.backend.admin.dto.order.PaymentIssueResponseDto;
+
+import java.util.List;
+
+public interface PaymentIssueService {
+    List<PaymentIssueResponseDto> find();
+
+    void create(Long orderId, Long tid);
+
+    void remove(Long issueId);
+}

src/main/java/goodspace/backend/admin/service/issue/PaymentIssueServiceImpl.java

@@ -0,0 +1,41 @@
+package goodspace.backend.admin.service.issue;
+
+import goodspace.backend.admin.dto.order.PaymentIssueResponseDto;
+import goodspace.backend.order.domain.OrderPaymentIssue;
+import goodspace.backend.order.repository.OrderPaymentIssueRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class PaymentIssueServiceImpl implements PaymentIssueService {
+    private final OrderPaymentIssueRepository orderPaymentIssueRepository;
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<PaymentIssueResponseDto> find() {
+        return orderPaymentIssueRepository.findAll().stream()
+                .map(PaymentIssueResponseDto::from)
+                .toList();
+    }
+
+    @Override
+    @Transactional
+    public void create(Long orderId, Long tid){
+        OrderPaymentIssue orderPaymentIssue = OrderPaymentIssue.builder()
+                .orderId(orderId)
+                .tid(tid)
+                .build();
+
+        orderPaymentIssueRepository.save(orderPaymentIssue);
+    }
+
+    @Override
+    @Transactional
+    public void remove(Long issueId) {
+        orderPaymentIssueRepository.deleteById(issueId);
+    }
+}

src/main/java/goodspace/backend/admin/service/order/OrderManageService.java

@@ -3,7 +3,6 @@
 import goodspace.backend.admin.dto.order.OrderInfoResponseDto;
 import goodspace.backend.admin.dto.order.OrderUpdateRequestDto;
 import goodspace.backend.admin.dto.order.TrackingNumberRegisterRequestDto;
-import goodspace.backend.order.dto.OrderPaymentIssueDto;
 
 import java.util.List;
 
@@ -17,10 +16,4 @@ public interface OrderManageService {
     void updateOrder(OrderUpdateRequestDto requestDto);
 
     void removeOrder(long orderId);
-
-    void createPaymentIssue(Long orderId, Long tid);
-
-    void deletePaymentIssue(Long issueId);
-
-    List<OrderPaymentIssueDto> getOrderPaymentIssues();
 }

src/main/java/goodspace/backend/admin/service/order/OrderManageServiceImpl.java

@@ -4,10 +4,7 @@
 import goodspace.backend.admin.dto.order.OrderUpdateRequestDto;
 import goodspace.backend.admin.dto.order.TrackingNumberRegisterRequestDto;
 import goodspace.backend.order.domain.Order;
-import goodspace.backend.order.domain.OrderPaymentIssue;
 import goodspace.backend.order.domain.OrderStatus;
-import goodspace.backend.order.dto.OrderPaymentIssueDto;
-import goodspace.backend.order.repository.OrderPaymentIssueRepository;
 import goodspace.backend.order.repository.OrderRepository;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
@@ -24,7 +21,6 @@ public class OrderManageServiceImpl implements OrderManageService {
     private static final Supplier<IllegalStateException> ILLEGAL_ORDER_STATE = () -> new IllegalStateException("요청을 처리하기에 주문의 상태가 부적절합니다.");
 
     private final OrderRepository orderRepository;
-    private final OrderPaymentIssueRepository orderPaymentIssueRepository;
 
     @Override
     @Transactional(readOnly = true)
@@ -76,34 +72,4 @@ public void updateOrder(OrderUpdateRequestDto requestDto) {
     public void removeOrder(long orderId) {
         orderRepository.deleteById(orderId);
     }
-
-    @Override
-    @Transactional
-    public void createPaymentIssue(Long orderId, Long tid){
-        OrderPaymentIssue orderPaymentIssue = OrderPaymentIssue.builder()
-                .orderId(orderId)
-                .tid(tid)
-                .build();
-
-        orderPaymentIssueRepository.save(orderPaymentIssue);
-    }
-
-    @Override
-    @Transactional
-    public void deletePaymentIssue(Long issueId){
-        orderPaymentIssueRepository.deleteById(issueId);
-    }
-
-    @Override
-    @Transactional
-    public List<OrderPaymentIssueDto> getOrderPaymentIssues(){
-        List<OrderPaymentIssue> entities = orderPaymentIssueRepository.findAll();
-
-        return entities.stream()
-                .map(entity -> OrderPaymentIssueDto.builder()
-                        .orderId(entity.getOrderId())
-                        .tid(entity.getTid())
-                        .build())
-                .toList();
-    }
 }