[RELEASE] v24.08.28.01

api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleDao.kt

@@ -3,18 +3,15 @@ package com.few.api.repo.dao.article
 import com.few.api.repo.config.LocalCacheConfig.Companion.LOCAL_CM
 import com.few.api.repo.config.LocalCacheConfig.Companion.SELECT_ARTICLE_RECORD_CACHE
 import com.few.api.repo.dao.article.command.InsertFullArticleRecordCommand
-import com.few.api.repo.dao.article.query.SelectArticleIdByWorkbookIdAndDayQuery
-import com.few.api.repo.dao.article.query.SelectArticleRecordQuery
-import com.few.api.repo.dao.article.query.SelectWorkBookArticleRecordQuery
-import com.few.api.repo.dao.article.query.SelectWorkbookMappedArticleRecordsQuery
-import com.few.api.repo.dao.article.record.SelectArticleContentsRecord
-import com.few.api.repo.dao.article.record.SelectArticleRecord
-import com.few.api.repo.dao.article.record.SelectWorkBookArticleRecord
-import com.few.api.repo.dao.article.record.SelectWorkBookMappedArticleRecord
+import com.few.api.repo.dao.article.query.*
+import com.few.api.repo.dao.article.record.*
+import com.few.data.common.code.MemberType
 import jooq.jooq_dsl.tables.ArticleIfo
 import jooq.jooq_dsl.tables.ArticleMst
 import jooq.jooq_dsl.tables.MappingWorkbookArticle
+import jooq.jooq_dsl.tables.Member
 import org.jooq.*
+import org.jooq.impl.DSL
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Repository
 
@@ -139,4 +136,31 @@ class ArticleDao(
     ).from(ArticleIfo.ARTICLE_IFO)
         .where(ArticleIfo.ARTICLE_IFO.ARTICLE_MST_ID.`in`(articleIds))
         .and(ArticleIfo.ARTICLE_IFO.DELETED_AT.isNull)
+
+    fun selectArticleContent(query: SelectArticleContentQuery): ArticleContentRecord? {
+        return selectArticleContentQuery(query)
+            .fetchOneInto(ArticleContentRecord::class.java)
+    }
+
+    fun selectArticleContentQuery(query: SelectArticleContentQuery) =
+        dslContext.select(
+            ArticleIfo.ARTICLE_IFO.ARTICLE_MST_ID.`as`(ArticleContentRecord::id.name),
+            ArticleIfo.ARTICLE_IFO.CONTENT.`as`(ArticleContentRecord::articleContent.name),
+            ArticleMst.ARTICLE_MST.TITLE.`as`(ArticleContentRecord::articleTitle.name),
+            ArticleMst.ARTICLE_MST.CATEGORY_CD.`as`(ArticleContentRecord::category.name),
+            DSL.jsonGetAttributeAsText(Member.MEMBER.DESCRIPTION, "name")
+                .`as`(ArticleContentRecord::writerName.name),
+            DSL.jsonGetAttribute(Member.MEMBER.DESCRIPTION, "url")
+                .`as`(ArticleContentRecord::writerLink.name)
+        )
+            .from(ArticleIfo.ARTICLE_IFO)
+            .join(ArticleMst.ARTICLE_MST)
+            .on(ArticleIfo.ARTICLE_IFO.ARTICLE_MST_ID.eq(ArticleMst.ARTICLE_MST.ID))
+            .join(Member.MEMBER)
+            .on(
+                ArticleMst.ARTICLE_MST.MEMBER_ID.eq(Member.MEMBER.ID)
+                    .and(Member.MEMBER.TYPE_CD.eq(MemberType.WRITER.code))
+            )
+            .where(ArticleIfo.ARTICLE_IFO.ARTICLE_MST_ID.eq(query.articleId))
+            .and(ArticleIfo.ARTICLE_IFO.DELETED_AT.isNull)
 }

api-repo/src/main/kotlin/com/few/api/repo/dao/article/query/SelectArticleContentQuery.kt

