fix: 마감임박순에 전형일 없는 것 가장 후순위로 이동 (#217)

team-go-higher · Aug 20, 2024 · d3c1aef · d3c1aef
1 parent 50e76fb
commit d3c1aef
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...stence-jpa/src/main/java/gohigher/application/entity/ApplicationRepositoryCustomImpl.java b/...stence-jpa/src/main/java/gohigher/application/entity/ApplicationRepositoryCustomImpl.java
@@ -122,9 +122,13 @@ private NumberExpression<Integer> sortByProcessType() {
 
 	private OrderSpecifier<?>[] sortByEndDate(LocalDateTime today) {
 		// 마감이 지나지 않은 경우 (schedule이 today 이후)
+		long order = 0L;
 		NumberExpression<Long> notExpiredCase = new CaseBuilder()
-			.when(applicationProcessJpaEntity.schedule.after(today)).then(0L)
-			.otherwise(1L);
+			.when(applicationProcessJpaEntity.schedule.eq(today)).then(order++)
+			.when(applicationProcessJpaEntity.schedule.after(today)).then(order++)
+			.when(applicationProcessJpaEntity.schedule.before(today)).then(order++)
+			.when(applicationProcessJpaEntity.schedule.isNull()).then(order++)
+			.otherwise(order);
 
 		// 마감이 임박한 순서로 정렬 (notExpiredCase 오름차순, schedule 오름차순)
 		OrderSpecifier<Long> notExpiredOrder = notExpiredCase.asc();