[RELEASE] v24.09.12.01

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/SubscriptionDao.kt

@@ -5,6 +5,7 @@ import com.few.api.repo.dao.subscription.query.*
 import com.few.api.repo.dao.subscription.record.WorkbookSubscriptionStatus
 import com.few.api.repo.dao.subscription.record.CountAllSubscriptionStatusRecord
 import com.few.api.repo.dao.subscription.record.MemberWorkbookSubscriptionStatusRecord
+import com.few.api.repo.dao.subscription.record.SubscriptionSendStatusRecord
 import jooq.jooq_dsl.Tables.MAPPING_WORKBOOK_ARTICLE
 import jooq.jooq_dsl.Tables.SUBSCRIPTION
 import jooq.jooq_dsl.tables.MappingWorkbookArticle
@@ -17,6 +18,21 @@ import java.time.LocalDateTime
 class SubscriptionDao(
     private val dslContext: DSLContext,
 ) {
+    fun getLock(memberId: Long, workbookId: Long, timeout: Int = 5): Boolean {
+        return dslContext.fetch(
+            """
+            SELECT GET_LOCK(CONCAT('subscription_', $memberId, '_', $workbookId), $timeout);
+            """
+        ).into(Int::class.java).first() == 1
+    }
+
+    fun releaseLock(memberId: Long, workbookId: Long): Boolean {
+        return dslContext.fetch(
+            """
+            SELECT RELEASE_LOCK(CONCAT('subscription_', $memberId, '_', $workbookId));
+            """
+        ).into(Int::class.java).first() == 1
+    }
 
     fun insertWorkbookSubscription(command: InsertWorkbookSubscriptionCommand) {
         insertWorkbookSubscriptionCommand(command)
@@ -70,17 +86,19 @@ class SubscriptionDao(
             .orderBy(SUBSCRIPTION.CREATED_AT.desc())
             .limit(1)
 
-    fun selectAllInActiveWorkbookSubscriptionStatus(query: SelectAllMemberWorkbookInActiveSubscription): List<MemberWorkbookSubscriptionStatusRecord> {
+    fun selectAllInActiveWorkbookSubscriptionStatus(query: SelectAllMemberWorkbookInActiveSubscriptionQuery): List<MemberWorkbookSubscriptionStatusRecord> {
         return selectAllWorkbookInActiveSubscriptionStatusQuery(query)
             .fetchInto(MemberWorkbookSubscriptionStatusRecord::class.java)
     }
 
-    fun selectAllWorkbookInActiveSubscriptionStatusQuery(query: SelectAllMemberWorkbookInActiveSubscription) =
+    fun selectAllWorkbookInActiveSubscriptionStatusQuery(query: SelectAllMemberWorkbookInActiveSubscriptionQuery) =
         dslContext.select(
             SUBSCRIPTION.TARGET_WORKBOOK_ID.`as`(MemberWorkbookSubscriptionStatusRecord::workbookId.name),
             SUBSCRIPTION.DELETED_AT.isNull.`as`(MemberWorkbookSubscriptionStatusRecord::isActiveSub.name),
-            DSL.max(SUBSCRIPTION.PROGRESS).add(1).`as`(MemberWorkbookSubscriptionStatusRecord::currentDay.name),
-            DSL.max(MAPPING_WORKBOOK_ARTICLE.DAY_COL).`as`(MemberWorkbookSubscriptionStatusRecord::totalDay.name)
+            DSL.max(SUBSCRIPTION.PROGRESS).add(1)
+                .`as`(MemberWorkbookSubscriptionStatusRecord::currentDay.name),
+            DSL.max(MAPPING_WORKBOOK_ARTICLE.DAY_COL)
+                .`as`(MemberWorkbookSubscriptionStatusRecord::totalDay.name)
         )
             .from(SUBSCRIPTION)
             .join(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE)
@@ -89,14 +107,15 @@ class SubscriptionDao(
             .and(SUBSCRIPTION.TARGET_MEMBER_ID.isNull)
             .and(SUBSCRIPTION.UNSUBS_OPINION.eq(query.unsubOpinion))
             .groupBy(SUBSCRIPTION.TARGET_WORKBOOK_ID, SUBSCRIPTION.DELETED_AT)
+            .orderBy(SUBSCRIPTION.PROGRESS)
             .query
 
-    fun selectAllActiveWorkbookSubscriptionStatus(query: SelectAllMemberWorkbookActiveSubscription): List<MemberWorkbookSubscriptionStatusRecord> {
+    fun selectAllActiveWorkbookSubscriptionStatus(query: SelectAllMemberWorkbookActiveSubscriptionQuery): List<MemberWorkbookSubscriptionStatusRecord> {
         return selectAllWorkbookActiveSubscriptionStatusQuery(query)
             .fetchInto(MemberWorkbookSubscriptionStatusRecord::class.java)
     }
 
-    fun selectAllWorkbookActiveSubscriptionStatusQuery(query: SelectAllMemberWorkbookActiveSubscription) =
+    fun selectAllWorkbookActiveSubscriptionStatusQuery(query: SelectAllMemberWorkbookActiveSubscriptionQuery) =
         dslContext.select(
             SUBSCRIPTION.TARGET_WORKBOOK_ID.`as`(MemberWorkbookSubscriptionStatusRecord::workbookId.name),
             SUBSCRIPTION.DELETED_AT.isNull.`as`(MemberWorkbookSubscriptionStatusRecord::isActiveSub.name),
@@ -110,6 +129,7 @@ class SubscriptionDao(
             .and(SUBSCRIPTION.TARGET_MEMBER_ID.isNull)
             .and(SUBSCRIPTION.UNSUBS_OPINION.isNull)
             .groupBy(SUBSCRIPTION.TARGET_WORKBOOK_ID, SUBSCRIPTION.DELETED_AT)
+            .orderBy(SUBSCRIPTION.PROGRESS)
             .query
 
     fun updateDeletedAtInAllSubscription(command: UpdateDeletedAtInAllSubscriptionCommand) {
@@ -148,7 +168,7 @@ class SubscriptionDao(
      * key: workbookId
      * value: workbook 구독 전체 기록 수
      */
-    fun countAllWorkbookSubscription(query: CountAllWorkbooksSubscription): Map<Long, Int> {
+    fun countAllWorkbookSubscription(query: CountAllWorkbooksSubscriptionQuery): Map<Long, Int> {
         return countAllWorkbookSubscriptionQuery()
             .fetch()
             .intoMap(SUBSCRIPTION.TARGET_WORKBOOK_ID, DSL.count(SUBSCRIPTION.TARGET_WORKBOOK_ID))
@@ -185,4 +205,57 @@ class SubscriptionDao(
             .set(SUBSCRIPTION.UNSUBS_OPINION, command.opinion)
             .where(SUBSCRIPTION.MEMBER_ID.eq(command.memberId))
             .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.eq(command.workbookId))
+
+    fun selectAllSubscriptionSendStatus(query: SelectAllSubscriptionSendStatusQuery): List<SubscriptionSendStatusRecord> {
+        return selectAllSubscriptionSendStatusQuery(query)
+            .fetchInto(
+                SubscriptionSendStatusRecord::class.java
+            )
+    }
+
+    fun selectAllSubscriptionSendStatusQuery(query: SelectAllSubscriptionSendStatusQuery) =
+        dslContext.select(
+            SUBSCRIPTION.TARGET_WORKBOOK_ID.`as`(SubscriptionSendStatusRecord::workbookId.name),
+            SUBSCRIPTION.SEND_TIME.`as`(SubscriptionSendStatusRecord::sendTime.name),
+            SUBSCRIPTION.SEND_DAY.`as`(SubscriptionSendStatusRecord::sendDay.name)
+        )
+            .from(SUBSCRIPTION)
+            .where(SUBSCRIPTION.MEMBER_ID.eq(query.memberId))
+            .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.`in`(query.workbookIds))
+
+    fun selectAllActiveSubscriptionWorkbookIds(query: SelectAllActiveSubscriptionWorkbookIdsQuery): List<Long> {
+        return dslContext.select(SUBSCRIPTION.TARGET_WORKBOOK_ID)
+            .from(SUBSCRIPTION)
+            .where(SUBSCRIPTION.MEMBER_ID.eq(query.memberId))
+            .and(SUBSCRIPTION.DELETED_AT.isNull)
+            .fetchInto(Long::class.java)
+    }
+
+    data class SelectAllActiveSubscriptionWorkbookIdsQuery(
+        val memberId: Long,
+    )
+
+    fun bulkUpdateSubscriptionSendTime(command: BulkUpdateSubscriptionSendTimeCommand) {
+        bulkUpdateSubscriptionSendTimeCommand(command)
+            .execute()
+    }
+
+    fun bulkUpdateSubscriptionSendTimeCommand(command: BulkUpdateSubscriptionSendTimeCommand) =
+        dslContext.update(SUBSCRIPTION)
+            .set(SUBSCRIPTION.SEND_TIME, command.time)
+            .set(SUBSCRIPTION.MODIFIED_AT, LocalDateTime.now())
+            .where(SUBSCRIPTION.MEMBER_ID.eq(command.memberId))
+            .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.`in`(command.workbookIds))
+
+    fun bulkUpdateSubscriptionSendDay(command: BulkUpdateSubscriptionSendDayCommand) {
+        bulkUpdateSubscriptionSendDayCommand(command)
+            .execute()
+    }
+
+    fun bulkUpdateSubscriptionSendDayCommand(command: BulkUpdateSubscriptionSendDayCommand) =
+        dslContext.update(SUBSCRIPTION)
+            .set(SUBSCRIPTION.SEND_DAY, command.day)
+            .set(SUBSCRIPTION.MODIFIED_AT, LocalDateTime.now())
+            .where(SUBSCRIPTION.MEMBER_ID.eq(command.memberId))
+            .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.`in`(command.workbookIds))
 }

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/command/BulkUpdateSubscriptionSendDayCommand.kt

@@ -0,0 +1,7 @@
+package com.few.api.repo.dao.subscription.command
+
+data class BulkUpdateSubscriptionSendDayCommand(
+    val memberId: Long,
+    val day: String,
+    val workbookIds: List<Long>,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/command/BulkUpdateSubscriptionSendTimeCommand.kt

@@ -0,0 +1,9 @@
+package com.few.api.repo.dao.subscription.command
+
+import java.time.LocalTime
+
+data class BulkUpdateSubscriptionSendTimeCommand(
+    val memberId: Long,
+    val time: LocalTime,
+    val workbookIds: List<Long>,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/CountAllWorkbooksSubscription.kt → api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/CountAllWorkbooksSubscriptionQuery.kt

@@ -1,5 +1,5 @@
 package com.few.api.repo.dao.subscription.query
 
-data class CountAllWorkbooksSubscription(
+data class CountAllWorkbooksSubscriptionQuery(
     val workbookIds: List<Long>,
 )

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/SelectAllMemberWorkbookActiveSubscription.kt → api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/SelectAllMemberWorkbookActiveSubscriptionQuery.kt

@@ -3,6 +3,6 @@ package com.few.api.repo.dao.subscription.query
 /**
  * 멤버의 구독 중인 워크북 목록을 조회합니다.
  */
-data class SelectAllMemberWorkbookActiveSubscription(
+data class SelectAllMemberWorkbookActiveSubscriptionQuery(
     val memberId: Long,
 )

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/SelectAllMemberWorkbookInActiveSubscription.kt → api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/SelectAllMemberWorkbookInActiveSubscriptionQuery.kt

@@ -3,7 +3,7 @@ package com.few.api.repo.dao.subscription.query
 /**
  * 멤버의 구독 완료 워크북 목록을 조회합니다.
  */
-data class SelectAllMemberWorkbookInActiveSubscription(
+data class SelectAllMemberWorkbookInActiveSubscriptionQuery(
     val memberId: Long,
     val unsubOpinion: String = "receive.all",
 )

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/query/SelectAllSubscriptionSendStatusQuery.kt

@@ -0,0 +1,6 @@
+package com.few.api.repo.dao.subscription.query
+
+data class SelectAllSubscriptionSendStatusQuery(
+    val memberId: Long,
+    val workbookIds: List<Long>,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/record/SubscriptionSendStatusRecord.kt

@@ -0,0 +1,9 @@
+package com.few.api.repo.dao.subscription.record
+
+import java.time.LocalTime
+
+data class SubscriptionSendStatusRecord(
+    val workbookId: Long,
+    val sendTime: LocalTime,
+    val sendDay: String,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/workbook/WorkbookDao.kt

@@ -4,11 +4,13 @@ import com.few.api.repo.config.LocalCacheConfig
 import com.few.api.repo.config.LocalCacheConfig.Companion.LOCAL_CM
 import com.few.api.repo.dao.workbook.command.InsertWorkBookCommand
 import com.few.api.repo.dao.workbook.command.MapWorkBookToArticleCommand
-import com.few.api.repo.dao.workbook.query.BrowseWorkBookQueryWithSubscriptionCount
+import com.few.api.repo.dao.workbook.query.BrowseWorkBookQueryWithSubscriptionCountQuery
+import com.few.api.repo.dao.workbook.query.SelectAllWorkbookTitleQuery
 import com.few.api.repo.dao.workbook.query.SelectWorkBookLastArticleIdQuery
 import com.few.api.repo.dao.workbook.query.SelectWorkBookRecordQuery
 import com.few.api.repo.dao.workbook.record.SelectWorkBookRecord
 import com.few.api.repo.dao.workbook.record.SelectWorkBookRecordWithSubscriptionCount
+import com.few.api.repo.dao.workbook.record.WorkbookTitleRecord
 import com.few.data.common.code.CategoryType
 import jooq.jooq_dsl.tables.MappingWorkbookArticle
 import jooq.jooq_dsl.tables.Subscription
@@ -71,12 +73,12 @@ class WorkbookDao(
      * category에 따라서 조회된 구독자 수가 포함된 Workbook 목록을 반환한다.
      * 정렬 순서는 구독자 수가 많은 순서로, 구독자 수가 같다면 생성일자가 최신인 순서로 반환한다.
      */
-    fun browseWorkBookWithSubscriptionCount(query: BrowseWorkBookQueryWithSubscriptionCount): List<SelectWorkBookRecordWithSubscriptionCount> {
+    fun browseWorkBookWithSubscriptionCount(query: BrowseWorkBookQueryWithSubscriptionCountQuery): List<SelectWorkBookRecordWithSubscriptionCount> {
         return browseWorkBookQuery(query)
             .fetchInto(SelectWorkBookRecordWithSubscriptionCount::class.java)
     }
 
-    fun browseWorkBookQuery(query: BrowseWorkBookQueryWithSubscriptionCount) =
+    fun browseWorkBookQuery(query: BrowseWorkBookQueryWithSubscriptionCountQuery) =
         dslContext.select(
             Workbook.WORKBOOK.ID.`as`(SelectWorkBookRecordWithSubscriptionCount::id.name),
             Workbook.WORKBOOK.TITLE.`as`(SelectWorkBookRecordWithSubscriptionCount::title.name),
@@ -124,7 +126,7 @@ class WorkbookDao(
     /**
      * category에 따라서 조건을 생성한다.
      */
-    private fun browseWorkBookCategoryCondition(query: BrowseWorkBookQueryWithSubscriptionCount): Condition {
+    private fun browseWorkBookCategoryCondition(query: BrowseWorkBookQueryWithSubscriptionCountQuery): Condition {
         return when (query.category) {
             (-1).toByte() -> DSL.noCondition()
             else -> Workbook.WORKBOOK.CATEGORY_CD.eq(query.category)
@@ -144,4 +146,17 @@ class WorkbookDao(
             .where(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.WORKBOOK_ID.eq(query.workbookId))
             .and(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.DELETED_AT.isNull)
             .groupBy(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.WORKBOOK_ID)
+
+    fun selectAllWorkbookTitle(query: SelectAllWorkbookTitleQuery): List<WorkbookTitleRecord> {
+        return selectAllWorkbookTitleQuery(query)
+            .fetchInto(WorkbookTitleRecord::class.java)
+    }
+
+    fun selectAllWorkbookTitleQuery(query: SelectAllWorkbookTitleQuery) =
+        dslContext.select(
+            Workbook.WORKBOOK.ID.`as`(WorkbookTitleRecord::workbookId.name),
+            Workbook.WORKBOOK.TITLE.`as`(WorkbookTitleRecord::title.name)
+        )
+            .from(Workbook.WORKBOOK)
+            .where(Workbook.WORKBOOK.ID.`in`(query.workbookIds))
 }

api-repo/src/main/kotlin/com/few/api/repo/dao/workbook/query/BrowseWorkBookQueryWithSubscriptionCount.kt → api-repo/src/main/kotlin/com/few/api/repo/dao/workbook/query/BrowseWorkBookQueryWithSubscriptionCountQuery.kt

@@ -1,6 +1,6 @@
 package com.few.api.repo.dao.workbook.query
 
-data class BrowseWorkBookQueryWithSubscriptionCount(
+data class BrowseWorkBookQueryWithSubscriptionCountQuery(
     /**
      * @see com.few.api.web.support.WorkBookCategory
      */

api-repo/src/main/kotlin/com/few/api/repo/dao/workbook/query/SelectAllWorkbookTitleQuery.kt

@@ -0,0 +1,5 @@
+package com.few.api.repo.dao.workbook.query
+
+data class SelectAllWorkbookTitleQuery(
+    val workbookIds: List<Long>,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/workbook/record/WorkbookTitleRecord.kt

@@ -0,0 +1,6 @@
+package com.few.api.repo.dao.workbook.record
+
+data class WorkbookTitleRecord(
+    val workbookId: Long,
+    val title: String,
+)

api-repo/src/test/kotlin/com/few/api/repo/explain/subscription/SubscriptionDaoExplainGenerateTest.kt

@@ -2,10 +2,7 @@ package com.few.api.repo.explain.subscription
 
 import com.few.api.repo.dao.subscription.SubscriptionDao
 import com.few.api.repo.dao.subscription.command.*
-import com.few.api.repo.dao.subscription.query.CountWorkbookMappedArticlesQuery
-import com.few.api.repo.dao.subscription.query.SelectAllMemberWorkbookActiveSubscription
-import com.few.api.repo.dao.subscription.query.SelectAllWorkbookSubscriptionStatusNotConsiderDeletedAtQuery
-import com.few.api.repo.dao.subscription.query.SelectAllMemberWorkbookInActiveSubscription
+import com.few.api.repo.dao.subscription.query.*
 import com.few.api.repo.explain.ExplainGenerator
 import com.few.api.repo.explain.InsertUpdateExplainGenerator
 import com.few.api.repo.explain.ResultGenerator
@@ -63,7 +60,7 @@ class SubscriptionDaoExplainGenerateTest : JooqTestSpec() {
 
     @Test
     fun selectAllWorkbookInActiveSubscriptionStatusQueryExplain() {
-        val query = SelectAllMemberWorkbookInActiveSubscription(
+        val query = SelectAllMemberWorkbookInActiveSubscriptionQuery(
             memberId = 1L,
             unsubOpinion = "receive.all"
         ).let {
@@ -77,7 +74,7 @@ class SubscriptionDaoExplainGenerateTest : JooqTestSpec() {
 
     @Test
     fun selectAllWorkbookActiveSubscriptionStatusQueryExplain() {
-        val query = SelectAllMemberWorkbookActiveSubscription(
+        val query = SelectAllMemberWorkbookActiveSubscriptionQuery(
             memberId = 1L
         ).let {
             subscriptionDao.selectAllWorkbookActiveSubscriptionStatusQuery(it)
@@ -190,4 +187,18 @@ class SubscriptionDaoExplainGenerateTest : JooqTestSpec() {
 
         ResultGenerator.execute(command, explain, "updateLastArticleProgressCommandExplain")
     }
+
+    @Test
+    fun selectAllSubscriptionSendStatusQueryExplain() {
+        val query = subscriptionDao.selectAllSubscriptionSendStatusQuery(
+            SelectAllSubscriptionSendStatusQuery(
+                memberId = 1L,
+                workbookIds = listOf(1L)
+            )
+        )
+
+        val explain = ExplainGenerator.execute(dslContext, query)
+
+        ResultGenerator.execute(query, explain, "selectAllSubscriptionSendStatusQueryExplain")
+    }
 }

api-repo/src/test/kotlin/com/few/api/repo/explain/workbook/WorkbookDaoExplainGenerateTest.kt

@@ -3,7 +3,8 @@ package com.few.api.repo.explain.workbook
 import com.few.api.repo.dao.workbook.WorkbookDao
 import com.few.api.repo.dao.workbook.command.InsertWorkBookCommand
 import com.few.api.repo.dao.workbook.command.MapWorkBookToArticleCommand
-import com.few.api.repo.dao.workbook.query.BrowseWorkBookQueryWithSubscriptionCount
+import com.few.api.repo.dao.workbook.query.BrowseWorkBookQueryWithSubscriptionCountQuery
+import com.few.api.repo.dao.workbook.query.SelectAllWorkbookTitleQuery
 import com.few.api.repo.dao.workbook.query.SelectWorkBookLastArticleIdQuery
 import com.few.api.repo.dao.workbook.query.SelectWorkBookRecordQuery
 import com.few.api.repo.explain.ExplainGenerator
@@ -73,7 +74,7 @@ class WorkbookDaoExplainGenerateTest : JooqTestSpec() {
 
     @Test
     fun browseWorkBookQueryNoConditionQueryExplain() {
-        val query = BrowseWorkBookQueryWithSubscriptionCount(-1).let {
+        val query = BrowseWorkBookQueryWithSubscriptionCountQuery(-1).let {
             workbookDao.browseWorkBookQuery(it)
         }
 
@@ -84,7 +85,7 @@ class WorkbookDaoExplainGenerateTest : JooqTestSpec() {
 
     @Test
     fun browseWorkBookQueryCategoryConditionExplain() {
-        val query = BrowseWorkBookQueryWithSubscriptionCount(CategoryType.fromCode(0)!!.code).let {
+        val query = BrowseWorkBookQueryWithSubscriptionCountQuery(CategoryType.fromCode(0)!!.code).let {
             workbookDao.browseWorkBookQuery(it)
         }
 
@@ -118,4 +119,17 @@ class WorkbookDaoExplainGenerateTest : JooqTestSpec() {
 
         ResultGenerator.execute(query, explain, "selectWorkBookLastArticleIdQueryExplain")
     }
+
+    @Test
+    fun selectAllWorkbookTitleQueryExplain() {
+        val query = workbookDao.selectAllWorkbookTitleQuery(
+            SelectAllWorkbookTitleQuery(
+                listOf(1L)
+            )
+        )
+
+        val explain = ExplainGenerator.execute(dslContext, query)
+
+        ResultGenerator.execute(query, explain, "selectAllWorkbookTitleQueryExplain")
+    }
 }