diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml index 4c7e0f9b..6d2cdf3d 100644 --- 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 index 548d1b21..c7870c62 100644 --- 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/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java b/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java index e03069d5..2706ded2 100644 --- a/src/main/java/com/postgraduate/domain/mentoring/domain/repository/MentoringDslRepositoryImpl.java +++ b/src/main/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 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)