Merge pull request #289 from Modagbul/MNG-22

Modagbul · May 19, 2024 · 831b7e0 · 831b7e0
2 parents 1a5791e + d919cb2
commit 831b7e0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.../java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java b/.../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<List<GatherSingleMissionRes>> 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)