[Chat] 서버 전체 채팅 조회 API 구현 GET api/v1/chat

chat/src/main/kotlin/kpring/chat/chat/api/v1/ChatController.kt

@@ -3,6 +3,10 @@ package kpring.chat.chat.api.v1
 import kpring.chat.chat.service.ChatService
 import kpring.core.auth.client.AuthClient
 import kpring.core.chat.chat.dto.request.CreateChatRequest
+import kpring.core.chat.chat.dto.response.ChatResponse
+import kpring.core.global.dto.response.ApiResponse
+import kpring.core.server.client.ServerClient
+import kpring.core.server.dto.request.GetServerCondition
 import org.springframework.http.ResponseEntity
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
@@ -12,6 +16,7 @@ import org.springframework.web.bind.annotation.*
 class ChatController(
   private val chatService: ChatService,
   val authClient: AuthClient,
+  val serverClient: ServerClient,
 ) {
   @PostMapping("/chat")
   fun createChat(
@@ -23,14 +28,23 @@ class ChatController(
     return ResponseEntity.ok().body(result)
   }
 
-  @GetMapping("/chat/{chatRoomId}/{page}")
-  fun getChatsByChatRoom(
-    @PathVariable("chatRoomId") chatRoomId: String,
-    @PathVariable("page") page: Int,
+  @GetMapping("/chat")
+  fun getChats(
+    @RequestParam("type") type: String,
+    @RequestParam("id") id: String,
+    @RequestParam("page") page: Int,
     @RequestHeader("Authorization") token: String,
   ): ResponseEntity<*> {
     val userId = authClient.getTokenInfo(token).data!!.userId
-    val result = chatService.getChatsByChatRoom(chatRoomId, userId, page)
-    return ResponseEntity.ok().body(result)
+    var result: List<ChatResponse>? = null
+
+    if (type.equals("Room")) {
+      result = chatService.getRoomChats(id, userId, page)
+    } else if (type.equals("Server")) {
+      val serverList = serverClient.getServerList(token, GetServerCondition()).body!!.data!!
+      result = chatService.getServerChats(id, userId, page, serverList)
+    }
+
+    return ResponseEntity.ok().body(ApiResponse(data = result, status = 200))
   }
 }

chat/src/main/kotlin/kpring/chat/chat/model/Chat.kt → chat/src/main/kotlin/kpring/chat/chat/model/RoomChat.kt

@@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.mapping.Document
 
 @NoArg
 @Document(collection = "chats")
-class Chat(
+class RoomChat(
   val userId: String,
   val roomId: String,
   val content: String,

chat/src/main/kotlin/kpring/chat/chat/model/ServerChat.kt

@@ -0,0 +1,21 @@
+package kpring.chat.chat.model
+
+import kpring.chat.NoArg
+import kpring.chat.global.model.BaseTime
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.mapping.Document
+
+@NoArg
+@Document(collection = "server_chats")
+class ServerChat(
+  val userId: String,
+  val serverId: String,
+  val content: String,
+) : BaseTime() {
+  @Id
+  var id: String? = null
+
+  fun isEdited(): Boolean {
+    return !createdAt.equals(updatedAt)
+  }
+}

chat/src/main/kotlin/kpring/chat/chat/repository/ChatRepository.kt → chat/src/main/kotlin/kpring/chat/chat/repository/RoomChatRepository.kt

@@ -1,15 +1,15 @@
 package kpring.chat.chat.repository
 
-import kpring.chat.chat.model.Chat
+import kpring.chat.chat.model.RoomChat
 import org.springframework.data.domain.Pageable
 import org.springframework.data.mongodb.repository.MongoRepository
 import org.springframework.data.querydsl.QuerydslPredicateExecutor
 import org.springframework.stereotype.Repository
 
 @Repository
-interface ChatRepository : MongoRepository<Chat, String>, QuerydslPredicateExecutor<Chat> {
+interface RoomChatRepository : MongoRepository<RoomChat, String>, QuerydslPredicateExecutor<RoomChat> {
   fun findAllByRoomId(
     roomId: String,
     pageable: Pageable,
-  ): List<Chat>
+  ): List<RoomChat>
 }

chat/src/main/kotlin/kpring/chat/chat/repository/ServerChatRepository.kt

@@ -0,0 +1,15 @@
+package kpring.chat.chat.repository
+
+import kpring.chat.chat.model.ServerChat
+import org.springframework.data.domain.Pageable
+import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.querydsl.QuerydslPredicateExecutor
+import org.springframework.stereotype.Repository
+
+@Repository
+interface ServerChatRepository : MongoRepository<ServerChat, String>, QuerydslPredicateExecutor<ServerChat> {
+  fun findAllByServerId(
+    serverId: String,
+    pageable: Pageable,
+  ): List<ServerChat>
+}

chat/src/main/kotlin/kpring/chat/chat/service/ChatService.kt

@@ -1,69 +1,102 @@
 package kpring.chat.chat.service
 
-import kpring.chat.chat.model.Chat
-import kpring.chat.chat.repository.ChatRepository
+import kpring.chat.chat.model.RoomChat
+import kpring.chat.chat.model.ServerChat
+import kpring.chat.chat.repository.RoomChatRepository
+import kpring.chat.chat.repository.ServerChatRepository
 import kpring.chat.chatroom.repository.ChatRoomRepository
 import kpring.chat.global.exception.ErrorCode
 import kpring.chat.global.exception.GlobalException
 import kpring.core.chat.chat.dto.request.CreateChatRequest
 import kpring.core.chat.chat.dto.response.ChatResponse
+import kpring.core.server.dto.ServerSimpleInfo
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.domain.PageRequest
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 
 @Service
 class ChatService(
-  private val chatRepository: ChatRepository,
+  private val roomChatRepository: RoomChatRepository,
+  private val serverChatRepository: ServerChatRepository,
   private val chatRoomRepository: ChatRoomRepository,
   @Value("\${page.size}") val pageSize: Int = 100,
 ) {
-  /*
-     business logic
-   */
   fun createChat(
     request: CreateChatRequest,
     userId: String,
   ) {
-    val chat =
-      chatRepository.save(
-        Chat(
+    val roomChat =
+      roomChatRepository.save(
+        RoomChat(
           userId = userId,
           roomId = request.room,
           content = request.content,
         ),
       )
   }
 
-  fun getChatsByChatRoom(
+  fun getRoomChats(
     chatRoomId: String,
     userId: String,
     page: Int,
   ): List<ChatResponse> {
-    checkIfAuthorized(chatRoomId, userId)
+    verifyChatRoomAccess(chatRoomId, userId)
 
-    // find chats by chatRoomId and convert them into DTOs
     val pageable: Pageable = PageRequest.of(page, pageSize)
-    val chats: List<Chat> = chatRepository.findAllByRoomId(chatRoomId, pageable)
+    val roomChats: List<RoomChat> = roomChatRepository.findAllByRoomId(chatRoomId, pageable)
 
-    return convertChatsToResponses(chats)
+    return convertRoomChatsToResponses(roomChats)
   }
 
-  fun checkIfAuthorized(
+  fun getServerChats(
+    serverId: String,
+    userId: String,
+    page: Int,
+    servers: List<ServerSimpleInfo>,
+  ): List<ChatResponse> {
+    verifyServerAccess(servers, serverId)
+
+    val pageable: Pageable = PageRequest.of(page, pageSize)
+    val chats: List<ServerChat> = serverChatRepository.findAllByServerId(serverId, pageable)
+
+    return convertServerChatsToResponses(chats)
+  }
+
+  fun verifyServerAccess(
+    servers: List<ServerSimpleInfo>,
+    serverId: String,
+  ) {
+    servers.forEach { info ->
+      if (info.id.equals(serverId)) {
+        return
+      }
+    }
+    throw GlobalException(ErrorCode.FORBIDDEN_SERVER)
+  }
+
+  fun verifyChatRoomAccess(
     chatRoomId: String,
     userId: String,
   ) {
-    // check if there is a chatroom with the chatRoomId and the user is one of the members
     if (!chatRoomRepository.existsByIdAndMembersContaining(chatRoomId, userId)) {
-      throw GlobalException(ErrorCode.UNAUTHORIZED_CHATROOM)
+      throw GlobalException(ErrorCode.FORBIDDEN_CHATROOM)
     }
   }
 
-  fun convertChatsToResponses(chats: List<Chat>): List<ChatResponse> {
-    val chatResponses =
+  fun convertRoomChatsToResponses(roomChats: List<RoomChat>): List<ChatResponse> {
+    val chatResponse =
+      roomChats.map { chat ->
+        ChatResponse(chat.id!!, chat.isEdited(), chat.createdAt.toString(), chat.content)
+      }
+    return chatResponse
+  }
+
+  fun convertServerChatsToResponses(chats: List<ServerChat>): List<ChatResponse> {
+    val chatResponse =
       chats.map { chat ->
-        ChatResponse(chat.roomId, chat.isEdited(), chat.createdAt, chat.content)
+        ChatResponse(chat.id!!, chat.isEdited(), chat.createdAt.toString(), chat.content)
       }
-    return chatResponses
+    return chatResponse
   }
 }

chat/src/main/kotlin/kpring/chat/chatroom/service/ChatRoomService.kt

@@ -24,19 +24,18 @@ class ChatRoomService(
     chatRoomId: String,
     userId: String,
   ) {
-    verifyAuthorizationForChatRoom(chatRoomId, userId)
+    verifyChatRoomAccess(chatRoomId, userId)
     val chatRoom: ChatRoom = getChatRoom(chatRoomId)
     chatRoom.removeUser(userId)
     chatRoomRepository.save(chatRoom)
   }
 
-  fun verifyAuthorizationForChatRoom(
+  fun verifyChatRoomAccess(
     chatRoomId: String,
     userId: String,
   ) {
-    // check if there is a chatroom with the chatRoomId and the user is one of the members
     if (!chatRoomRepository.existsByIdAndMembersContaining(chatRoomId, userId)) {
-      throw GlobalException(ErrorCode.UNAUTHORIZED_CHATROOM)
+      throw GlobalException(ErrorCode.FORBIDDEN_CHATROOM)
     }
   }
 

chat/src/main/kotlin/kpring/chat/global/config/AuthConfig.kt

@@ -0,0 +1,9 @@
+package kpring.chat.global.config
+
+import kpring.core.auth.config.AuthClientConfig
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
+
+@Import(AuthClientConfig::class)
+@Configuration
+class AuthConfig

chat/src/main/kotlin/kpring/chat/global/config/ServerConfig.kt

@@ -0,0 +1,9 @@
+package kpring.chat.global.config
+
+import kpring.core.server.config.ServerClientConfig
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
+
+@Import(ServerClientConfig::class)
+@Configuration
+class ServerConfig

chat/src/main/kotlin/kpring/chat/global/exception/ErrorCode.kt

@@ -3,14 +3,10 @@ package kpring.chat.global.exception
 import org.springframework.http.HttpStatus
 
 enum class ErrorCode(val httpStatus: Int, val message: String) {
-  // 400
-  INVALID_TOKEN(HttpStatus.BAD_REQUEST.value(), "토큰이 유효하지 않습니다"),
-
-  // 401
-  UNAUTHORIZED_CHATROOM(HttpStatus.UNAUTHORIZED.value(), "접근이 제한된 채팅방 입니다"),
+  // 403
+  FORBIDDEN_CHATROOM(HttpStatus.FORBIDDEN.value(), "접근이 제한된 채팅방 입니다"),
+  FORBIDDEN_SERVER(HttpStatus.FORBIDDEN.value(), "접근이 제한된 서버 입니다"),
 
   // 404
-  INVALID_TOKEN_BODY(HttpStatus.NOT_FOUND.value(), "토큰의 body가 유효하지 않습니다"),
-  USERID_NOT_EXIST(HttpStatus.NOT_FOUND.value(), "토큰의 userId가 존재하지 않습니다"),
   CHATROOM_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "해당 id로 chatroom을 찾을 수 없습니다"),
 }

chat/src/main/resources/application.yml

@@ -15,6 +15,8 @@ server:
   port: 8081
 
 auth:
-  url: "http://localhost:8080/"
+  url: "http://localhost:30000/"
+url:
+    server: "http://localhost:8080/"
 page:
   size: 100