Merge: develop branch 병합

gaseng · Nov 6, 2023 · 5eb032d · 5eb032d
2 parents 148534c + 12ac6a8
commit 5eb032d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/com/gaseng/chat/controller/ChatRoomApiController.java b/src/main/java/com/gaseng/chat/controller/ChatRoomApiController.java
@@ -47,9 +47,10 @@ public BaseResponse<ChatRoomCreateResponse> createChatRoom(@ExtractPayload Long
             @ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
     })
     @PostMapping("/{chatRoomId}")
-    public BaseResponse<ChatRoomEnterResponse> enterChatRoom(@Parameter(description = "chatroom id", required = true, example = "1")
+    public BaseResponse<ChatRoomEnterResponse> enterChatRoom(@ExtractPayload Long memId,
+                                                             @Parameter(description = "chatroom id", required = true, example = "1")
                                                              @PathVariable Long chatRoomId) {
-        return new BaseResponse<>(chatRoomService.enterChatRoom(chatRoomId));
+        return new BaseResponse<>(chatRoomService.enterChatRoom(memId, chatRoomId));
     }
 
     @PreAuthorize("hasRole('USER')")
@@ -61,11 +62,12 @@ public BaseResponse<ChatRoomEnterResponse> enterChatRoom(@Parameter(description
             @ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
     })
     @PatchMapping("/{chatRoomId}")
-    public BaseResponse<Long> updateMessage(@Parameter(description = "chatroom id", required = true, example = "1")
+    public BaseResponse<Long> updateMessage(@ExtractPayload Long memId,
+                                            @Parameter(description = "chatroom id", required = true, example = "1")
                                             @PathVariable Long chatRoomId,
                                             @Parameter(description = "message content", required = true, example = "hello")
                                             @RequestBody String message) {
-        return new BaseResponse<>(chatRoomService.updateMessage(chatRoomId, message));
+        return new BaseResponse<>(chatRoomService.updateMessage(memId, chatRoomId, message));
     }
 
     @PreAuthorize("hasRole('USER')")

diff --git a/src/main/java/com/gaseng/chat/service/ChatRoomService.java b/src/main/java/com/gaseng/chat/service/ChatRoomService.java
@@ -52,7 +52,8 @@ public ChatRoomCreateResponse createChatRoom(Long memId, Long shrId) {
         );
     }
 
-    public ChatRoomEnterResponse enterChatRoom(Long chatRoomId) {
+    public ChatRoomEnterResponse enterChatRoom(Long memId, Long chatRoomId) {
+        chatRoomFindService.findByMemIdAndChatRoomId(memId, chatRoomId);
         ChatRoom chatRoom = chatRoomFindService.findByChatRoomId(chatRoomId);
 
         return new ChatRoomEnterResponse(
@@ -63,8 +64,10 @@ public ChatRoomEnterResponse enterChatRoom(Long chatRoomId) {
     }
 
     @Transactional
-    public Long updateMessage(Long chatRoomId, String message) {
+    public Long updateMessage(Long memId, Long chatRoomId, String message) {
+        chatRoomFindService.findByMemIdAndChatRoomId(memId, chatRoomId);
         ChatRoom chatRoom = chatRoomFindService.findByChatRoomId(chatRoomId);
+
         validateActiveChatRoom(chatRoom);
         chatRoom.updateMessage(message);
 
@@ -76,7 +79,7 @@ public List<ChatRoomListResponse> getChatRoomList(Long memId, int pageSize, Long
         List<ChatRoomListQueryProjection> chatRooms = memberChatRoomRepository.findChatRoomsByMemId(memId);
 
         List<ChatRoomListResponse> chatRoomList = chatRooms.stream()
-                .map(chatRoom -> filterMemberAndFormatTime(member, chatRoom))
+                .map(chatRoom -> mapChatRoomToResponse(member, chatRoom))
                 .collect(Collectors.toList());
 
         int lastIndex = getLastIndex(chatRoomList, lastChatRoomId);
@@ -107,7 +110,7 @@ private void validateActiveChatRoom(ChatRoom chatRoom) {
         }
     }
 
-    private ChatRoomListResponse filterMemberAndFormatTime(Member member, ChatRoomListQueryProjection chatRoom) {
+    private ChatRoomListResponse mapChatRoomToResponse(Member member, ChatRoomListQueryProjection chatRoom) {
         String partnerNickname = filterPartnerNickname(member, chatRoom);
         String formattedTime = formatModifiedDate(chatRoom);
 

diff --git a/src/main/java/com/gaseng/member/dto/LoginResponse.java b/src/main/java/com/gaseng/member/dto/LoginResponse.java
@@ -5,6 +5,9 @@
 public record LoginResponse(
         @Schema(description = "member id (index)", example = "1")
         Long memId,
+
+        @Schema(description = "member name", example = "햄뿡이")
+        String memName,
 
         @Schema(description = "member email", example = "example@gmail.com")
         String email,

diff --git a/src/main/java/com/gaseng/member/service/MemberService.java b/src/main/java/com/gaseng/member/service/MemberService.java
@@ -58,6 +58,7 @@ public LoginResponse login(String email, String password) {
 
         return new LoginResponse(
                 member.getMemId(),
+                member.getMemName(),
                 member.getMemEmail().getValue(),
                 accessToken,
                 refreshToken,