Merge pull request GoodSpace-Kr#180 from kjoon418/main

feat: ID를 통해 회원 정보를 조회하는 API 구현

Author: kjoon418

src/main/kotlin/goodspace/teaming/chat/domain/mapper/SenderSummaryMapper.kt

@@ -10,7 +10,11 @@ import org.springframework.stereotype.Component
 class SenderSummaryMapper(
     private val urlProvider: CdnStorageUrlProvider
 ) {
-    fun map(user: User, size: Int = 64): SenderSummaryResponseDto {
+    fun map(user: User?, size: Int = 64): SenderSummaryResponseDto? {
+        if (user == null) {
+            return null
+        }
+
         return SenderSummaryResponseDto(
             id = user.id,
             name = user.name,

src/main/kotlin/goodspace/teaming/chat/dto/ChatMessageResponseDto.kt

@@ -10,6 +10,6 @@ data class ChatMessageResponseDto(
     val type: MessageType,
     val content: String?,
     val createdAt: Instant,
-    val sender: SenderSummaryResponseDto,
+    val sender: SenderSummaryResponseDto?,
     val attachments: List<MessageAttachmentResponseDto> = emptyList()
 )

src/main/kotlin/goodspace/teaming/chat/dto/LastMessagePreviewResponseDto.kt

@@ -7,6 +7,6 @@ data class LastMessagePreviewResponseDto(
     val id: Long,
     val type: MessageType,
     val content: String?,
-    val sender: SenderSummaryResponseDto,
+    val sender: SenderSummaryResponseDto?,
     val createdAt: Instant
 )

src/main/kotlin/goodspace/teaming/global/entity/room/Message.kt

@@ -23,8 +23,8 @@ import org.hibernate.annotations.SQLRestriction
 @SQLRestriction("deleted = false")
 class Message(
     @ManyToOne(fetch = LAZY)
-    @JoinColumn(name = "sender_id", nullable = false)
-    val sender: User,
+    @JoinColumn(name = "sender_id")
+    val sender: User?,
 
     @ManyToOne(fetch = LAZY)
     @JoinColumn(nullable = false)

src/main/kotlin/goodspace/teaming/user/controller/UserController.kt

@@ -3,10 +3,7 @@ package goodspace.teaming.user.controller
 import goodspace.teaming.authorization.dto.AccessTokenReissueRequestDto
 import goodspace.teaming.authorization.dto.AccessTokenResponseDto
 import goodspace.teaming.global.security.userId
-import goodspace.teaming.user.dto.UpdateEmailRequestDto
-import goodspace.teaming.user.dto.UpdateNameRequestDto
-import goodspace.teaming.user.dto.UpdatePasswordRequestDto
-import goodspace.teaming.user.dto.UserInfoResponseDto
+import goodspace.teaming.user.dto.*
 import goodspace.teaming.user.service.TokenManagementService
 import goodspace.teaming.user.service.UserService
 import io.swagger.v3.oas.annotations.Operation
@@ -18,7 +15,7 @@ import java.security.Principal
 private val NO_CONTENT = ResponseEntity.noContent().build<Void>()
 
 @RestController
-@RequestMapping("/users/me")
+@RequestMapping("/users")
 @Tag(
     name = "회원 API",
     description = "회원 정보 조회 및 삭제 기능(아바타 수정은 파일 API에서 담당합니다)"
@@ -27,7 +24,7 @@ class UserController(
     private val userService: UserService,
     private val tokenManagementService: TokenManagementService
 ) {
-    @GetMapping
+    @GetMapping("/me")
     @Operation(
         summary = "회원 정보 조회"
     )
@@ -41,7 +38,20 @@ class UserController(
         return ResponseEntity.ok(response)
     }
 
-    @PatchMapping("/email")
+    @GetMapping
+    @Operation(
+        summary = "다른 회원 정보 조회",
+        description = "ID를 기반으로 다른 회원의 정보를 조회합니다. (방을 탈퇴한 멤버의 정보를 조회할 때 사용)"
+    )
+    fun getOtherInfo(
+        @RequestBody requestDto: UserInfoRequestDto
+    ): ResponseEntity<List<UserInfoResponseDto>> {
+        val response = userService.getUserInfo(requestDto)
+
+        return ResponseEntity.ok(response)
+    }
+
+    @PatchMapping("/me/email")
     @Operation(
         summary = "이메일 수정",
         description = "이메일을 수정합니다. 새롭게 등록할 이메일이 인증되어 있어야 합니다."
@@ -57,7 +67,7 @@ class UserController(
         return NO_CONTENT
     }
 
-    @PatchMapping("/password")
+    @PatchMapping("/me/password")
     @Operation(
         summary = "비밀번호 수정",
         description = "비밀번호를 수정합니다. 기존 비밀번호가 올바라야 합니다."
@@ -73,7 +83,7 @@ class UserController(
         return NO_CONTENT
     }
 
-    @PatchMapping("/name")
+    @PatchMapping("/me/name")
     @Operation(
         summary = "이름 수정",
     )
@@ -88,7 +98,7 @@ class UserController(
         return NO_CONTENT
     }
 
-    @PostMapping("/access-token")
+    @PostMapping("/me/access-token")
     @Operation(
         summary = "엑세스 토큰 재발급",
         description = "리프레쉬 토큰을 통해 엑세스 토큰을 재발급합니다."
@@ -101,7 +111,7 @@ class UserController(
         return ResponseEntity.ok(response)
     }
 
-    @DeleteMapping("/log-out")
+    @DeleteMapping("/me/log-out")
     @Operation(
         summary = "로그아웃(리프레쉬 토큰 만료)",
         description = "리프레쉬 토큰을 만료시킵니다. 엑세스 토큰은 클라이언트 단에서 직접 처분해야 합니다."
@@ -116,7 +126,7 @@ class UserController(
         return NO_CONTENT
     }
 
-    @DeleteMapping("/withdraw")
+    @DeleteMapping("/me/withdraw")
     @Operation(
         summary = "회원 탈퇴",
         description = "회원을 삭제합니다. 결제한 금액을 환불받지 못함을 고지해야 합니다."

src/main/kotlin/goodspace/teaming/user/dto/UserInfoRequestDto.kt

@@ -0,0 +1,5 @@
+package goodspace.teaming.user.dto
+
+data class UserInfoRequestDto(
+    val ids: List<Long>
+)

src/main/kotlin/goodspace/teaming/user/service/UserService.kt

@@ -7,6 +7,10 @@ interface UserService {
         userId: Long
     ): UserInfoResponseDto
 
+    fun getUserInfo(
+        requestDto: UserInfoRequestDto
+    ): List<UserInfoResponseDto>
+
     fun updateEmail(
         userId: Long,
         requestDto: UpdateEmailRequestDto

src/main/kotlin/goodspace/teaming/user/service/UserServiceImpl.kt

@@ -28,6 +28,14 @@ class UserServiceImpl(
         return userInfoMapper.map(user)
     }
 
+    @Transactional(readOnly = true)
+    override fun getUserInfo(requestDto: UserInfoRequestDto): List<UserInfoResponseDto> {
+        return requestDto.ids.stream()
+            .map { findUser(it) }
+            .map { userInfoMapper.map(it) }
+            .toList()
+    }
+
     @Transactional
     override fun updateEmail(userId: Long, requestDto: UpdateEmailRequestDto) {
         val user = findUser(userId)

src/test/kotlin/goodspace/teaming/chat/domain/mapper/SenderSummaryMapperTest.kt

@@ -48,7 +48,7 @@ class SenderSummaryMapperTest {
             )
 
             // when
-            val result = mapper.map(user, DEFAULT_SIZE)
+            val result = mapper.map(user, DEFAULT_SIZE)!!
 
             // then
             assertThat(result.id).isEqualTo(DEFAULT_USER_ID)
@@ -70,7 +70,7 @@ class SenderSummaryMapperTest {
             )
 
             // when
-            val result = mapper.map(user, size = CUSTOM_SIZE)
+            val result = mapper.map(user, size = CUSTOM_SIZE)!!
 
             // then
             assertThat(result.avatarUrl).isEqualTo(DEFAULT_PUBLIC_URL)
@@ -93,7 +93,7 @@ class SenderSummaryMapperTest {
             )
 
             // when
-            val result = mapper.map(user)
+            val result = mapper.map(user)!!
 
             // then
             assertThat(result.avatarUrl).isNull()

src/test/kotlin/goodspace/teaming/user/service/UserServiceTest.kt

@@ -3,6 +3,7 @@ package goodspace.teaming.user.service
 import goodspace.teaming.fixture.*
 import goodspace.teaming.global.entity.email.EmailVerification
 import goodspace.teaming.global.entity.user.TeamingUser
+import goodspace.teaming.global.entity.user.User
 import goodspace.teaming.global.entity.user.UserType
 import goodspace.teaming.global.exception.NOT_VERIFIED_EMAIL
 import goodspace.teaming.global.exception.OAUTH_USER_CANNOT_CHANGE_PASSWORD
@@ -11,10 +12,7 @@ import goodspace.teaming.global.password.PasswordValidatorImpl
 import goodspace.teaming.global.repository.EmailVerificationRepository
 import goodspace.teaming.global.repository.UserRepository
 import goodspace.teaming.user.domain.mapper.UserInfoMapper
-import goodspace.teaming.user.dto.UpdateEmailRequestDto
-import goodspace.teaming.user.dto.UpdateNameRequestDto
-import goodspace.teaming.user.dto.UpdatePasswordRequestDto
-import goodspace.teaming.user.dto.UserInfoResponseDto
+import goodspace.teaming.user.dto.*
 import goodspace.teaming.util.createEmailVerification
 import goodspace.teaming.util.createRoom
 import goodspace.teaming.util.createUser
@@ -46,7 +44,7 @@ class UserServiceTest {
     private val emailVerificationRepository = mockk<EmailVerificationRepository>(relaxed = true)
     private val passwordEncoder = mockk<PasswordEncoder>()
     private val passwordValidator = mockk<PasswordValidatorImpl>()
-    private val userInfoMapper = mockk<UserInfoMapper>()
+    private val userInfoMapper = mockk<UserInfoMapper>(relaxed = true)
 
     private val userService = UserServiceImpl(
         userRepository = userRepository,
@@ -60,7 +58,7 @@ class UserServiceTest {
     @DisplayName("getUserInfo")
     inner class GetUserInfo {
         @Test
-        fun `회원 정보를 DTO로 매핑해 반환한다`() {
+        fun `ID에 대한 회원 정보를 반환한다`() {
             // given
             val user = createUser(id = USER_ID)
             val userId = user.id!!
@@ -75,6 +73,29 @@ class UserServiceTest {
             // then
             assertThat(actualResponse).isEqualTo(expectedResponse)
         }
+
+        @Test
+        fun `ID 목록에 대한 회원 정보 목록을 반환한다`() {
+            // given
+            val user1 = createUser(id = 1)
+            val user2 = createUser(id = 2)
+            val user3 = createUser(id = 3)
+            val userIds = listOf(user1.id!!, user2.id!!, user3.id!!)
+
+            every { userRepository.findById(user1.id!!) } returns Optional.of(user1)
+            every { userRepository.findById(user2.id!!) } returns Optional.of(user2)
+            every { userRepository.findById(user3.id!!) } returns Optional.of(user3)
+
+            val requestDto = UserInfoRequestDto(
+                ids = userIds
+            )
+
+            // when
+            val response = userService.getUserInfo(requestDto)
+
+            // then
+            assertThat(response).hasSameSizeAs(userIds)
+        }
     }
 
     @Nested