Merge branch 'refs/heads/main' into develop

molohala · Apr 17, 2024 · bd71785 · bd71785
2 parents e8a5268 + fafb500
commit bd71785
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/...re/src/main/kotlin/com/molohala/infinitycore/comment/repository/QueryCommentRepository.kt b/...re/src/main/kotlin/com/molohala/infinitycore/comment/repository/QueryCommentRepository.kt
@@ -4,4 +4,5 @@ import com.molohala.infinitycore.comment.application.dto.res.CommentRes
 
 interface QueryCommentRepository {
     fun findByCommunityId(communityId: Long):List<CommentRes>?
+    fun findRecentComment(communityId: Long):CommentRes
 }
diff --git a/...src/main/kotlin/com/molohala/infinitycore/comment/repository/QueryDslCommentRepository.kt b/...src/main/kotlin/com/molohala/infinitycore/comment/repository/QueryDslCommentRepository.kt
@@ -22,6 +22,16 @@ class QueryDslCommentRepository(
             .fetch()
     }
 
+    override fun findRecentComment(communityId: Long): CommentRes? {
+        return queryFactory.select(commentProjection())
+            .from(comment)
+            .where(comment.communityId.eq(communityId))
+            .orderBy(comment.createdAt.desc())
+            .innerJoin(member)
+            .on(comment.memberId.eq(member.id))
+            .fetchFirst()
+    }
+
 
     private fun commentProjection(): ConstructorExpression<CommentRes> {
         return Projections.constructor(

diff --git a/...c/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt b/...c/main/kotlin/com/molohala/infinitycore/community/application/dto/res/CommunityListRes.kt
@@ -0,0 +1,9 @@
+package com.molohala.infinitycore.community.application.dto.res
+
+import com.molohala.infinitycore.comment.application.dto.res.CommentRes
+
+data class CommunityListRes(
+    val community: CommunityRes,
+    val recentComment: CommentRes
+) {
+}
diff --git a/...c/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt b/...c/main/kotlin/com/molohala/infinitycore/community/application/service/CommunityService.kt
@@ -2,9 +2,12 @@ package com.molohala.infinitycore.community.application.service
 
 import com.molohala.infinitycommon.exception.GlobalExceptionCode
 import com.molohala.infinitycommon.exception.custom.CustomException
+import com.molohala.infinitycore.comment.application.dto.res.CommentRes
+import com.molohala.infinitycore.comment.repository.QueryCommentRepository
 import com.molohala.infinitycore.common.PageRequest
 import com.molohala.infinitycore.community.application.dto.req.CommunityModifyReq
 import com.molohala.infinitycore.community.application.dto.req.CommunitySaveReq
+import com.molohala.infinitycore.community.application.dto.res.CommunityListRes
 import com.molohala.infinitycore.community.application.dto.res.CommunityRes
 import com.molohala.infinitycore.community.domain.consts.CommunityState
 import com.molohala.infinitycore.community.domain.entity.Community
@@ -24,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional
 class CommunityService(
     private val communityJpaRepository: CommunityJpaRepository,
     private val queryCommunityRepository: QueryCommunityRepository,
+    private val queryCommentRepository: QueryCommentRepository,
     private val queryLikeRepository: QueryLikeRepository,
     private val memberSessionHolder: MemberSessionHolder
 ) {
@@ -39,10 +43,10 @@ class CommunityService(
         )
     }
 
-    fun getList(page: PageRequest): List<CommunityRes> {
+    fun getList(page: PageRequest): List<CommunityListRes> {
         if (page.page < 1) throw CustomException(GlobalExceptionCode.INVALID_PARAMETER)
-        return queryCommunityRepository.findWithPagination(page)
-            .map {
+        return queryCommunityRepository.findWithPagination(page).map {
+            CommunityListRes(
                 CommunityRes(
                     it.communityId,
                     it.content,
@@ -51,8 +55,9 @@ class CommunityService(
                     queryLikeRepository.existsByCommunityIdAndMemberId(it.communityId,it.writerId),
                     it.writerName,
                     it.writerId
-                )
-            }
+                ), queryCommentRepository.findRecentComment(it.communityId)
+            )
+        }
     }
 
     fun getById(id: Long): CommunityRes? {