[Feat/#215] article_view_his 테이블 추가 및 조회수 응답 추가

.gitignore

@@ -95,3 +95,10 @@ Footer
 *.log
 *.tmp
 
+# DB schema migration path (except data module)
+data/src/main/resources/**/*.sql
+api/**/*.sql
+api-repo/**/*.sql
+batch/**/*.sql
+email/**/*.sql
+storage/**/*.sql

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

@@ -0,0 +1,31 @@
+package com.few.api.repo.dao.article
+
+import com.few.api.repo.dao.article.command.ArticleViewHisCommand
+import com.few.api.repo.dao.article.query.ArticleViewHisCountQuery
+import jooq.jooq_dsl.tables.ArticleViewHis
+import org.jooq.DSLContext
+import org.springframework.stereotype.Repository
+
+@Repository
+class ArticleViewHisDao(
+    private val dslContext: DSLContext,
+) {
+
+    fun insertArticleViewHis(command: ArticleViewHisCommand) {
+        dslContext.insertInto(
+            ArticleViewHis.ARTICLE_VIEW_HIS,
+            ArticleViewHis.ARTICLE_VIEW_HIS.ARTICLE_MST_ID,
+            ArticleViewHis.ARTICLE_VIEW_HIS.MEMBER_ID
+        ).values(
+            command.articleId,
+            command.memberId
+        ).execute()
+    }
+
+    fun selectArticleViews(query: ArticleViewHisCountQuery): Long {
+        return dslContext.selectCount()
+            .from(ArticleViewHis.ARTICLE_VIEW_HIS)
+            .where(ArticleViewHis.ARTICLE_VIEW_HIS.ARTICLE_MST_ID.eq(query.articleId))
+            .fetchOne(0, Long::class.java) ?: 0L
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.few.api.repo.dao.article.command
+
+data class ArticleViewHisCommand(
+    val articleId: Long,
+    val memberId: Long,
+)

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

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

api/src/main/kotlin/com/few/api/domain/article/service/ArticleViewHisService.kt

@@ -0,0 +1,25 @@
+package com.few.api.domain.article.service
+
+import com.few.api.domain.article.service.dto.AddArticleViewHisInDto
+import com.few.api.domain.article.service.dto.ReadArticleViewsInDto
+import com.few.api.repo.dao.article.ArticleViewHisDao
+import com.few.api.repo.dao.article.command.ArticleViewHisCommand
+import com.few.api.repo.dao.article.query.ArticleViewHisCountQuery
+import org.springframework.stereotype.Service
+
+@Service
+class ArticleViewHisService(
+    private val articleViewHisDao: ArticleViewHisDao,
+) {
+    fun addArticleViewHis(inDto: AddArticleViewHisInDto) {
+        articleViewHisDao.insertArticleViewHis(
+            ArticleViewHisCommand(inDto.articleId, inDto.memberId)
+        )
+    }
+
+    fun readArticleViews(inDto: ReadArticleViewsInDto): Long {
+        return articleViewHisDao.selectArticleViews(
+            ArticleViewHisCountQuery(inDto.articleId)
+        )
+    }
+}

api/src/main/kotlin/com/few/api/domain/article/service/dto/AddArticleViewHisInDto.kt

@@ -0,0 +1,6 @@
+package com.few.api.domain.article.service.dto
+
+data class AddArticleViewHisInDto(
+    val articleId: Long,
+    val memberId: Long,
+)

api/src/main/kotlin/com/few/api/domain/article/service/dto/ReadArticleViewsInDto.kt

@@ -0,0 +1,5 @@
+package com.few.api.domain.article.service.dto
+
+data class ReadArticleViewsInDto(
+    val articleId: Long,
+)

api/src/main/kotlin/com/few/api/domain/article/usecase/ReadArticleUseCase.kt

@@ -1,11 +1,14 @@
 package com.few.api.domain.article.usecase
 
+import com.few.api.domain.article.service.ArticleViewHisService
 import com.few.api.domain.article.usecase.dto.ReadArticleUseCaseIn
 import com.few.api.domain.article.usecase.dto.ReadArticleUseCaseOut
 import com.few.api.domain.article.usecase.dto.WriterDetail
 import com.few.api.domain.article.service.BrowseArticleProblemsService
 import com.few.api.domain.article.service.ReadArticleWriterRecordService
+import com.few.api.domain.article.service.dto.AddArticleViewHisInDto
 import com.few.api.domain.article.service.dto.BrowseArticleProblemIdsInDto
+import com.few.api.domain.article.service.dto.ReadArticleViewsInDto
 import com.few.api.domain.article.service.dto.ReadWriterRecordInDto
 import com.few.api.exception.common.NotFoundException
 import com.few.api.repo.dao.article.ArticleDao
@@ -19,6 +22,7 @@ class ReadArticleUseCase(
     private val articleDao: ArticleDao,
     private val readArticleWriterRecordService: ReadArticleWriterRecordService,
     private val browseArticleProblemsService: BrowseArticleProblemsService,
+    private val articleViewHisService: ArticleViewHisService,
 ) {
 
     @Transactional(readOnly = true)
@@ -35,6 +39,9 @@ class ReadArticleUseCase(
             browseArticleProblemsService.execute(query)
         }
 
+        articleViewHisService.addArticleViewHis(AddArticleViewHisInDto(useCaseIn.articleId, useCaseIn.memberId))
+        val views = articleViewHisService.readArticleViews(ReadArticleViewsInDto(useCaseIn.articleId))
+
         return ReadArticleUseCaseOut(
             id = articleRecord.articleId,
             writer = WriterDetail(
@@ -46,7 +53,8 @@ class ReadArticleUseCase(
             content = articleRecord.content,
             problemIds = problemIds.problemIds,
             category = CategoryType.convertToDisplayName(articleRecord.category),
-            createdAt = articleRecord.createdAt
+            createdAt = articleRecord.createdAt,
+            views = views
         )
     }
 }

api/src/main/kotlin/com/few/api/domain/article/usecase/dto/ReadArticleUseCaseIn.kt

@@ -2,4 +2,5 @@ package com.few.api.domain.article.usecase.dto
 
 data class ReadArticleUseCaseIn(
     val articleId: Long,
+    val memberId: Long,
 )

api/src/main/kotlin/com/few/api/domain/article/usecase/dto/ReadArticleUseCaseOut.kt

@@ -11,6 +11,7 @@ data class ReadArticleUseCaseOut(
     val problemIds: List<Long>,
     val category: String,
     val createdAt: LocalDateTime,
+    val views: Long,
 )
 
 data class WriterDetail(

api/src/main/kotlin/com/few/api/web/controller/article/ArticleController.kt

@@ -27,7 +27,7 @@ class ArticleController(
         @Min(value = 1, message = "{min.id}")
         articleId: Long,
     ): ApiResponse<ApiResponse.SuccessBody<ReadArticleResponse>> {
-        val useCaseOut = ReadArticleUseCaseIn(articleId).let { useCaseIn: ReadArticleUseCaseIn ->
+        val useCaseOut = ReadArticleUseCaseIn(articleId = articleId, memberId = 1L).let { useCaseIn: ReadArticleUseCaseIn ->
             readArticleUseCase.execute(useCaseIn)
         }
 

api/src/test/kotlin/com/few/api/domain/article/usecase/ReadArticleUseCaseTest.kt

@@ -1,5 +1,6 @@
 package com.few.api.domain.article.usecase
 
+import com.few.api.domain.article.service.ArticleViewHisService
 import com.few.api.domain.article.service.BrowseArticleProblemsService
 import com.few.api.domain.article.service.ReadArticleWriterRecordService
 import com.few.api.domain.article.service.dto.BrowseArticleProblemsOutDto
@@ -9,9 +10,7 @@ import com.few.api.repo.dao.article.ArticleDao
 import com.few.api.repo.dao.article.record.SelectArticleRecord
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.BehaviorSpec
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.verify
+import io.mockk.*
 
 import java.net.URL
 import java.time.LocalDateTime
@@ -22,13 +21,20 @@ class ReadArticleUseCaseTest : BehaviorSpec({
     lateinit var readArticleWriterRecordService: ReadArticleWriterRecordService
     lateinit var browseArticleProblemsService: BrowseArticleProblemsService
     lateinit var useCase: ReadArticleUseCase
-    val useCaseIn = ReadArticleUseCaseIn(articleId = 1L)
+    lateinit var articleViewHisService: ArticleViewHisService
+    val useCaseIn = ReadArticleUseCaseIn(articleId = 1L, memberId = 1L)
 
     beforeContainer {
         articleDao = mockk<ArticleDao>()
         readArticleWriterRecordService = mockk<ReadArticleWriterRecordService>()
         browseArticleProblemsService = mockk<BrowseArticleProblemsService>()
-        useCase = ReadArticleUseCase(articleDao, readArticleWriterRecordService, browseArticleProblemsService)
+        articleViewHisService = mockk<ArticleViewHisService>()
+        useCase = ReadArticleUseCase(
+            articleDao,
+            readArticleWriterRecordService,
+            browseArticleProblemsService,
+            articleViewHisService
+        )
     }
 
     given("아티클 조회 요청이 온 상황에서") {
@@ -52,6 +58,8 @@ class ReadArticleUseCaseTest : BehaviorSpec({
             every { articleDao.selectArticleRecord(any()) } returns record
             every { readArticleWriterRecordService.execute(any()) } returns writerSvcOutDto
             every { browseArticleProblemsService.execute(any()) } returns probSvcOutDto
+            every { articleViewHisService.addArticleViewHis(any()) } just Runs
+            every { articleViewHisService.readArticleViews(any()) } returns 1L
 
             then("아티클이 정상 조회된다") {
                 useCase.execute(useCaseIn)

api/src/test/kotlin/com/few/api/web/controller/article/ArticleControllerTest.kt

@@ -69,7 +69,8 @@ class ArticleControllerTest : ControllerTestSpec() {
         val uri = UriComponentsBuilder.newInstance().path("$BASE_URL/{articleId}").build().toUriString()
         // set usecase mock
         val articleId = 1L
-        `when`(readArticleUseCase.execute(ReadArticleUseCaseIn(articleId))).thenReturn(
+        val memberId = 1L
+        `when`(readArticleUseCase.execute(ReadArticleUseCaseIn(articleId, memberId))).thenReturn(
             ReadArticleUseCaseOut(
                 id = 1L,
                 writer = WriterDetail(
@@ -81,7 +82,8 @@ class ArticleControllerTest : ControllerTestSpec() {
                 content = CategoryType.fromCode(0)!!.name,
                 problemIds = listOf(1L, 2L, 3L),
                 category = "경제",
-                createdAt = LocalDateTime.now()
+                createdAt = LocalDateTime.now(),
+                views = 1L
             )
         )
 
@@ -119,7 +121,9 @@ class ArticleControllerTest : ControllerTestSpec() {
                                         PayloadDocumentation.fieldWithPath("data.category")
                                             .fieldWithString("아티클 카테고리"),
                                         PayloadDocumentation.fieldWithPath("data.createdAt")
-                                            .fieldWithString("아티클 생성일")
+                                            .fieldWithString("아티클 생성일"),
+                                        PayloadDocumentation.fieldWithPath("data.views")
+                                            .fieldWithString("아티클 조회수")
                                     )
                                 )
                             ).build()

data/db/migration/entity/V1.00.0.7__article_view_his_table.sql

@@ -0,0 +1,10 @@
+-- 아티클 조회수 저장 테이블
+CREATE TABLE ARTICLE_VIEW_HIS
+(
+    id             BIGINT    NOT NULL AUTO_INCREMENT,
+    article_mst_id BIGINT    NOT NULL,
+    member_id      BIGINT    NOT NULL,
+    created_at     TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    deleted_at     TIMESTAMP NULL DEFAULT NULL,
+    PRIMARY KEY (id)
+);