Merge pull request #86 from LeeSM0518/DVK-108-refactoring-wishlist-paging

[DVK-108] refactor: 찜 페이징 리팩토링

Author: LeeSM0518

src/main/kotlin/com/devooks/backend/ebook/v1/dto/response/GetEbookInquiriesResponse.kt

@@ -5,7 +5,6 @@ import com.devooks.backend.common.exception.ErrorResponse
 import com.devooks.backend.review.v1.dto.CreateReviewRequest
 import com.devooks.backend.review.v1.dto.CreateReviewResponse
 import com.devooks.backend.review.v1.dto.DeleteReviewResponse
-import com.devooks.backend.review.v1.dto.GetReviewsResponse
 import com.devooks.backend.review.v1.dto.ModifyReviewRequest
 import com.devooks.backend.review.v1.dto.ModifyReviewResponse
 import com.devooks.backend.review.v1.dto.ReviewView

src/main/kotlin/com/devooks/backend/ebook/v1/dto/response/GetEbookInquiryCommentsResponse.kt

@@ -2,6 +2,8 @@ package com.devooks.backend.wishlist.v1.controller
 
 import com.devooks.backend.auth.v1.domain.Authorization
 import com.devooks.backend.auth.v1.service.TokenService
+import com.devooks.backend.common.dto.PageResponse
+import com.devooks.backend.common.dto.PageResponse.Companion.toResponse
 import com.devooks.backend.ebook.v1.domain.Ebook
 import com.devooks.backend.ebook.v1.service.EbookService
 import com.devooks.backend.wishlist.v1.domain.Wishlist
@@ -11,8 +13,8 @@ import com.devooks.backend.wishlist.v1.dto.CreateWishlistResponse
 import com.devooks.backend.wishlist.v1.dto.DeleteWishlistCommand
 import com.devooks.backend.wishlist.v1.dto.DeleteWishlistResponse
 import com.devooks.backend.wishlist.v1.dto.GetWishlistCommand
-import com.devooks.backend.wishlist.v1.dto.GetWishlistResponse
-import com.devooks.backend.wishlist.v1.dto.GetWishlistResponse.Companion.toResponse
+import com.devooks.backend.wishlist.v1.dto.WishlistView
+import com.devooks.backend.wishlist.v1.dto.WishlistView.Companion.toWishlistView
 import com.devooks.backend.wishlist.v1.service.WishlistService
 import java.util.*
 import org.springframework.http.HttpHeaders.AUTHORIZATION
