Skip to content

Commit f068ae2

Browse files
authored
Merge pull request #124 from billilge/fix/#123
fix: 페이지네이션 정렬 기준 미고정으로 인한 결과 중복/누락 수정
2 parents f7f2656 + 17aa668 commit f068ae2

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/main/kotlin/site/billilge/api/backend/domain/payer/repository/PayerRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface PayerRepository : JpaRepository<Payer, Long?> {
1313
@Query("select p from Payer p where p.id in :ids")
1414
fun findAllByIds(@Param("ids") ids: List<Long>): List<Payer>
1515

16-
@Query("SELECT p FROM Payer p WHERE p.name LIKE CONCAT('%', :name, '%')")
16+
@Query("SELECT p FROM Payer p WHERE p.name LIKE CONCAT('%', :name, '%') ORDER BY p.enrollmentYear DESC, p.name")
1717
fun findAllByNameContaining(@Param("name") name: String, pageable: Pageable): Page<Payer>
1818

1919
fun findAllByEnrollmentYear(enrollmentYear: String): List<Payer>

src/main/kotlin/site/billilge/api/backend/domain/payer/service/PayerService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class PayerService(
6666
pageableCondition.pageNo,
6767
pageableCondition.size,
6868
Sort.by(Sort.Direction.DESC, pageableCondition.criteria ?: "enrollmentYear")
69+
.and(Sort.by(Sort.Direction.ASC, "id"))
6970
)
7071
return payerRepository.findAllByNameContaining(searchCondition.search, pageRequest)
7172
}

src/main/kotlin/site/billilge/api/backend/domain/rental/service/RentalService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ class RentalService(
151151
pageableCondition.pageNo,
152152
pageableCondition.size,
153153
Sort.by(Sort.Direction.DESC, pageableCondition.criteria ?: "applicatedAt")
154+
.and(Sort.by(Sort.Direction.ASC, "id"))
154155
)
155156
return rentalRepository.findAllByMemberNameContaining(searchCondition.search, pageRequest)
156157
}

0 commit comments

Comments
 (0)