Merge pull request #208 from WE-ARE-RACCOONS/RAC-326

RAC-326 HotFix : 선배 자신의 시간 조회시 인증여부 상관없이 조회 가능하도록 변경
WE-ARE-RACCOONS · Apr 2, 2024 · 0807b2d · 0807b2d
2 parents 748c7ae + 1c4e9e9
commit 0807b2d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 18 deletions.
diff --git a/...main/java/com/postgraduate/domain/available/domain/repository/AvailableDslRepository.java b/...main/java/com/postgraduate/domain/available/domain/repository/AvailableDslRepository.java
@@ -7,4 +7,5 @@
 
 public interface AvailableDslRepository {
     List<Available> findAllBySenior(Senior senior);
+    List<Available> findAllByMine(Senior senior);
 }
diff --git a/.../java/com/postgraduate/domain/available/domain/repository/AvailableDslRepositoryImpl.java b/.../java/com/postgraduate/domain/available/domain/repository/AvailableDslRepositoryImpl.java
@@ -22,4 +22,12 @@ public List<Available> findAllBySenior(Senior senior) {
                 .where(available.senior.eq(senior), available.senior.status.eq(APPROVE))
                 .fetch();
     }
+
+    @Override
+    public List<Available> findAllByMine(Senior senior) {
+        return queryFactory.selectFrom(available)
+                .distinct()
+                .where(available.senior.eq(senior))
+                .fetch();
+    }
 }
diff --git a/src/main/java/com/postgraduate/domain/available/domain/service/AvailableGetService.java b/src/main/java/com/postgraduate/domain/available/domain/service/AvailableGetService.java
@@ -16,4 +16,8 @@ public class AvailableGetService {
     public List<Available> bySenior(Senior senior) {
         return availableRepository.findAllBySenior(senior);
     }
+
+    public List<Available> byMine(Senior senior) {
+        return availableRepository.findAllByMine(senior);
+    }
 }
