Merge remote-tracking branch 'origin/dev' into feat/#430_hunca

api/src/main/kotlin/com/few/api/domain/workbook/usecase/BrowseWorkbooksUseCase.kt

@@ -4,16 +4,16 @@ import com.few.api.domain.workbook.service.WorkbookMemberService
 import com.few.api.domain.workbook.service.WorkbookSubscribeService
 import com.few.api.domain.workbook.service.dto.BrowseMemberSubscribeWorkbooksInDto
 import com.few.api.domain.workbook.service.dto.BrowseWorkbookWriterRecordsInDto
+import com.few.api.domain.workbook.service.dto.WriterMappedWorkbookOutDto
 import com.few.api.domain.workbook.usecase.dto.BrowseWorkBookDetail
 import com.few.api.domain.workbook.usecase.dto.BrowseWorkbooksUseCaseIn
 import com.few.api.domain.workbook.usecase.dto.BrowseWorkbooksUseCaseOut
 import com.few.api.domain.workbook.usecase.dto.WriterDetail
 import com.few.api.domain.workbook.usecase.model.*
-import com.few.api.domain.workbook.usecase.service.order.AuthMainViewWorkbookOrderDelegator
-import com.few.api.domain.workbook.usecase.service.order.BasicWorkbookOrderDelegator
-import com.few.api.domain.workbook.usecase.service.order.WorkbookOrderDelegatorExecutor
+import com.few.api.domain.workbook.usecase.model.order.*
 import com.few.api.repo.dao.workbook.WorkbookDao
 import com.few.api.repo.dao.workbook.query.BrowseWorkBookQueryWithSubscriptionCountQuery
+import com.few.api.repo.dao.workbook.record.SelectWorkBookRecordWithSubscriptionCount
 import com.few.api.web.support.ViewCategory
 import com.few.data.common.code.CategoryType
 import org.springframework.stereotype.Component
