Merge pull request #106 from umcMuses/dev

merge dev to main

Author: luna111122

src/main/java/org/muses/backendbulidtest251228/domain/order/service/OrderSRV.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.muses.backendbulidtest251228.domain.alarm.service.AlarmSRVI;
 import org.muses.backendbulidtest251228.domain.billingAuth.entity.BillingAuthENT;
 import org.muses.backendbulidtest251228.domain.billingAuth.repository.BillingAuthREP;
 import org.muses.backendbulidtest251228.domain.order.dto.OrderCreateReqDT;
@@ -10,8 +11,11 @@
 import org.muses.backendbulidtest251228.domain.order.entity.OrderENT;
 import org.muses.backendbulidtest251228.domain.order.enums.OrderStatus;
 import org.muses.backendbulidtest251228.domain.orderItem.repository.OrderItemREP;
+import org.muses.backendbulidtest251228.domain.project.entity.RewardENT;
+import org.muses.backendbulidtest251228.domain.project.enums.RewardType;
 import org.muses.backendbulidtest251228.domain.project.repository.RewardRepo;
 import org.muses.backendbulidtest251228.domain.settlement.repository.SettlementRepo;
+import org.muses.backendbulidtest251228.domain.ticket.service.TicketIssueSRV;
 import org.muses.backendbulidtest251228.global.apiPayload.code.ErrorCode;
 import org.muses.backendbulidtest251228.global.businessError.BusinessException;
 import org.muses.backendbulidtest251228.domain.order.repository.OrderREP;
@@ -46,6 +50,9 @@ public class OrderSRV {
 
     private final TossBillingClient tossBillingClient;
 
+    private final AlarmSRVI alarmSRVI;
+    private final TicketIssueSRV ticketIssueSRV;
+
 
     @Transactional
     public OrderCreateResDT prepare(String baseSuccessUrl, String baseFailUrl, Long userId, OrderCreateReqDT dto) {
@@ -110,6 +117,38 @@ public OrderCreateResDT prepare(String baseSuccessUrl, String baseFailUrl, Long
 
         projectStatSRV.recalc(project);
 
+        //  여기서 티켓 발행 / 알림 적재를 진행
+        for (OrderItemENT item : saved.getOrderItems()) {
+            Long rewardId = item.getRewardId();
+
+            RewardENT reward = rewardRepo.findById(rewardId)
+                    .orElseThrow(() -> new BusinessException(
+                            ErrorCode.BAD_REQUEST,
+                            "해당 리워드를 찾을 수 없습니다.",
+                            Map.of("rewardId", rewardId, "orderId", saved.getId(), "projectId", project.getId())
+                    ));
+
+            if (reward.getType() == RewardType.NONE) {
+                // 주문 시점에 보내는게 맞는지 한 번만 체크
+                alarmSRVI.send(
+                        saved.getMember().getId(),
+                        4L,
+                        Map.of("projectName", saved.getProject().getTitle())
+                );
+                continue;
+            }
+
+            // 티켓 발행 (idempotent하게)
+            ticketIssueSRV.issueIfAbsent(item);
+
+            // 2번 템플릿(QR 발급)
+            alarmSRVI.send(
+                    saved.getMember().getId(),
+                    7L,
+                    Map.of("projectName", saved.getProject().getTitle())
+            );
+        }
+
 
 
         return OrderCreateResDT.builder()

src/main/java/org/muses/backendbulidtest251228/domain/payment/application/orchestrator/ProjectClosingOrchestrator.java

@@ -155,7 +155,7 @@ public void processProject(Long projectId) {
 
                 boolean  success = paymentOrchestrator.processOrderPayment(order.getId());
 
-                if(success){
+                /*if(success){
                     log.info("[PROJECT-PAYMENT-SUCCESS] 결제 성공 | OrderID: {}. 후속 작업(티켓/알림) 진행", order.getId());
 
                     for (OrderItemENT item : order.getOrderItems()) {
@@ -180,7 +180,8 @@ public void processProject(Long projectId) {
 
                         log.info("[PROJECT-TICKET-ISSUE] 티켓 발행 및 QR 알림 발송 | OrderItemID: {}", item.getId());
 
-                        ticketIssueSRV.issueIfAbsent(item);
+
+                        //ticketIssueSRV.issueIfAbsent(item);
 
                         // 2번 템플릿(QR 발급) - 주문자에게 적재
                         alarmSRVI.send(
@@ -190,7 +191,7 @@ public void processProject(Long projectId) {
                         );
 
                     }
-                }
+                }*/
 
 
 

src/main/java/org/muses/backendbulidtest251228/domain/payment/application/scheduler/PaymentRetryScheduler.java

@@ -73,7 +73,7 @@ public void run() {
                 }
 
                 // 티켓 생성
-                if(success){
+                /*if(success){
                     for (OrderItemENT item : order.getOrderItems()) {
                         Long rewardId = item.getRewardId();
 
@@ -95,7 +95,7 @@ public void run() {
                             continue;
                         }
 
-                        ticketIssueSRV.issueIfAbsent(item);
+                        //ticketIssueSRV.issueIfAbsent(item);
 
                         // 2번 템플릿(QR 발급) - 주문자에게 적재
                         alarmSRVI.send(
@@ -104,7 +104,7 @@ public void run() {
                                 Map.of("projectName", order.getProject().getTitle())
                         );
                     }
-                }
+                }*/
 
                 ProjectENT project = order.getProject();