Merge pull request #184 from WE-ARE-RACCOONS/develop

RAC-325 HotFix : 수정중 사라진 API복구
WE-ARE-RACCOONS · Mar 18, 2024 · b86a872 · b86a872
2 parents 9c84d6a + f99900e
commit b86a872
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/...main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java b/...main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
@@ -3,7 +3,6 @@
 import com.postgraduate.domain.admin.application.dto.MentoringInfo;
 import com.postgraduate.domain.admin.application.dto.UserMentoringInfo;
 import com.postgraduate.domain.admin.application.dto.res.MentoringManageResponse;
-import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
 import com.postgraduate.domain.admin.application.mapper.AdminMapper;
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.mentoring.domain.service.MentoringGetService;
@@ -24,7 +23,6 @@
 
 import java.util.List;
 
-import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToMentoringWithPaymentResponse;
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToUserMentoringInfo;
 import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
 
@@ -61,12 +59,6 @@ public MentoringManageResponse userMentoringInfos(Long userId) {
         return new MentoringManageResponse(mentoringInfos, userInfo);
     }
 
-    public MentoringWithPaymentResponse paymentMentoringInfo(Long paymentId) {
-        Payment payment = paymentGetService.byId(paymentId);
-        Mentoring mentoring = mentoringGetService.byPayment(payment);
-        return mapToMentoringWithPaymentResponse(mentoring);
-    }
-
     public void refundMentoring(User user, Long mentoringId) {
         Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId);
         Payment payment = mentoring.getPayment();

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
@@ -1,6 +1,7 @@
 package com.postgraduate.domain.adminssr.application.usecase;
 
 import com.postgraduate.domain.admin.application.dto.PaymentInfo;
+import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.mentoring.domain.service.MentoringGetService;
 import com.postgraduate.domain.payment.application.usecase.PaymentManageUseCase;
@@ -13,6 +14,7 @@
 
 import java.util.List;
 
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToMentoringWithPaymentResponse;
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToPaymentInfo;
 
 @Service
@@ -35,6 +37,12 @@ public List<PaymentInfo> paymentInfos() {
                 .toList();
     }
 
+    public MentoringWithPaymentResponse paymentMentoringInfo(Long paymentId) {
+        Payment payment = paymentGetService.byId(paymentId);
+        Mentoring mentoring = mentoringGetService.byPayment(payment);
+        return mapToMentoringWithPaymentResponse(mentoring);
+    }
+
     public void refundPayment(User user, Long paymentId) {
         paymentManageUseCase.refundPayByAdmin(user, paymentId);
     }

diff --git a/...main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java b/...main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
@@ -3,6 +3,7 @@
 import com.postgraduate.domain.admin.application.dto.*;
 import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse;
 import com.postgraduate.domain.admin.application.dto.res.MentoringManageResponse;
+import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
 import com.postgraduate.domain.admin.application.dto.res.WishResponse;
 import com.postgraduate.domain.adminssr.application.dto.req.Login;
 import com.postgraduate.domain.adminssr.application.usecase.*;
@@ -136,6 +137,13 @@ public String paymentInfo(Model model) {
         return "adminPayment";
     }
 
+    @GetMapping("/payment/mentoring")
+    public String paymentWithMentoring(Long paymentId, Model model) {
+        MentoringWithPaymentResponse mentoringWithPaymentResponse = adminPaymentUseCase.paymentMentoringInfo(paymentId);
+        model.addAttribute("mentoringInfo", mentoringWithPaymentResponse);
+        return "paymentMentoring";
+    }
+
     @PostMapping("/payment/refund/{paymentId}")
     public String refundPayment(@AuthenticationPrincipal User user, @PathVariable Long paymentId) {
         adminPaymentUseCase.refundPayment(user, paymentId);