diff --git a/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java b/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java
@@ -96,6 +96,7 @@ public Optional<Mentoring> findByMentoringId(Long mentoringId) {
     @Override
     public List<Mentoring> findAllBySeniorAndSalaryStatus(Senior senior, Boolean status) {
         return queryFactory.selectFrom(mentoring)
+                .distinct()
                 .where(
                         mentoring.senior.eq(senior),
                         mentoring.status.eq(Status.DONE),
@@ -112,13 +113,14 @@ public List<Mentoring> findAllBySeniorAndSalaryStatus(Senior senior, Boolean sta
     @Override
     public Page<Mentoring> findAllBySearchPayment(String search, Pageable pageable) {
         List<Mentoring> mentorings = queryFactory.selectFrom(mentoring)
+                .distinct()
                 .where(
                         searchLike(search),
                         mentoring.user.isDelete.eq(FALSE)
                 )
-                .join(mentoring.user, user)
+                .leftJoin(mentoring.user, user)
                 .fetchJoin()
-                .join(mentoring.payment, payment)
+                .leftJoin(mentoring.payment, payment)
                 .fetchJoin()
                 .orderBy(mentoring.payment.paidAt.desc())
                 .offset(pageable.getOffset())
@@ -150,9 +152,9 @@ private BooleanExpression searchLike(String search) {
     public List<Mentoring> findAllByStatusAndCreatedAtIsBefore(Status status, LocalDateTime now) {
         return queryFactory.selectFrom(mentoring)
                 .distinct()
-                .join(mentoring.user, user)
+                .leftJoin(mentoring.user, user)
                 .fetchJoin()
-                .join(mentoring.payment, payment)
+                .leftJoin(mentoring.payment, payment)
                 .fetchJoin()
                 .where(mentoring.status.eq(status), mentoring.createdAt.before(now))
                 .fetch();

diff --git a/...main/java/com/postgraduate/domain/payment/domain/repository/PaymentDslRepositoryImpl.java b/...main/java/com/postgraduate/domain/payment/domain/repository/PaymentDslRepositoryImpl.java
@@ -19,7 +19,7 @@ public class PaymentDslRepositoryImpl implements PaymentDslRepository {
     public List<Payment> findAllPayment() {
         return queryFactory.selectFrom(payment)
                 .distinct()
-                .join(payment.user, user)
+                .leftJoin(payment.user, user)
                 .fetchJoin()
                 .fetch();
     }

diff --git a/src/main/java/com/postgraduate/domain/salary/domain/repository/SalaryDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/salary/domain/repository/SalaryDslRepositoryImpl.java
@@ -39,6 +39,7 @@ public Page<SeniorSalary> findDistinctBySearchSenior(String search, Pageable pag
                         )
                 )
                 .from(salary)
+                .distinct()
                 .where(
                         searchLike(search),
                         salary.senior.user.isDelete.eq(FALSE)
@@ -86,9 +87,9 @@ public List<Salary> findAllLastSalary(LocalDate salaryDate) {
         return queryFactory.selectFrom(salary)
                 .distinct()
                 .where(salary.salaryDate.eq(salaryDate))
-                .join(salary.senior, senior)
+                .leftJoin(salary.senior, senior)
                 .fetchJoin()
-                .join(salary.senior.user, user)
+                .leftJoin(salary.senior.user, user)
                 .fetchJoin()
                 .fetch();
     }
@@ -102,9 +103,9 @@ public List<Salary> findAllByNotDoneFromLast(LocalDate salaryDate) {
                         salary.salaryDate.lt(salaryDate),
                         salary.totalAmount.gt(0)
                 )
-                .join(salary.senior, senior)
+                .leftJoin(salary.senior, senior)
                 .fetchJoin()
-                .join(senior.user, user)
+                .leftJoin(senior.user, user)
                 .fetchJoin()
                 .orderBy(salary.salaryDate.asc())
                 .fetch();
@@ -115,9 +116,9 @@ public List<Salary> findAllByDone() {
         return queryFactory.selectFrom(salary)
                 .distinct()
                 .where(salary.status.isTrue())
-                .join(salary.senior, senior)
+                .leftJoin(salary.senior, senior)
                 .fetchJoin()
-                .join(senior.user, user)
+                .leftJoin(senior.user, user)
                 .fetchJoin()
                 .where(salary.totalAmount.gt(0))
                 .orderBy(salary.salaryDoneDate.desc())
@@ -139,7 +140,7 @@ public List<Salary> findAllBySalaryNoneAccount(LocalDate salaryDate, Senior sear
                             salary.senior.eq(searchSenior)
                                     .and(salary.account.isNull())
                     )
-                    .join(salary.senior, senior)
+                    .leftJoin(salary.senior, senior)
                     .fetchJoin()
                     .fetch();
         }

diff --git a/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorInfoUseCase.java b/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorInfoUseCase.java
@@ -54,7 +54,7 @@ private SeniorDetailResponse getResponse(Long seniorId, boolean isMine) {
     }
 
     private SeniorDetailResponse getResponseMine(Senior senior, boolean isMine) {
-        List<Available> availables = availableGetService.bySenior(senior);
+        List<Available> availables = availableGetService.byMine(senior);
         List<AvailableTimeResponse> times = availables.stream()
                 .map(AvailableMapper::mapToAvailableTimes)
                 .toList();

diff --git a/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCase.java b/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCase.java
@@ -53,7 +53,7 @@ public SeniorMyPageProfileResponse getSeniorMyPageProfile(User user) {
         if (senior.getProfile() == null) {
             throw new NoneProfileException();
         }
-        List<Available> availables = availableGetService.bySenior(senior);
+        List<Available> availables = availableGetService.byMine(senior);
         List<AvailableTimeResponse> times = availables.stream()
                 .map(AvailableMapper::mapToAvailableTimes)
                 .toList();

diff --git a/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/senior/domain/repository/SeniorDslRepositoryImpl.java
@@ -229,7 +229,7 @@ public List<SeniorAndAccount> findAllSeniorAndAccount() {
     public List<Senior> findAllSenior() {
         return queryFactory.selectFrom(senior)
                 .distinct()
-                .join(senior.user, user)
+                .leftJoin(senior.user, user)
                 .fetchJoin()
                 .where(senior.user.isDelete.eq(FALSE))
                 .orderBy(senior.user.nickName.asc())

diff --git a/src/main/java/com/postgraduate/domain/wish/domain/repository/WishDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/wish/domain/repository/WishDslRepositoryImpl.java
@@ -25,7 +25,7 @@ public class WishDslRepositoryImpl implements WishDslRepository {
     public Page<Wish> findAllBySearchWish(String search, Pageable pageable) {
         List<Wish> wishes = queryFactory.selectFrom(wish)
                 .distinct()
-                .join(wish.user, user)
+                .leftJoin(wish.user, user)
                 .fetchJoin()
                 .where(
                         searchLike(search),
@@ -58,7 +58,7 @@ private BooleanExpression searchLike(String search) {
     public List<Wish> findAllWish() {
         return queryFactory.selectFrom(wish)
                 .distinct()
-                .join(wish.user, user)
+                .leftJoin(wish.user, user)
                 .fetchJoin()
                 .where(wish.user.isDelete.isFalse())
                 .fetch();

diff --git a/...test/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCaseTest.java b/...test/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCaseTest.java
@@ -109,7 +109,7 @@ void getSeniorMyPageProfile() {
 
         given(seniorGetService.byUser(user))
                 .willReturn(senior);
-        given(availableGetService.bySenior(senior))
+        given(availableGetService.byMine(senior))
                 .willReturn(availables);
 
         SeniorMyPageProfileResponse myPageProfile = seniorMyPageUseCase.getSeniorMyPageProfile(user);