Merge pull request #11 from gloddy-dev/feat/#7

[Feat]: Article 조회(단건, 페이징) API 설계

bootstrap/src/main/resources/application.yml

@@ -5,3 +5,4 @@ spring:
   config:
     import:
       - application-persistence.yml
+      - application-internal.yml

community-application/src/main/kotlin/gloddy/article/port/in/ArticleCommandUseCase.kt

@@ -1,10 +1,10 @@
 package gloddy.article.port.`in`
 
-import gloddy.article.dto.command.ArticleCreateCommand
-import gloddy.article.dto.read.ArticleIdReadData
+import gloddy.article.port.`in`.dto.command.ArticleCreateRequest
+import gloddy.article.port.`in`.dto.read.ArticleCreateResponse
 
 interface ArticleCommandUseCase {
-    fun create(userId: Long, command: ArticleCreateCommand): ArticleIdReadData
+    fun create(userId: Long, command: ArticleCreateRequest): ArticleCreateResponse
     fun delete(userId: Long, articleId: Long)
-    fun like(userId: Long, articleId: Long)
+    fun upsertLike(userId: Long, articleId: Long)
 }

community-application/src/main/kotlin/gloddy/article/port/in/ArticleOrder.kt

@@ -0,0 +1,7 @@
+package gloddy.article.port.`in`
+
+enum class ArticleOrder(
+    val value: String
+) {
+    LATEST("최신순")
+}

community-application/src/main/kotlin/gloddy/article/port/in/ArticleQueryUseCase.kt

@@ -0,0 +1,11 @@
+package gloddy.article.port.`in`
+
+import gloddy.article.port.`in`.dto.command.ArticleDetailGetRequest
+import gloddy.article.port.`in`.dto.command.ArticleDetailPageGetRequest
+import gloddy.article.port.`in`.dto.read.ArticleDetailResponse
+import gloddy.core.dto.PageResponse
+
+interface ArticleQueryUseCase {
+    fun getArticleDetailPage(request: ArticleDetailPageGetRequest): PageResponse<ArticleDetailResponse>
+    fun getArticleDetail(request: ArticleDetailGetRequest): ArticleDetailResponse
+}

community-application/src/main/kotlin/gloddy/article/dto/command/ArticleCreateCommand.kt → community-application/src/main/kotlin/gloddy/article/port/in/dto/command/ArticleCreateRequest.kt

@@ -1,6 +1,6 @@
-package gloddy.article.dto.command
+package gloddy.article.port.`in`.dto.command
 