@@ -33,7 +35,7 @@ class WishlistController(
     private val wishlistService: WishlistService,
     private val ebookService: EbookService,
     private val tokenService: TokenService,
-): WishlistControllerDocs {
+) : WishlistControllerDocs {
 
     @Transactional
     @PostMapping
@@ -60,10 +62,11 @@ class WishlistController(
         count: String,
         @RequestHeader(AUTHORIZATION)
         authorization: String,
-    ): GetWishlistResponse {
+    ): PageResponse<WishlistView> {
         val memberId = tokenService.getMemberId(Authorization(authorization))
         val command = GetWishlistCommand(memberId, categoryIds, page, count)
-        return wishlistService.get(command).toResponse()
+        val wishlists = wishlistService.get(command)
+        return wishlists.map { it.toWishlistView() }.toResponse()
     }
 
     @Transactional

src/main/kotlin/com/devooks/backend/review/v1/controller/docs/ReviewControllerDocs.kt

@@ -1,10 +1,11 @@
 package com.devooks.backend.wishlist.v1.controller
 
+import com.devooks.backend.common.dto.PageResponse
 import com.devooks.backend.common.exception.ErrorResponse
 import com.devooks.backend.wishlist.v1.dto.CreateWishlistRequest
 import com.devooks.backend.wishlist.v1.dto.CreateWishlistResponse
 import com.devooks.backend.wishlist.v1.dto.DeleteWishlistResponse
-import com.devooks.backend.wishlist.v1.dto.GetWishlistResponse
+import com.devooks.backend.wishlist.v1.dto.WishlistView
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.media.Content
 import io.swagger.v3.oas.annotations.media.Schema
@@ -76,12 +77,6 @@ interface WishlistControllerDocs {
             ApiResponse(
                 responseCode = "200",
                 description = "OK",
-                content = [
-                    Content(
-                        mediaType = APPLICATION_JSON_VALUE,
-                        schema = Schema(implementation = GetWishlistResponse::class)
-                    )
-                ]
             ),
             ApiResponse(
                 responseCode = "400",
@@ -106,7 +101,7 @@ interface WishlistControllerDocs {
         count: String,
         @Schema(description = "액세스 토큰", required = true, nullable = false)
         authorization: String,
-    ): GetWishlistResponse
+    ): PageResponse<WishlistView>
 
     @Operation(summary = "찜 취소")
     @ApiResponses(

src/main/kotlin/com/devooks/backend/review/v1/dto/GetReviewsResponse.kt

@@ -3,12 +3,11 @@ package com.devooks.backend.wishlist.v1.dto
 import com.devooks.backend.common.dto.Paging
 import com.devooks.backend.wishlist.v1.error.validateCategoryIds
 import java.util.*
-import org.springframework.data.domain.Pageable
 
 class GetWishlistCommand(
     val memberId: UUID,
     val categoryIds: List<UUID>?,
-    private val pageable: Pageable,
+    private val paging: Paging,
 ) {
     constructor(
         memberId: UUID,
@@ -18,12 +17,14 @@ class GetWishlistCommand(
     ) : this(
         memberId = memberId,
         categoryIds = categoryIds.takeIf { it.isNotEmpty() }?.validateCategoryIds(),
-        pageable = Paging(page, count).value
+        paging = Paging(page, count)
     )
 
     val offset: Int
-        get() = pageable.offset.toInt()
+        get() = paging.offset
 
     val limit: Int
-        get() = pageable.pageSize
+        get() = paging.limit
+
+    val pageable = paging.value
 }

src/main/kotlin/com/devooks/backend/wishlist/v1/controller/WishlistController.kt

@@ -1,13 +1,23 @@
 package com.devooks.backend.wishlist.v1.dto
 
+import com.devooks.backend.wishlist.v1.domain.Wishlist
 import io.swagger.v3.oas.annotations.media.Schema
 import java.util.*
 
-data class WishlistDto(
+data class WishlistView(
     @Schema(description = "찜 식별자")
     val id: UUID,
     @Schema(description = "회원 식별자")
     val memberId: UUID,
     @Schema(description = "전자책 식별자")
     val ebookId: UUID,
-)
+) {
+    companion object {
+        fun Wishlist.toWishlistView() =
+            WishlistView(
+                id = this.id,
+                memberId = this.memberId,
+                ebookId = this.ebookId,
+            )
+    }
+}

src/main/kotlin/com/devooks/backend/wishlist/v1/controller/WishlistControllerDocs.kt

@@ -8,6 +8,7 @@ import com.devooks.backend.wishlist.v1.domain.Wishlist
 import com.devooks.backend.wishlist.v1.dto.GetWishlistCommand
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import org.jooq.impl.DSL
 import org.springframework.stereotype.Repository
 
 @Repository
@@ -26,9 +27,20 @@ class WishlistQueryRepository : JooqR2dbcRepository() {
                     .on(EBOOK.EBOOK_ID.eq(WISHLIST.EBOOK_ID))
                     .join(RELATED_CATEGORY)
                     .on(RELATED_CATEGORY.RELATED_CATEGORY_ID.eq(RELATED_CATEGORY.RELATED_CATEGORY_ID))
-            ).where(WISHLIST.MEMBER_ID.eq(command.memberId))
-                .offset(command.offset)
-                .limit(command.limit)
+            ).where(
+                WISHLIST.MEMBER_ID.eq(command.memberId)
+            ).offset(command.offset).limit(command.limit)
         }.map { it.into(Wishlist::class.java) }
 
+    suspend fun countBy(command: GetWishlistCommand): Flow<Long> =
+        query {
+            select(
+                DSL.count()
+            ).from(
+                WISHLIST
+            ).where(
+                WISHLIST.MEMBER_ID.eq(command.memberId)
+            )
+        }.map { it.into(Long::class.java) }
+
 }

src/main/kotlin/com/devooks/backend/wishlist/v1/dto/GetWishlistCommand.kt

@@ -9,7 +9,10 @@ import com.devooks.backend.wishlist.v1.entity.WishlistEntity
 import com.devooks.backend.wishlist.v1.error.WishlistError
 import com.devooks.backend.wishlist.v1.repository.WishlistCrudRepository
 import com.devooks.backend.wishlist.v1.repository.WishlistQueryRepository
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.toList
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.PageImpl
 import org.springframework.stereotype.Service
 
 @Service
@@ -25,13 +28,20 @@ class WishlistService(
         return wishlistCrudRepository.save(wishlistEntity).toDomain()
     }
 
-    suspend fun get(command: GetWishlistCommand): List<Wishlist> =
-        wishlistQueryRepository.findBy(command).toList()
+    suspend fun get(command: GetWishlistCommand): Page<Wishlist> {
+        val wishlists = wishlistQueryRepository.findBy(command)
+        val count = wishlistQueryRepository.countBy(command)
+        return PageImpl(wishlists.toList(), command.pageable, count.first())
+    }
 
     suspend fun delete(command: DeleteWishlistCommand) {
         wishlistCrudRepository
             .findById(command.wishlistId)
-            ?.also { if (it.memberId != command.memberId) { throw WishlistError.FORBIDDEN_DELETE_WISHLIST.exception } }
+            ?.also {
+                if (it.memberId != command.memberId) {
+                    throw WishlistError.FORBIDDEN_DELETE_WISHLIST.exception
+                }
+            }
             ?.also { wishlistCrudRepository.delete(it) }
             ?: throw WishlistError.NOT_FOUND_WISHLIST.exception
     }

src/main/kotlin/com/devooks/backend/wishlist/v1/dto/GetWishlistResponse.kt

@@ -6,6 +6,7 @@ import com.devooks.backend.auth.v1.domain.AccessToken
 import com.devooks.backend.auth.v1.service.TokenService
 import com.devooks.backend.category.v1.repository.CategoryRepository
 import com.devooks.backend.common.dto.ImageDto
+import com.devooks.backend.common.dto.PageResponse
 import com.devooks.backend.config.IntegrationTest
 import com.devooks.backend.ebook.v1.dto.EbookImageDto
 import com.devooks.backend.ebook.v1.dto.request.CreateEbookRequest
@@ -26,7 +27,7 @@ import com.devooks.backend.pdf.v1.repository.PdfRepository
 import com.devooks.backend.pdf.v1.repository.PreviewImageRepository
 import com.devooks.backend.wishlist.v1.dto.CreateWishlistRequest
 import com.devooks.backend.wishlist.v1.dto.CreateWishlistResponse
-import com.devooks.backend.wishlist.v1.dto.GetWishlistResponse
+import com.devooks.backend.wishlist.v1.dto.WishlistView
 import com.devooks.backend.wishlist.v1.repository.WishlistCrudRepository
 import io.netty.handler.codec.http.HttpResponseStatus.CONFLICT
 import java.io.File
@@ -160,21 +161,25 @@ internal class WishlistControllerTest @Autowired constructor(
 
         val response = postCreateWishlist(createEbookResponse, accessToken)
 
-        val wishlist = webTestClient
+        val pageWishlist = webTestClient
             .get()
             .uri("/api/v1/wishlist?page=1&count=10")
             .header(AUTHORIZATION, "Bearer $accessToken")
             .accept(APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk
-            .expectBody<GetWishlistResponse>()
+            .expectBody<PageResponse<WishlistView>>()
             .returnResult()
             .responseBody!!
-            .wishlist
 
-        assertThat(wishlist[0].id).isEqualTo(response.wishlistId)
-        assertThat(wishlist[0].ebookId).isEqualTo(response.ebookId)
-        assertThat(wishlist[0].memberId).isEqualTo(response.memberId)
+        val wishlistViewList = pageWishlist.data
+
+        assertThat(pageWishlist.pageable.totalPages).isEqualTo(1)
+        assertThat(pageWishlist.pageable.totalElements).isEqualTo(1)
+        assertThat(wishlistViewList.size).isEqualTo(1)
+        assertThat(wishlistViewList[0].id).isEqualTo(response.wishlistId)
+        assertThat(wishlistViewList[0].ebookId).isEqualTo(response.ebookId)
+        assertThat(wishlistViewList[0].memberId).isEqualTo(response.memberId)
     }
 
     @Test
@@ -183,7 +188,7 @@ internal class WishlistControllerTest @Autowired constructor(
 
         val response = postCreateWishlist(createEbookResponse, accessToken)
 
-        val wishlist = webTestClient
+        val pageWishlist = webTestClient
             .get()
             .uri(
                 "/api/v1/wishlist?page=1&count=10&" +
@@ -194,14 +199,18 @@ internal class WishlistControllerTest @Autowired constructor(
             .accept(APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk
-            .expectBody<GetWishlistResponse>()
+            .expectBody<PageResponse<WishlistView>>()
             .returnResult()
             .responseBody!!
-            .wishlist
 
-        assertThat(wishlist[0].id).isEqualTo(response.wishlistId)
-        assertThat(wishlist[0].ebookId).isEqualTo(response.ebookId)
-        assertThat(wishlist[0].memberId).isEqualTo(response.memberId)
+        val wishlistViewList = pageWishlist.data
+
+        assertThat(pageWishlist.pageable.totalPages).isEqualTo(1)
+        assertThat(pageWishlist.pageable.totalElements).isEqualTo(1)
+        assertThat(wishlistViewList.size).isEqualTo(1)
+        assertThat(wishlistViewList[0].id).isEqualTo(response.wishlistId)
+        assertThat(wishlistViewList[0].ebookId).isEqualTo(response.ebookId)
+        assertThat(wishlistViewList[0].memberId).isEqualTo(response.memberId)
     }
 
     @Test