@@ -42,7 +42,6 @@ class BrowseWorkbooksUseCase(
     private val workbookDao: WorkbookDao,
     private val workbookMemberService: WorkbookMemberService,
     private val workbookSubscribeService: WorkbookSubscribeService,
-    private val workbookOrderDelegatorExecutor: WorkbookOrderDelegatorExecutor,
 ) {
 
     @Transactional
@@ -56,54 +55,30 @@ class BrowseWorkbooksUseCase(
             BrowseWorkbookWriterRecordsInDto(workbookIds)
         )
 
-        val workbookDetails = workbookRecords.map { record ->
-            WorkBook(
-                id = record.id,
-                mainImageUrl = record.mainImageUrl,
-                title = record.title,
-                description = record.description,
-                category = CategoryType.convertToDisplayName(record.category),
-                createdAt = record.createdAt,
-                writerDetails = writerRecords[record.id]?.map {
-                    WorkBookWriter(
-                        id = it.writerId,
-                        name = it.name,
-                        url = it.url
-                    )
-                } ?: emptyList(),
-                subscriptionCount = record.subscriptionCount
-            )
+        val orderStrategy = getOrderStrategy(useCaseIn)
+        val orderDelegator = when (orderStrategy) {
+            WorkBookOrderStrategy.MAIN_VIEW_AUTH -> {
+                genAuthMainViewWorkbookOrderDelegator(useCaseIn)
+            }
+            /** BASIC, MAIN_VIEW_UNAUTH -> 해당 경우는 DB 조회 결과를 그대로 반환 */
+            else -> null
         }
 
-        val orderStrategy = when {
-            useCaseIn.viewCategory == ViewCategory.MAIN_CARD && useCaseIn.memberId != null -> WorkBookOrderStrategy.MAIN_VIEW_AUTH
-            useCaseIn.viewCategory == ViewCategory.MAIN_CARD && useCaseIn.memberId == null -> WorkBookOrderStrategy.MAIN_VIEW_UNAUTH
-            else -> WorkBookOrderStrategy.BASIC
-        }
+        val workbooks = toWorkbooks(workbookRecords, writerRecords)
 
-        val orderedWorkbooks = when (orderStrategy) {
-            WorkBookOrderStrategy.MAIN_VIEW_AUTH -> {
-                BrowseMemberSubscribeWorkbooksInDto(useCaseIn.memberId!!).let { dto ->
-                    workbookSubscribeService.browseMemberSubscribeWorkbooks(dto)
-                }.map {
-                    MemberSubscribedWorkbook(
-                        workbookId = it.workbookId,
-                        isActiveSub = it.isActiveSub,
-                        currentDay = it.currentDay
-                    )
-                }.let { subscribedWorkbooks ->
-                    AuthMainViewWorkbookOrderDelegator(workbookDetails, subscribedWorkbooks)
+        val orderedWorkbook = OrderTargetWorkBooks(workbooks).let { target ->
+            orderDelegator
+                ?.let { delegator ->
+                    UnOrderedWorkBooks(
+                        target,
+                        delegator
+                    ).order()
                 }
-            }
-            WorkBookOrderStrategy.MAIN_VIEW_UNAUTH -> {
-                BasicWorkbookOrderDelegator(workbookDetails)
-            }
-            else -> BasicWorkbookOrderDelegator(workbookDetails)
-        }.let { delegator ->
-            workbookOrderDelegatorExecutor.execute(delegator)
-        }
+                ?: run { OrderedWorkBooks(target) }
+        }.orderedWorkbooks
 
-        orderedWorkbooks.map { workBook ->
+        val orderedWorkbookData = orderedWorkbook.workbookData
+        orderedWorkbookData.map { workBook ->
             BrowseWorkBookDetail(
                 id = workBook.id,
                 mainImageUrl = workBook.mainImageUrl,
@@ -126,4 +101,51 @@ class BrowseWorkbooksUseCase(
             )
         }
     }
+
+    private fun getOrderStrategy(useCaseIn: BrowseWorkbooksUseCaseIn) =
+        when {
+            useCaseIn.viewCategory == ViewCategory.MAIN_CARD && useCaseIn.memberId != null -> WorkBookOrderStrategy.MAIN_VIEW_AUTH
+            useCaseIn.viewCategory == ViewCategory.MAIN_CARD && useCaseIn.memberId == null -> WorkBookOrderStrategy.MAIN_VIEW_UNAUTH
+            else -> WorkBookOrderStrategy.BASIC
+        }
+
+    private fun genAuthMainViewWorkbookOrderDelegator(useCaseIn: BrowseWorkbooksUseCaseIn): WorkbookOrderDelegator {
+        return BrowseMemberSubscribeWorkbooksInDto(useCaseIn.memberId!!).let { dto ->
+            workbookSubscribeService.browseMemberSubscribeWorkbooks(dto)
+        }.map {
+            MemberSubscribedWorkbook(
+                workbookId = it.workbookId,
+                isActiveSub = it.isActiveSub,
+                currentDay = it.currentDay
+            )
+        }.let { subscribedWorkbooks ->
+            AuthMainViewWorkbookOrderDelegator(subscribedWorkbooks)
+        }
+    }
+
+    private fun toWorkbooks(
+        workbookRecords: List<SelectWorkBookRecordWithSubscriptionCount>,
+        writerRecords: Map<Long, List<WriterMappedWorkbookOutDto>>,
+    ): WorkBooks {
+        return workbookRecords.map { record ->
+            WorkBook(
+                id = record.id,
+                mainImageUrl = record.mainImageUrl,
+                title = record.title,
+                description = record.description,
+                category = CategoryType.convertToDisplayName(record.category),
+                createdAt = record.createdAt,
+                writerDetails = writerRecords[record.id]?.map {
+                    WorkBookWriter(
+                        id = it.writerId,
+                        name = it.name,
+                        url = it.url
+                    )
+                } ?: emptyList(),
+                subscriptionCount = record.subscriptionCount
+            )
+        }.let {
+            WorkBooks(it)
+        }
+    }
 }

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/WorkBooks.kt

@@ -0,0 +1,5 @@
+package com.few.api.domain.workbook.usecase.model
+
+data class WorkBooks(
+    val workbookData: List<WorkBook>,
+)

api/src/main/kotlin/com/few/api/domain/workbook/usecase/service/order/AuthMainViewWorkbookOrderDelegator.kt → api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/AuthMainViewWorkbookOrderDelegator.kt

@@ -1,13 +1,10 @@
-package com.few.api.domain.workbook.usecase.service.order
+package com.few.api.domain.workbook.usecase.model.order
 
 import com.few.api.domain.workbook.usecase.model.MemberSubscribedWorkbook
 import com.few.api.domain.workbook.usecase.model.WorkBook
+import com.few.api.domain.workbook.usecase.model.WorkBooks
 
 class AuthMainViewWorkbookOrderDelegator(
-    /**
-     * @see com.few.api.repo.dao.workbook.WorkbookDao.browseWorkBookWithSubscriptionCount
-     */
-    private val workbooks: List<WorkBook>,
     private val memberSubscribedWorkbooks: List<MemberSubscribedWorkbook>,
 ) : WorkbookOrderDelegator {
 
@@ -18,7 +15,8 @@ class AuthMainViewWorkbookOrderDelegator(
      * 2. 구독 기록이 없는 워크북을 보여줍니다.
      * 3. 비활성화된 구독 워크북을 보여줍니다.
      */
-    override fun order(): List<WorkBook> {
+    override fun order(targetWorkBooks: OrderTargetWorkBooks): OrderTargetWorkBooks {
+        val workbooks = targetWorkBooks.workbooks.workbookData
         val allWorkbookIds = workbooks.associate { it.id to false }.toMutableMap()
         val activeSubWorkbookIds =
             memberSubscribedWorkbooks.filter { it.isActiveSub }.sortedByDescending {
@@ -64,6 +62,6 @@ class AuthMainViewWorkbookOrderDelegator(
          */
         orderedWorkbooks.addAll(lastAddWorkbooks)
 
-        return orderedWorkbooks
+        return OrderTargetWorkBooks(WorkBooks(orderedWorkbooks))
     }
 }

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/OrderAbleWorkBooks.kt

@@ -0,0 +1,5 @@
+package com.few.api.domain.workbook.usecase.model.order
+
+open class OrderAbleWorkBooks(
+    protected open val targetWorkBooks: OrderTargetWorkBooks,
+)

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/OrderTargetWorkBooks.kt

@@ -0,0 +1,7 @@
+package com.few.api.domain.workbook.usecase.model.order
+
+import com.few.api.domain.workbook.usecase.model.WorkBooks
+
+data class OrderTargetWorkBooks(
+    val workbooks: WorkBooks,
+)

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/OrderedWorkBooks.kt

@@ -0,0 +1,9 @@
+package com.few.api.domain.workbook.usecase.model.order
+
+import com.few.api.domain.workbook.usecase.model.WorkBooks
+
+class OrderedWorkBooks(
+    orderTargetWorkBooks: OrderTargetWorkBooks,
+) : OrderAbleWorkBooks(orderTargetWorkBooks) {
+    val orderedWorkbooks: WorkBooks = orderTargetWorkBooks.workbooks
+}

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/UnOrderedWorkBooks.kt

@@ -0,0 +1,11 @@
+package com.few.api.domain.workbook.usecase.model.order
+
+class UnOrderedWorkBooks(
+    orderTargetWorkBooks: OrderTargetWorkBooks,
+    private val delegator: WorkbookOrderDelegator,
+) : OrderAbleWorkBooks(orderTargetWorkBooks) {
+    fun order(): OrderedWorkBooks {
+        val orderedWorkbooks = delegator.order(targetWorkBooks)
+        return OrderedWorkBooks(orderedWorkbooks)
+    }
+}

api/src/main/kotlin/com/few/api/domain/workbook/usecase/model/order/WorkbookOrderDelegator.kt

@@ -0,0 +1,11 @@
+package com.few.api.domain.workbook.usecase.model.order
+
+interface WorkbookOrderDelegator {
+
+    /**
+     * 워크북을 정렬합니다.
+     * @param targetWorkBooks 정렬할 워크북 목록
+     * @return 정렬된 워크북 목록
+     */
+    fun order(targetWorkBooks: OrderTargetWorkBooks): OrderTargetWorkBooks
+}