@@ -0,0 +1,5 @@
+package com.few.api.repo.dao.article.query
+
+data class SelectArticleContentQuery(
+    val articleId: Long,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/article/record/ArticleContentRecord.kt

@@ -0,0 +1,12 @@
+package com.few.api.repo.dao.article.record
+
+import java.net.URL
+
+data class ArticleContentRecord(
+    val id: Long,
+    val category: String,
+    val articleTitle: String,
+    val articleContent: String,
+    val writerName: String,
+    val writerLink: URL,
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/member/MemberDao.kt

@@ -4,13 +4,9 @@ import com.few.api.repo.config.LocalCacheConfig.Companion.LOCAL_CM
 import com.few.api.repo.config.LocalCacheConfig.Companion.SELECT_WRITER_CACHE
 import com.few.api.repo.dao.member.command.DeleteMemberCommand
 import com.few.api.repo.dao.member.command.InsertMemberCommand
-import com.few.api.repo.dao.member.query.BrowseWorkbookWritersQuery
 import com.few.api.repo.dao.member.command.UpdateDeletedMemberTypeCommand
 import com.few.api.repo.dao.member.command.UpdateMemberTypeCommand
-import com.few.api.repo.dao.member.query.SelectMemberByEmailNotConsiderDeletedAtQuery
-import com.few.api.repo.dao.member.query.SelectMemberByEmailQuery
-import com.few.api.repo.dao.member.query.SelectWriterQuery
-import com.few.api.repo.dao.member.query.SelectWritersQuery
+import com.few.api.repo.dao.member.query.*
 import com.few.api.repo.dao.member.record.MemberIdAndIsDeletedRecord
 import com.few.api.repo.dao.member.record.MemberRecord
 import com.few.api.repo.dao.member.record.MemberEmailAndTypeRecord
@@ -171,6 +167,17 @@ class MemberDao(
             .set(Member.MEMBER.EMAIL, command.email)
             .set(Member.MEMBER.TYPE_CD, command.memberType.code)
 
+    fun selectMemberEmail(query: SelectMemberEmailQuery): String? {
+        return selectMemberEmailQuery(query)
+            .fetchOne()
+            ?.value1()
+    }
+
+    fun selectMemberEmailQuery(query: SelectMemberEmailQuery) = dslContext.select(Member.MEMBER.EMAIL)
+        .from(Member.MEMBER)
+        .where(Member.MEMBER.ID.eq(query.memberId))
+        .and(Member.MEMBER.DELETED_AT.isNull)
+
     fun selectMemberEmailAndType(memberId: Long): MemberEmailAndTypeRecord? {
         return selectMemberIdAndTypeQuery(memberId)
             .fetchOne()

api-repo/src/main/kotlin/com/few/api/repo/dao/member/query/SelectMemberEmailQuery.kt

@@ -0,0 +1,5 @@
+package com.few.api.repo.dao.member.query
+
+data class SelectMemberEmailQuery(
+    val memberId: Long,
+)

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

@@ -1,8 +1,6 @@
 package com.few.api.repo.dao.subscription
 
-import com.few.api.repo.dao.subscription.command.InsertWorkbookSubscriptionCommand
-import com.few.api.repo.dao.subscription.command.UpdateDeletedAtInAllSubscriptionCommand
-import com.few.api.repo.dao.subscription.command.UpdateDeletedAtInWorkbookSubscriptionCommand
+import com.few.api.repo.dao.subscription.command.*
 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
@@ -163,4 +161,28 @@ class SubscriptionDao(
         .from(SUBSCRIPTION)
         .groupBy(SUBSCRIPTION.TARGET_WORKBOOK_ID)
         .query
+
+    fun updateArticleProgress(command: UpdateArticleProgressCommand) {
+        updateArticleProgressCommand(command)
+            .execute()
+    }
+
+    fun updateArticleProgressCommand(
+        command: UpdateArticleProgressCommand,
+    ) = dslContext.update(SUBSCRIPTION)
+        .set(SUBSCRIPTION.PROGRESS, SUBSCRIPTION.PROGRESS.add(1))
+        .where(SUBSCRIPTION.MEMBER_ID.eq(command.memberId))
+        .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.eq(command.workbookId))
+
+    fun updateLastArticleProgress(command: UpdateLastArticleProgressCommand) {
+        updateLastArticleProgressCommand(command)
+            .execute()
+    }
+
+    fun updateLastArticleProgressCommand(command: UpdateLastArticleProgressCommand) =
+        dslContext.update(SUBSCRIPTION)
+            .set(SUBSCRIPTION.DELETED_AT, LocalDateTime.now())
+            .set(SUBSCRIPTION.UNSUBS_OPINION, command.opinion)
+            .where(SUBSCRIPTION.MEMBER_ID.eq(command.memberId))
+            .and(SUBSCRIPTION.TARGET_WORKBOOK_ID.eq(command.workbookId))
 }

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

@@ -0,0 +1,6 @@
+package com.few.api.repo.dao.subscription.command
+
+data class UpdateArticleProgressCommand(
+    val memberId: Long,
+    val workbookId: Long,
+)

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

@@ -0,0 +1,7 @@
+package com.few.api.repo.dao.subscription.command
+
+data class UpdateLastArticleProgressCommand(
+    val memberId: Long,
+    val workbookId: Long,
+    val opinion: String = "receive.all",
+)

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

@@ -5,6 +5,7 @@ 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.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
@@ -129,4 +130,18 @@ class WorkbookDao(
             else -> Workbook.WORKBOOK.CATEGORY_CD.eq(query.category)
         }
     }
+
+    fun selectWorkBookLastArticleId(query: SelectWorkBookLastArticleIdQuery): Long? {
+        return selectWorkBookLastArticleIdQuery(query)
+            .fetchOneInto(Long::class.java)
+    }
+
+    fun selectWorkBookLastArticleIdQuery(query: SelectWorkBookLastArticleIdQuery) =
+        dslContext.select(
+            DSL.max(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.DAY_COL)
+        )
+            .from(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE)
+            .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)
 }

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