-data class ArticleCreateCommand(
+data class ArticleCreateRequest(
     val categoryId: Long,
     val title: String,
     val content: String,

community-application/src/main/kotlin/gloddy/article/port/in/dto/command/ArticleDetailGetRequest.kt

@@ -0,0 +1,6 @@
+package gloddy.article.port.`in`.dto.command
+
+data class ArticleDetailGetRequest(
+    val id: Long,
+    val userId: Long
+)

community-application/src/main/kotlin/gloddy/article/port/in/dto/command/ArticleDetailPageGetRequest.kt

@@ -0,0 +1,11 @@
+package gloddy.article.port.`in`.dto.command
+
+import gloddy.article.port.`in`.ArticleOrder
+
+data class ArticleDetailPageGetRequest(
+    val categoryId: Long?,
+    val userId: Long,
+    val size: Int,
+    val page: Int,
+    val order: ArticleOrder
+)

community-application/src/main/kotlin/gloddy/article/port/in/dto/read/ArticleCreateResponse.kt

@@ -0,0 +1,5 @@
+package gloddy.article.port.`in`.dto.read
+
+data class ArticleCreateResponse(
+    val articleId: Long
+)

community-application/src/main/kotlin/gloddy/article/port/in/dto/read/ArticleDetailResponse.kt

@@ -0,0 +1,8 @@
+package gloddy.article.port.`in`.dto.read
+
+import gloddy.user.port.`in`.dto.UserPreviewUnit
+
+data class ArticleDetailResponse(
+    val article: ArticleDetailUnit,
+    val writer: UserPreviewUnit
+)

community-application/src/main/kotlin/gloddy/article/port/in/dto/read/ArticleDetailUnit.kt

@@ -0,0 +1,18 @@
+package gloddy.article.port.`in`.dto.read
+
+import gloddy.category.port.`in`.dto.CategoryGetResponse
+
+data class ArticleDetailUnit(
+    val id: Long,
+    val userId: Long,
+    val isWriter: Boolean,
+    val isLiked: Boolean,
+    val category: CategoryGetResponse,
+    val title: String,
+    val content: String,
+    val thumbnail: String?,
+    val images: List<String>?,
+    val likeCount: Int,
+    val commentCount: Int,
+    val createdAt: String
+)

community-application/src/main/kotlin/gloddy/article/port/out/ArticleCommandPersistencePort.kt

@@ -1,8 +1,10 @@
 package gloddy.article.port.out
 
 import gloddy.article.Article
+import gloddy.article.ArticleLike
 
 interface ArticleCommandPersistencePort {
     fun save(article: Article) : Article
     fun delete(id: Long)
+    fun upsertLike(articleLike: ArticleLike, article: Article)
 }

community-application/src/main/kotlin/gloddy/article/port/out/ArticleQueryPersistencePort.kt

@@ -1,7 +1,23 @@
 package gloddy.article.port.out
 
 import gloddy.article.Article
+import gloddy.article.port.`in`.dto.read.ArticleDetailUnit
+import gloddy.article.port.`in`.ArticleOrder
+import gloddy.core.dto.PageResponse
 
 interface ArticleQueryPersistencePort {
     fun findById(id: Long): Article
+
+    fun findArticleDetailUnitPageByCategoryId(
+        categoryId: Long? = null,
+        userId: Long,
+        size: Int,
+        page: Int,
+        order: ArticleOrder,
+    ): PageResponse<ArticleDetailUnit>
+
+    fun findArticleDetailUnitById(
+        id: Long,
+        userId: Long
+    ): ArticleDetailUnit
 }

community-application/src/main/kotlin/gloddy/article/service/ArticleCommandService.kt

@@ -2,8 +2,8 @@ package gloddy.article.service
 
 import gloddy.article.Article
 import gloddy.article.ArticleLike
-import gloddy.article.dto.command.ArticleCreateCommand
-import gloddy.article.dto.read.ArticleIdReadData
+import gloddy.article.port.`in`.dto.command.ArticleCreateRequest
+import gloddy.article.port.`in`.dto.read.ArticleCreateResponse
 import gloddy.article.port.`in`.ArticleCommandUseCase
 import gloddy.article.port.out.ArticleCommandPersistencePort
 import gloddy.article.port.out.ArticleLikeCommandPersistencePort
@@ -20,10 +20,10 @@ class ArticleCommandService(
     private val articleQueryPersistencePort: ArticleQueryPersistencePort,
     private val articleCommandPersistencePort: ArticleCommandPersistencePort,
     private val articleLikeCommandPersistencePort: ArticleLikeCommandPersistencePort,
-    private val articleLikeQueryPersistencePort: ArticleLikeQueryPersistencePort
+    private val articleLikeQueryPersistencePort: ArticleLikeQueryPersistencePort,
 ) : ArticleCommandUseCase {
 
-    override fun create(userId: Long, command: ArticleCreateCommand) : ArticleIdReadData {
+    override fun create(userId: Long, command: ArticleCreateRequest): ArticleCreateResponse {
 
         val category = categoryQueryPersistencePort.findById(CategoryId(command.categoryId))
 
@@ -34,7 +34,7 @@ class ArticleCommandService(
             content = command.content,
             images = command.images,
         ).let { articleCommandPersistencePort.save(it) }
-        return ArticleIdReadData(articleId = article.id!!.value)
+        return ArticleCreateResponse(articleId = article.id!!.value)
     }
 
     override fun delete(userId: Long, articleId: Long) {
@@ -43,17 +43,21 @@ class ArticleCommandService(
         articleCommandPersistencePort.delete(article.id!!.value)
     }
 
-    override fun like(userId: Long, articleId: Long) {
-
+    override fun upsertLike(userId: Long, articleId: Long) {
         val article = articleQueryPersistencePort.findById(articleId)
-
         articleLikeQueryPersistencePort.findByUserIdAndArticleOrNull(userId, article)
-            ?.run { articleLikeCommandPersistencePort.delete(this) }
-            ?: articleLikeCommandPersistencePort.save(
-                ArticleLike(
+            ?.run {
+                articleCommandPersistencePort.upsertLike(
+                    articleLike = this,
+                    article = article.unlike()
+                )
+            }
+            ?: articleCommandPersistencePort.upsertLike(
+                articleLike = ArticleLike(
                     userId = UserId(userId),
                     article = article
-                )
+                ),
+                article = article.like()
             )
     }
 }

community-application/src/main/kotlin/gloddy/article/service/ArticleQueryService.kt

@@ -0,0 +1,57 @@
+package gloddy.article.service
+
+import gloddy.article.port.`in`.ArticleQueryUseCase
+import gloddy.article.port.`in`.dto.command.ArticleDetailGetRequest
+import gloddy.article.port.`in`.dto.command.ArticleDetailPageGetRequest
+import gloddy.article.port.`in`.dto.read.ArticleDetailResponse
+import gloddy.article.port.out.ArticleQueryPersistencePort
+import gloddy.core.dto.PageResponse
+import gloddy.user.port.out.UserQueryPort
+import org.springframework.stereotype.Service
+
+@Service
+class ArticleQueryService(
+    private val userQueryPort: UserQueryPort,
+    private val articleQueryPersistencePort: ArticleQueryPersistencePort,
+) : ArticleQueryUseCase {
+
+    override fun getArticleDetailPage(request: ArticleDetailPageGetRequest): PageResponse<ArticleDetailResponse> {
+        val articleDetailUnitPage = articleQueryPersistencePort.findArticleDetailUnitPageByCategoryId(
+            categoryId = request.categoryId,
+            userId = request.userId,
+            size = request.size,
+            page = request.page,
+            order = request.order
+        )
+
+        val userPreviewUnits = userQueryPort.getUserPreviewUnits(
+            userIds = articleDetailUnitPage.contents.map { it.userId }.toSet()
+        )
+
+        return PageResponse(
+            totalCount = articleDetailUnitPage.totalCount,
+            currentCount = articleDetailUnitPage.currentCount,
+            totalPage = articleDetailUnitPage.totalPage,
+            currentPage = articleDetailUnitPage.currentPage,
+            contents = articleDetailUnitPage.contents
+                .map {
+                    ArticleDetailResponse(
+                        article = it,
+                        writer = userPreviewUnits[it.userId]!!
+                    )
+                }
+        )
+    }
+
+    override fun getArticleDetail(request: ArticleDetailGetRequest): ArticleDetailResponse {
+        val articleDetailUnit = articleQueryPersistencePort.findArticleDetailUnitById(
+            id = request.id,
+            userId = request.userId
+        )
+        val userPreviewUnit = userQueryPort.getUserPreviewUnit(request.userId)
+        return ArticleDetailResponse(
+            article = articleDetailUnit,
+            writer = userPreviewUnit
+        )
+    }
+}

community-application/src/main/kotlin/gloddy/category/port/in/CategoryQueryUseCase.kt

@@ -1,7 +1,7 @@
 package gloddy.category.port.`in`
 
-import gloddy.category.port.dto.CategoryReadData
+import gloddy.category.port.`in`.dto.CategoryGetResponse
 
 interface CategoryQueryUseCase {
-    fun getAll(): List<CategoryReadData>
+    fun getAll(): List<CategoryGetResponse>
 }

community-application/src/main/kotlin/gloddy/category/port/in/dto/CategoryGetResponse.kt

@@ -0,0 +1,6 @@
+package gloddy.category.port.`in`.dto
+
+data class CategoryGetResponse(
+    val id: Long,
+    val name: String
+)

community-application/src/main/kotlin/gloddy/category/port/service/CategoryQueryService.kt

@@ -1,6 +1,6 @@
 package gloddy.category.port.service
 
-import gloddy.category.port.dto.CategoryReadData
+import gloddy.category.port.`in`.dto.CategoryGetResponse
 import gloddy.category.port.`in`.CategoryQueryUseCase
 import gloddy.category.port.out.CategoryQueryPersistencePort
 import org.springframework.stereotype.Service
@@ -10,10 +10,10 @@ class CategoryQueryService(
     private val categoryQueryPersistencePort: CategoryQueryPersistencePort,
 ) : CategoryQueryUseCase {
 
-    override fun getAll(): List<CategoryReadData> {
+    override fun getAll(): List<CategoryGetResponse> {
         val categories = categoryQueryPersistencePort.findAll()
         return categories.map {
-            CategoryReadData(
+            CategoryGetResponse(
                 id = it.id!!.value,
                 name = it.name
             )

community-application/src/main/kotlin/gloddy/core/dto/PageResponse.kt

@@ -0,0 +1,9 @@
+package gloddy.core.dto
+
+data class PageResponse<T>(
+    val totalCount: Long,
+    val currentCount: Int,
+    val totalPage: Int,
+    val currentPage: Int,
+    val contents: List<T>
+)

community-application/src/main/kotlin/gloddy/core/util/DateTimeUtil.kt

@@ -0,0 +1,8 @@
+package gloddy.core.util
+
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter.*
+
+fun LocalDateTime.toResponse(): String =
+    this.format(ofPattern("yyyy-MM-dd hh:mm"))
+        .replace(" ", "T")

community-application/src/main/kotlin/gloddy/user/port/in/dto/UserPreviewUnit.kt

@@ -0,0 +1,11 @@
+package gloddy.user.port.`in`.dto
+
+data class UserPreviewUnit(
+    val id: Long,
+    val isCertifiedStudent: Boolean,
+    val profileImage: String,
+    val nickName: String,
+    val countryName: String?,
+    val countryImage: String?,
+    val reliabilityLevel: String
+)

community-application/src/main/kotlin/gloddy/user/port/out/UserQueryPort.kt

@@ -0,0 +1,8 @@
+package gloddy.user.port.out
+
+import gloddy.user.port.`in`.dto.UserPreviewUnit
+
+interface UserQueryPort {
+    fun getUserPreviewUnit(userId: Long): UserPreviewUnit
+    fun getUserPreviewUnits(userIds: Set<Long>): Map<Long, UserPreviewUnit>
+}