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

RAC-304 deploy : 운영 반영
WE-ARE-RACCOONS · Mar 2, 2024 · d176809 · d176809
2 parents b1462d1 + 887e542
commit d176809
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 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,7 +143,8 @@ public void updateAutoCancel() {
     @Transactional
     public void updateCancelWithAuto(Mentoring mentoring) {
         try {
-            mentoringUpdateService.updateStatus(mentoring, CANCEL);
+            Mentoring cancelMentoring = mentoringGetService.byMentoringId(mentoring.getMentoringId());
+            mentoringUpdateService.updateStatus(cancelMentoring, CANCEL);
             Refuse refuse = RefuseMapper.mapToRefuse(mentoring);
             refuseSaveService.save(refuse);
             paymentManageUseCase.refundPayByUser(mentoring.getUser(), mentoring.getPayment().getOrderId());
@@ -174,7 +175,8 @@ public void updateAutoDone() {
     @Transactional
     public void updateDoneWithAuto(Mentoring mentoring) {
         try {
-            mentoringUpdateService.updateStatus(mentoring, DONE);
+            Mentoring doneMentoring = mentoringGetService.byMentoringId(mentoring.getMentoringId());
+            mentoringUpdateService.updateStatus(doneMentoring, DONE);
             Senior senior = mentoring.getSenior();
             Salary salary = salaryGetService.bySenior(senior);
             salaryUpdateService.updateTotalAmount(salary);

diff --git a/...main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepository.java b/...main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepository.java
@@ -23,4 +23,6 @@ public interface MentoringDslRepository {
     Page<Mentoring> findAllBySearchPayment(String search, Pageable pageable);
 
     List<Mentoring> findAllByStatusAndCreatedAtIsBefore(Status status, LocalDateTime now);
+
+    List<Mentoring> findAllByStatus(Status status);
 }
diff --git a/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java b/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java
@@ -172,4 +172,16 @@ public List<Mentoring> findAllByStatusAndCreatedAtIsBefore(Status status, LocalD
                 .where(mentoring.status.eq(status), mentoring.createdAt.before(now))
                 .fetch();
     }
+
+    @Override
+    public List<Mentoring> findAllByStatus(Status status) {
+        return queryFactory.selectFrom(mentoring)
+                .distinct()
+                .join(mentoring.senior, senior)
+                .fetchJoin()
+                .join(mentoring.payment.salary, salary)
+                .fetchJoin()
+                .where(mentoring.status.eq(status))
+                .fetch();
+    }
 }
diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java b/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringRepository.java
@@ -1,14 +1,11 @@
 package com.postgraduate.domain.mentoring.domain.repository;
 
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
-import com.postgraduate.domain.mentoring.domain.entity.constant.Status;
 import com.postgraduate.domain.payment.domain.entity.Payment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface MentoringRepository extends JpaRepository<Mentoring, Long>, MentoringDslRepository {
-    List<Mentoring> findAllByStatus(Status status);
     Optional<Mentoring> findByPayment(Payment payment);
 }