@@ -0,0 +1,5 @@
+package com.few.api.repo.dao.workbook.query
+
+data class SelectWorkBookLastArticleIdQuery(
+    val workbookId: Long,
+)

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

@@ -0,0 +1,78 @@
+package com.few.api.repo.explain
+
+import org.jooq.DSLContext
+import org.jooq.Query
+
+class ExplainGenerator {
+    companion object {
+        /**
+         * Execute EXPLAIN and EXPLAIN ANALYZE FORMAT=TREE
+         */
+        fun execute(dslContext: DSLContext, query: Query): String {
+            val sql = query.sql
+            val values = query.bindValues
+            mapSqlAndValues(sql, values).let {
+                val explain = StringBuilder()
+                explain.append("EXPLAIN $it\n")
+                explain.append("\n")
+                dslContext.fetch("EXPLAIN $it").let {
+                    explain.append(it)
+                }
+                explain.append("\n\n")
+                explain.append("EXPLAIN ANALYZE FORMAT=TREE $it\n")
+                explain.append("\n")
+                dslContext.fetch("EXPLAIN ANALYZE FORMAT=TREE $it").let {
+                    it.forEach { record ->
+                        explain.append(record[0].toString())
+                    }
+                }
+                return explain.toString()
+            }
+        }
+
+        /**
+         * Execute EXPLAIN
+         */
+        fun explain(dslContext: DSLContext, query: Query): String {
+            val sql = query.sql
+            val values = query.bindValues
+            mapSqlAndValues(sql, values).let {
+                val explain = StringBuilder()
+                explain.append("EXPLAIN $it\n")
+                explain.append("\n")
+                dslContext.fetch("EXPLAIN $it").let {
+                    explain.append(it)
+                }
+                return explain.toString()
+            }
+        }
+
+        /**
+         * Execute EXPLAIN ANALYZE FORMAT=TREE
+         */
+        fun analyzeFormatTree(dslContext: DSLContext, query: Query): String {
+            val sql = query.sql
+            val values = query.bindValues
+            mapSqlAndValues(sql, values).let {
+                val explain = StringBuilder()
+                explain.append("EXPLAIN ANALYZE FORMAT=TREE $it\n")
+                explain.append("\n")
+                dslContext.fetch("EXPLAIN ANALYZE FORMAT=TREE $it").let {
+                    it.forEach { record ->
+                        explain.append(record[0].toString())
+                    }
+                }
+                return explain.toString()
+            }
+        }
+
+        private fun mapSqlAndValues(sql: String, values: List<Any>) =
+            values.foldIndexed(sql) { index, acc, value ->
+                if (value is String) {
+                    acc.replaceFirst("?", "'$value'")
+                } else {
+                    acc.replaceFirst("?", "$value")
+                }
+            }
+    }
+}

api-repo/src/test/kotlin/com/few/api/repo/explain/article/ArticleDaoExplainGenerateTest.kt

