From 4f06078d029baeee1013cecd5c6b33af9dfc2455 Mon Sep 17 00:00:00 2001
From: hysong4u <hayeon_song@naver.com>
Date: Fri, 19 Jan 2024 04:27:02 +0900
Subject: [PATCH] =?UTF-8?q?[refactor]=20=EC=84=A0=EB=AC=BC=EB=B0=A9=20?=
 =?UTF-8?q?=EC=B0=B8=EC=97=AC=EC=9E=90=20=EC=83=81=EC=84=B8=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20API=20response=20=EC=9A=94=EC=B2=AD=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../room/controller/RoomController.java       |  6 ++--
 .../room/dto/response/RoomMemberDto.java      | 10 +++---
 .../domain/room/service/RoomService.java      | 36 ++++++++++---------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java b/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java
index dfb0404..3d5cdaf 100644
--- a/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java
+++ b/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java
@@ -12,6 +12,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @RequestMapping("/api/room")
 @RestController
@@ -63,8 +65,8 @@ public ResponseEntity<SuccessResponse<?>> modifyRoomGifteeName(@UserId Long user
 
     @GetMapping("/{roomId}/members")
     public ResponseEntity<SuccessResponse<?>> getRoomMembers(@UserId Long userId, @PathVariable Long roomId) {
-        final RoomMemberDetailDto roomMemberDetailDto = roomService.getRoomMembers(userId, roomId);
-        return SuccessResponse.ok(roomMemberDetailDto);
+        final List<RoomMemberDto> roomMemberDtoList = roomService.getRoomMembers(userId, roomId);
+        return SuccessResponse.ok(roomMemberDtoList);
     }
 
     @GetMapping("/{roomId}/room-detail")
diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java
index f22e992..ab96054 100644
--- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java
+++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java
@@ -2,17 +2,19 @@
 
 import lombok.Builder;
 
+import java.util.List;
+
 @Builder
 public record RoomMemberDto(
         Long memberId,
         String profileImageUrl,
         String name
 ) {
-    public static RoomMemberDto of(Long memberId, String profileImageUrl, String name) {
+    public static RoomMemberDto of(Long id, String profileImg, String nickName) {
         return RoomMemberDto.builder()
-                .memberId(memberId)
-                .profileImageUrl(profileImageUrl)
-                .name(name)
+                .memberId(id)
+                .profileImageUrl(profileImg)
+                .name(nickName)
                 .build();
     }
 }
diff --git a/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java b/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
index 05eaf15..6861a4c 100644
--- a/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
+++ b/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
@@ -147,12 +147,28 @@ public void modifyRoomGifteeName(Long memberId, Long roomId, RoomNameRequestDto
     }
 
     @Transactional(readOnly = true)
-    public RoomMemberDetailDto getRoomMembers(Long memberId, Long roomId) {
+    public List<RoomMemberDto> getRoomMembers(Long memberId, Long roomId) {
         List<RoomMember> roomMembers = roomMemberRepository.findByRoomId(roomId);
-        List<RoomMemberDto> roomMemberDtoList = mapToRoomMemberDtoList(roomMembers);
-        return RoomMemberDetailDto.of(roomMemberDtoList);
+        return mapToRoomMemberDtoList(roomMembers);
     }
 
+    private List<RoomMemberDto> mapToRoomMemberDtoList(List<RoomMember> roomMembers) {
+        Long hostId = roomMembers.get(0).getRoom().getHost().getId();
+        return roomMembers.stream()
+                .filter(roomMember -> !roomMember.getMember().getId().equals(hostId))
+                .map(this::mapToRoomMemberDto)
+                .collect(Collectors.toList());
+    }
+
+    private RoomMemberDto mapToRoomMemberDto(RoomMember roomMember) {
+        return RoomMemberDto.of(
+                roomMember.getMember().getId(),
+                roomMember.getMember().getProfileImg(),
+                roomMember.getMember().getNickName()
+        );
+    }
+
+
     @Transactional(readOnly = true)
     public RoomOwnerDetailDto getRoom(Long memberId, Long roomId) {
         Member member = findMemberByIdOrThrow(memberId);
@@ -174,21 +190,7 @@ public void deleteRoomMember(Long memberId, Long roomId, Long deleteMemberId) {
         decrementGifterNumber(room);
     }
 
-    private List<RoomMemberDto> mapToRoomMemberDtoList(List<RoomMember> roomMembers) {
-        Long hostId = roomMembers.get(0).getRoom().getHost().getId();
-        return roomMembers.stream()
-                .filter(roomMember -> !roomMember.getMember().getId().equals(hostId))
-                .map(this::mapToRoomMemberDto)
-                .collect(Collectors.toList());
-    }
 
-    private RoomMemberDto mapToRoomMemberDto(RoomMember roomMember) {
-        return RoomMemberDto.of(
-                roomMember.getMember().getId(),
-                roomMember.getMember().getProfileImg(),
-                roomMember.getMember().getNickName()
-        );
-    }
 
     private void checkRoomHost(Member member, Room room) {
         if (!member.equals(room.getHost())) {