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

RAC-304 deploy : 운영 반영
WE-ARE-RACCOONS · Mar 3, 2024 · cfef00f · cfef00f
2 parents d176809 + 384677c
commit cfef00f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...in/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java b/...in/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java
@@ -143,11 +143,11 @@ public void updateAutoCancel() {
     @Transactional
     public void updateCancelWithAuto(Mentoring mentoring) {
         try {
-            Mentoring cancelMentoring = mentoringGetService.byMentoringId(mentoring.getMentoringId());
+            paymentManageUseCase.refundPayByUser(mentoring.getUser(), mentoring.getPayment().getOrderId());
+            Mentoring cancelMentoring = mentoringGetService.byMentoringIdWithLazy(mentoring.getMentoringId());
             mentoringUpdateService.updateStatus(cancelMentoring, CANCEL);
             Refuse refuse = RefuseMapper.mapToRefuse(mentoring);
             refuseSaveService.save(refuse);
-            paymentManageUseCase.refundPayByUser(mentoring.getUser(), mentoring.getPayment().getOrderId());
             log.info("mentoringId : {} 자동 취소", mentoring.getMentoringId());
         } catch (Exception ex) {
             log.error("mentoringId : {} 자동 취소 실패", mentoring.getMentoringId());
@@ -175,7 +175,7 @@ public void updateAutoDone() {
     @Transactional
     public void updateDoneWithAuto(Mentoring mentoring) {
         try {
-            Mentoring doneMentoring = mentoringGetService.byMentoringId(mentoring.getMentoringId());
+            Mentoring doneMentoring = mentoringGetService.byMentoringIdWithLazy(mentoring.getMentoringId());
             mentoringUpdateService.updateStatus(doneMentoring, DONE);
             Senior senior = mentoring.getSenior();
             Salary salary = salaryGetService.bySenior(senior);

diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java b/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringGetService.java
@@ -48,6 +48,11 @@ public Mentoring byMentoringId(Long mentoringId) {
                 .orElseThrow(MentoringNotFoundException::new);
     }
 
+    public Mentoring byMentoringIdWithLazy(Long mentoringId) {
+        return mentoringRepository.findById(mentoringId)
+                .orElseThrow(MentoringNotFoundException::new);
+    }
+
     public List<Mentoring> byStatusAndCreatedAt(Status status, LocalDateTime now) {
         return mentoringRepository.findAllByStatusAndCreatedAtIsBefore(status, now);
     }