Merge pull request #129 from WE-ARE-RACCOONS/RAC-304

RAC-304 fix : Salary 조회 오류 수정
WE-ARE-RACCOONS · Feb 25, 2024 · 2b60704 · 2b60704
2 parents 06356b2 + 9b036db
commit 2b60704
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml
@@ -42,7 +42,7 @@ jobs:
       working-directory: ${{ env.working-directory }}
 
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build -x test
       working-directory: ${{ env.working-directory }}
 
     - name: Cleanup Gradle Cache

diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml
@@ -64,7 +64,7 @@ jobs:
       working-directory: ${{ env.working-directory }}
 
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build -x test
       working-directory: ${{ env.working-directory }}
 
     - name: Cleanup Gradle Cache

diff --git a/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java b/.../java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java
@@ -18,6 +18,7 @@
 
 import static com.postgraduate.domain.mentoring.domain.entity.QMentoring.mentoring;
 import static com.postgraduate.domain.payment.domain.entity.QPayment.payment;
+import static com.postgraduate.domain.payment.domain.entity.constant.Status.DONE;
 import static com.postgraduate.domain.salary.domain.entity.QSalary.salary;
 import static com.postgraduate.domain.senior.domain.entity.QSenior.senior;
 import static com.postgraduate.domain.user.domain.entity.QUser.user;
@@ -108,7 +109,8 @@ public List<Mentoring> findAllBySeniorAndSalaryStatus(Senior senior, Boolean sta
         return queryFactory.selectFrom(mentoring)
                 .where(
                         mentoring.senior.eq(senior),
-                        mentoring.payment.status.eq(com.postgraduate.domain.payment.domain.entity.constant.Status.DONE),
+                        mentoring.status.eq(Status.DONE),
+                        mentoring.payment.status.eq(DONE),
                         mentoring.payment.salary.status.eq(status)
                 )
                 .join(mentoring.payment, payment)