🔧 Add chattingUsers into ArticleResponse

wafflestudio · Jan 21, 2025 · 41c122c · 41c122c
1 parent 9a1b395
commit 41c122c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/main/kotlin/com/toyProject7/karrot/article/controller/ArticleController.kt b/src/main/kotlin/com/toyProject7/karrot/article/controller/ArticleController.kt
@@ -24,19 +24,21 @@ class ArticleController(
     fun postArticle(
         @RequestBody request: PostArticleRequest,
         @AuthUser user: User,
-    ): ResponseEntity<Article> {
+    ): ResponseEntity<ArticleResponse> {
         val article = articleService.postArticle(request, user.id)
-        return ResponseEntity.ok(article)
+        val chattingUsers = articleService.getChattingUsersByArticle(article)
+        return ResponseEntity.ok(ArticleResponse(article, chattingUsers))
     }
 
     @PutMapping("/item/edit/{articleId}")
     fun editArticle(
         @RequestBody request: PostArticleRequest,
         @PathVariable articleId: Long,
         @AuthUser user: User,
-    ): ResponseEntity<Article> {
+    ): ResponseEntity<ArticleResponse> {
         val article = articleService.editArticle(articleId, request, user.id)
-        return ResponseEntity.ok(article)
+        val chattingUsers = articleService.getChattingUsersByArticle(article)
+        return ResponseEntity.ok(ArticleResponse(article, chattingUsers))
     }
 
     @DeleteMapping("/item/delete/{articleId}")
@@ -80,9 +82,10 @@ class ArticleController(
     fun getArticle(
         @PathVariable articleId: Long,
         @AuthUser user: User,
-    ): ResponseEntity<Article> {
+    ): ResponseEntity<ArticleResponse> {
         val article = articleService.getArticle(articleId, user.id)
-        return ResponseEntity.ok(article)
+        val chattingUsers = articleService.getChattingUsersByArticle(article)
+        return ResponseEntity.ok(ArticleResponse(article, chattingUsers))
     }
 
     @GetMapping("/home")
@@ -149,3 +152,8 @@ data class PostArticleRequest(
 data class UpdateStatusRequest(
     val status: Int,
 )
+
+data class ArticleResponse(
+    val article: Article,
+    val chattingUsers: List<User>,
+)
diff --git a/src/main/kotlin/com/toyProject7/karrot/article/service/ArticleService.kt b/src/main/kotlin/com/toyProject7/karrot/article/service/ArticleService.kt
@@ -9,8 +9,12 @@ import com.toyProject7.karrot.article.persistence.ArticleEntity
 import com.toyProject7.karrot.article.persistence.ArticleLikesEntity
 import com.toyProject7.karrot.article.persistence.ArticleLikesRepository
 import com.toyProject7.karrot.article.persistence.ArticleRepository
+import com.toyProject7.karrot.chatRoom.controller.ChatRoom
+import com.toyProject7.karrot.chatRoom.persistence.ChatRoomEntity
+import com.toyProject7.karrot.chatRoom.persistence.ChatRoomRepository
 import com.toyProject7.karrot.image.persistence.ImageUrlEntity
 import com.toyProject7.karrot.image.service.ImageService
+import com.toyProject7.karrot.user.controller.User
 import com.toyProject7.karrot.user.service.UserService
 import org.springframework.context.annotation.Lazy
 import org.springframework.data.repository.findByIdOrNull
@@ -25,6 +29,7 @@ class ArticleService(
     private val articleLikesRepository: ArticleLikesRepository,
     private val userService: UserService,
     @Lazy private val imageService: ImageService,
+    private val chatRoomRepository: ChatRoomRepository,
 ) {
     @Transactional
     fun postArticle(
@@ -249,4 +254,12 @@ class ArticleService(
     fun getArticleEntityById(articleId: Long): ArticleEntity {
         return articleRepository.findByIdOrNull(articleId) ?: throw ArticleNotFoundException()
     }
+
+    @Transactional
+    fun getChattingUsersByArticle(article: Article): List<User> {
+        val chatRoomEntities: List<ChatRoomEntity> = chatRoomRepository.findAllByArticleId(article.id)
+        return chatRoomEntities
+            .map { chatRoomEntity -> ChatRoom.fromEntity(chatRoomEntity, "") }
+            .map { chatRoom -> chatRoom.buyer }
+    }
 }
diff --git a/src/main/kotlin/com/toyProject7/karrot/chatRoom/persistence/ChatRoomRepository.kt b/src/main/kotlin/com/toyProject7/karrot/chatRoom/persistence/ChatRoomRepository.kt
@@ -9,4 +9,6 @@ interface ChatRoomRepository : JpaRepository<ChatRoomEntity, Long> {
         buyerId: String,
         updatedAt: Instant,
     ): List<ChatRoomEntity>
+
+    fun findAllByArticleId(articleId: Long): List<ChatRoomEntity>
 }