FIX: pagination sorting func #4

stephano-tri · Aug 12, 2024 · 26a85de · 26a85de
1 parent f2cc7ce
commit 26a85de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/main/kotlin/eom/improve/kafkaboot/repository/FilmRepository.kt b/src/main/kotlin/eom/improve/kafkaboot/repository/FilmRepository.kt
@@ -11,5 +11,5 @@ import reactor.core.publisher.Mono
 interface FilmRepository : R2dbcRepository<FilmEntity, Int> {
     fun findAllBy() : Flux<FilmEntity>
     fun deleteByFilmId(filmId: Int) : Mono<Void>
-    fun findAllBy(pageable: Pageable) : Flux<FilmEntity>
+    fun findAllByOrderByFilmId(pageable: Pageable) : Flux<FilmEntity>
 }
diff --git a/src/main/kotlin/eom/improve/kafkaboot/service/FilmControllerImpl.kt b/src/main/kotlin/eom/improve/kafkaboot/service/FilmControllerImpl.kt
@@ -19,16 +19,7 @@ class FilmControllerImpl(
     }
 
     override fun getFilms(page: Long, limit: Long): Mono<PaginatedResponse<Film>> {
-        return filmService.findAllByPageable(PageRequest.of(page.toInt(), limit.toInt()))
-            .map { it.convert2Pojo() }
-            .collectList()
-            .flatMap { films ->
-                PaginatedResponse(
-                    response = films,
-                    currentPage = page,
-                    totalPages = (films.size / limit).toLong()
-                ).toMono()
-            }
+        return filmService.findAllByPageable(PageRequest.of(page.toInt() , limit.toInt()))
     }
 
     override fun modifyFilm(updatedFilm : Film) : Mono<Film> {

diff --git a/src/main/kotlin/eom/improve/kafkaboot/service/FilmService.kt b/src/main/kotlin/eom/improve/kafkaboot/service/FilmService.kt
@@ -1,5 +1,7 @@
 package eom.improve.kafkaboot.service
 
+import eom.improve.kafkaboot.common.PaginatedResponse
+import eom.improve.kafkaboot.dto.Film
 import eom.improve.kafkaboot.model.FilmEntity
 import eom.improve.kafkaboot.model.InventoryEntity
 import eom.improve.kafkaboot.model.RentalEntity
@@ -21,7 +23,11 @@ class FilmService(
     private val filmCategoryRepository: FilmCategoryRepository
 ) {
 
-    fun findAllByPageable(pageable: Pageable) : Flux<FilmEntity> = filmRepository.findAllBy(pageable)
+    fun findAllByPageable(pageable: Pageable) : Mono<PaginatedResponse<Film>> = filmRepository.findAllByOrderByFilmId(pageable)
+        .collectSortedList { o1, o2 ->  o1.filmId - o2.filmId }
+        .zipWith(filmRepository.count().toMono())
+        .map { pagination -> PaginatedResponse<Film>( pagination.t1.map { it.convert2Pojo() } , pageable.pageNumber.toLong()  ,pagination.t2 / pageable.pageSize ) }
+
 
     fun findAll() : Flux<FilmEntity> = filmRepository.findAllBy()