From d919cb25821405397fc2a25cdad842d79ea707ba Mon Sep 17 00:00:00 2001 From: seungyeonnnnnni Date: Sun, 19 May 2024 17:47:43 +0900 Subject: [PATCH] =?UTF-8?q?MNG-22=20fix=20:=20=ED=95=9C=EB=B2=88=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EC=A4=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/repository/MissionCustomRepositoryImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java b/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java index 1baa1d3a..ac2a84d5 100644 --- a/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java +++ b/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java @@ -8,9 +8,12 @@ import com.moing.backend.domain.mission.domain.entity.QMission; import com.moing.backend.domain.mission.domain.entity.constant.MissionStatus; import com.moing.backend.domain.mission.domain.entity.constant.MissionType; +import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.NumberPath; +import com.querydsl.core.types.dsl.SimpleExpression; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.JPQLQuery; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -211,10 +214,12 @@ public Optional> findSingleMissionByMemberId(Long m mission.status.eq(MissionStatus.ONGOING).or(mission.status.eq(MissionStatus.WAIT)), mission.type.eq(MissionType.ONCE) ) - .orderBy(mission.dueTo.asc()) + .orderBy(missionArchive.status.asc(),mission.dueTo.asc(),missionArchive.createdDate.desc()) .fetch()); } + + public boolean findRepeatMissionsByTeamId(Long teamId) { return queryFactory .select(mission)