@@ -6,6 +6,7 @@ import com.few.api.repo.dao.article.query.SelectArticleIdByWorkbookIdAndDayQuery
 import com.few.api.repo.dao.article.query.SelectArticleRecordQuery
 import com.few.api.repo.dao.article.query.SelectWorkBookArticleRecordQuery
 import com.few.api.repo.dao.article.query.SelectWorkbookMappedArticleRecordsQuery
+import com.few.api.repo.explain.ExplainGenerator
 import com.few.api.repo.explain.InsertUpdateExplainGenerator
 import com.few.api.repo.explain.ResultGenerator
 import com.few.api.repo.jooq.JooqTestSpec
@@ -63,7 +64,7 @@ class ArticleDaoExplainGenerateTest : JooqTestSpec() {
             articleDao.selectArticleRecordQuery(it)
         }
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
 
         ResultGenerator.execute(query, explain, "selectArticleRecordQueryExplain")
     }
@@ -74,7 +75,7 @@ class ArticleDaoExplainGenerateTest : JooqTestSpec() {
             articleDao.selectWorkBookArticleRecordQuery(it)
         }
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
 
         ResultGenerator.execute(query, explain, "selectWorkBookArticleRecordQueryExplain")
     }
@@ -85,7 +86,7 @@ class ArticleDaoExplainGenerateTest : JooqTestSpec() {
             articleDao.selectWorkbookMappedArticleRecordsQuery(it)
         }
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
 
         ResultGenerator.execute(query, explain, "selectWorkbookMappedArticleRecordsQueryExplain")
     }
@@ -130,7 +131,7 @@ class ArticleDaoExplainGenerateTest : JooqTestSpec() {
             articleDao.selectArticleIdByWorkbookIdAndDayQuery(it)
         }
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
 
         ResultGenerator.execute(query, explain, "selectArticleIdByWorkbookIdAndDayQueryExplain")
     }
@@ -141,7 +142,7 @@ class ArticleDaoExplainGenerateTest : JooqTestSpec() {
             articleDao.selectArticleContentsQuery(it)
         }
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
 
         ResultGenerator.execute(query, explain, "selectArticleContentsQueryExplain")
     }

api-repo/src/test/kotlin/com/few/api/repo/explain/article/ArticleMainCardDaoExplainGenerateTest.kt

@@ -4,6 +4,8 @@ import com.few.api.repo.dao.article.ArticleMainCardDao
 import com.few.api.repo.dao.article.command.ArticleMainCardExcludeWorkbookCommand
 import com.few.api.repo.dao.article.command.UpdateArticleMainCardWorkbookCommand
 import com.few.api.repo.dao.article.command.WorkbookCommand
+import com.few.api.repo.explain.ExplainGenerator
+import com.few.api.repo.explain.InsertUpdateExplainGenerator
 import com.few.api.repo.explain.ResultGenerator
 import com.few.api.repo.jooq.JooqTestSpec
 import com.few.data.common.code.CategoryType
@@ -59,7 +61,7 @@ class ArticleMainCardDaoExplainGenerateTest : JooqTestSpec() {
     fun selectArticleMainCardsRecordQueryExplain() {
         val query = articleMainCardDao.selectArticleMainCardsRecordQuery(setOf(1L))
 
-        val explain = dslContext.explain(query).toString()
+        val explain = ExplainGenerator.execute(dslContext, query)
         ResultGenerator.execute(query, explain, "selectArticleMainCardsRecordQueryExplain")
     }
 
@@ -80,7 +82,7 @@ class ArticleMainCardDaoExplainGenerateTest : JooqTestSpec() {
             articleMainCardDao.insertArticleMainCardCommand(it)
         }
 
-        val explain = command.toString()
+        val explain = InsertUpdateExplainGenerator.execute(dslContext, command.sql, command.bindValues)
 
         ResultGenerator.execute(command, explain, "insertArticleMainCardCommandExplain")
     }
@@ -103,7 +105,7 @@ class ArticleMainCardDaoExplainGenerateTest : JooqTestSpec() {
             articleMainCardDao.updateArticleMainCardSetWorkbookCommand(it)
         }
 
-        val explain = command.toString()
+        val explain = InsertUpdateExplainGenerator.execute(dslContext, command.sql, command.bindValues)
 
         ResultGenerator.execute(command, explain, "updateArticleMainCardSetWorkbookCommandExplain")
     }