Refactor/#165: 채팅 메시지 도메인 리팩토링

src/main/java/space/space_spring/controller/ChatRoomController.java → src/main/java/space/space_spring/domain/chat/chatroom/controller/ChatRoomController.java

@@ -1,20 +1,20 @@
-package space.space_spring.controller;
+package space.space_spring.domain.chat.chatroom.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
 import space.space_spring.argumentResolver.userSpace.UserSpaceAuth;
-import space.space_spring.dto.chat.request.CreateChatRoomRequest;
-import space.space_spring.dto.chat.request.JoinChatRoomRequest;
-import space.space_spring.dto.chat.response.ChatSuccessResponse;
-import space.space_spring.dto.chat.response.CreateChatRoomResponse;
-import space.space_spring.dto.chat.response.ReadChatRoomMemberResponse;
-import space.space_spring.dto.chat.response.ReadChatRoomResponse;
+import space.space_spring.domain.chat.chatroom.model.request.CreateChatRoomRequest;
+import space.space_spring.domain.chat.chatroom.model.request.JoinChatRoomRequest;
+import space.space_spring.domain.chat.chatroom.model.response.ChatSuccessResponse;
+import space.space_spring.domain.chat.chatroom.model.response.CreateChatRoomResponse;
+import space.space_spring.domain.chat.chatroom.model.response.ReadChatRoomMemberResponse;
+import space.space_spring.domain.chat.chatroom.model.response.ReadChatRoomResponse;
 import space.space_spring.exception.CustomException;
 import space.space_spring.response.BaseResponse;
-import space.space_spring.service.ChatRoomService;
+import space.space_spring.domain.chat.chatroom.service.component.ChatRoomService;
 import space.space_spring.service.S3Uploader;
 
 import java.io.IOException;

src/main/java/space/space_spring/entity/ChatRoom.java → src/main/java/space/space_spring/domain/chat/chatroom/model/ChatRoom.java

@@ -1,24 +1,22 @@
-package space.space_spring.entity;
+package space.space_spring.domain.chat.chatroom.model;
 
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import space.space_spring.entity.BaseEntity;
+import space.space_spring.entity.Space;
 
 @Entity
 @Getter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Comment("채팅방")
 @Table(name = "Chat_Room")
-public class ChatRoom extends BaseEntity{
+public class ChatRoom extends BaseEntity {
 
     @Id
     @GeneratedValue
@@ -39,6 +37,14 @@ public class ChatRoom extends BaseEntity{
     @Column(name = "chat_room_img")
     private String img;
 
+    @Builder(access = AccessLevel.PRIVATE)
+    private ChatRoom(Long id, Space space, String name, @Nullable String img) {
+        this.id = id;
+        this.space = space;
+        this.name = name;
+        this.img = img;
+    }
+
     public static ChatRoom of(Space space, String chatRoomName, String chatRoomImgUrl) {
         return ChatRoom.builder()
                 .space(space)
@@ -51,7 +57,4 @@ public void updateName(String name) {
         this.name = name;
     }
 
-    //    // 양방향 매핑
-//    @OneToMany(mappedBy = "chatRoom", cascade = CascadeType.ALL)
-//    private List<UserChatRoom> userChatRooms;
 }

src/main/java/space/space_spring/domain/chat/chatroom/model/ChatRooms.java

@@ -0,0 +1,42 @@
+package space.space_spring.domain.chat.chatroom.model;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import space.space_spring.domain.chat.chatroom.model.dto.LastMessageInfoDto;
+import space.space_spring.domain.chat.chatroom.model.response.ChatRoomResponse;
+
+public class ChatRooms {
+
+    private List<ChatRoom> chatRooms;
+
+    private ChatRooms(List<ChatRoom> chatRooms) {
+        this.chatRooms = chatRooms;
+    }
+
+    public static ChatRooms of(List<ChatRoom> chatRooms) {
+        return new ChatRooms(chatRooms);
+    }
+
+    public List<ChatRoomResponse> toChatRoomResponses(
+            Long userId,
+            Function<ChatRoom, LastMessageInfoDto> lastMessageFinder,
+            BiFunction<Long, ChatRoom, Integer> unreadMessageCounter) {
+        return chatRooms.stream()
+                .map(chatRoom -> {
+                    LastMessageInfoDto lastMessageInfo = lastMessageFinder.apply(chatRoom);
+                    LocalDateTime lastUpdateTime = lastMessageInfo.getLastUpdateTime();
+                    HashMap<String, String> lastContent = lastMessageInfo.getLastContent();
+
+                    int unreadMsgCount = unreadMessageCounter.apply(userId, chatRoom);
+
+                    return ChatRoomResponse.create(chatRoom, lastContent, String.valueOf(lastUpdateTime),
+                            unreadMsgCount);
+                })
+                .filter(Objects::nonNull)
+                .toList();
+    }
+}

src/main/java/space/space_spring/entity/UserChatRoom.java → src/main/java/space/space_spring/domain/chat/chatroom/model/UserChatRoom.java

@@ -1,23 +1,23 @@
-package space.space_spring.entity;
+package space.space_spring.domain.chat.chatroom.model;
 
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDateTime;
+import space.space_spring.entity.BaseEntity;
+import space.space_spring.entity.User;
 
 @Entity
 @Getter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Comment("유저별 채팅방")
 @Table(name = "User_Chat_Room")
-public class UserChatRoom extends BaseEntity{
+public class UserChatRoom extends BaseEntity {
 
     @Id
     @GeneratedValue
@@ -39,6 +39,14 @@ public class UserChatRoom extends BaseEntity{
     @Column(name = "last_read_time")
     private LocalDateTime lastReadTime;
 
+    @Builder(access = AccessLevel.PRIVATE)
+    private UserChatRoom(Long id, ChatRoom chatRoom, User user, @Nullable LocalDateTime lastReadTime) {
+        this.id = id;
+        this.chatRoom = chatRoom;
+        this.user = user;
+        this.lastReadTime = lastReadTime;
+    }
+
     public static UserChatRoom of(ChatRoom chatRoom, User user, LocalDateTime lastReadTime) {
         return UserChatRoom.builder()
                 .chatRoom(chatRoom)

src/main/java/space/space_spring/domain/chat/chatroom/model/UserChatRooms.java

@@ -0,0 +1,30 @@
+package space.space_spring.domain.chat.chatroom.model;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import space.space_spring.entity.User;
+
+public class UserChatRooms {
+
+    private final List<UserChatRoom> userChatRooms;
+
+    private UserChatRooms(List<UserChatRoom> userChatRooms) {
+        this.userChatRooms = Collections.unmodifiableList(userChatRooms);
+    }
+
+    public static UserChatRooms of(List<UserChatRoom> userChatRooms) {
+        return new UserChatRooms(userChatRooms);
+    }
+
+    public boolean isUserJoined(Long userId) {
+        return userChatRooms.stream().anyMatch(userChatRoom -> userChatRoom.getUser().getUserId().equals(userId));
+    }
+
+    public List<User> getUsers() {
+        return userChatRooms.stream()
+                .map(UserChatRoom::getUser)
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+}

src/main/java/space/space_spring/domain/chat/chatroom/model/dto/LastMessageInfoDto.java

@@ -0,0 +1,30 @@
+package space.space_spring.domain.chat.chatroom.model.dto;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+
+@Getter
+public class LastMessageInfoDto {
+
+    private LocalDateTime lastUpdateTime;
+
+    private HashMap<String, String> lastContent;
+
+    @Builder(access = AccessLevel.PRIVATE)
+    private LastMessageInfoDto(LocalDateTime lastUpdateTime, HashMap<String, String> lastContent) {
+        this.lastUpdateTime = lastUpdateTime;
+        this.lastContent = lastContent;
+    }
+
+    public static LastMessageInfoDto of(LocalDateTime lastUpdateTime, HashMap<String, String> lastContent) {
+        return LastMessageInfoDto.builder()
+                .lastUpdateTime(lastUpdateTime)
+                .lastContent(lastContent)
+                .build();
+    }
+}
+

src/main/java/space/space_spring/dto/chat/request/CreateChatRoomRequest.java → src/main/java/space/space_spring/domain/chat/chatroom/model/request/CreateChatRoomRequest.java

@@ -1,19 +1,15 @@
-package space.space_spring.dto.chat.request;
+package space.space_spring.domain.chat.chatroom.model.request;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 @Getter
-@Setter
-@Builder
 public class CreateChatRoomRequest {
 
     @Size(min = 2, max = 15, message = "채팅방 이름은 2자 이상, 15자 이내의 문자열이어야 합니다.")

src/main/java/space/space_spring/dto/chat/request/JoinChatRoomRequest.java → src/main/java/space/space_spring/domain/chat/chatroom/model/request/JoinChatRoomRequest.java

@@ -1,17 +1,11 @@
-package space.space_spring.dto.chat.request;
+package space.space_spring.domain.chat.chatroom.model.request;
 
 import jakarta.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Getter
-@Builder
-@NoArgsConstructor /* controller단 테스트 위해 적용*/
-@AllArgsConstructor
 public class JoinChatRoomRequest {
 
     @NotEmpty(message = "1명 이상의 멤버를 초대해야 합니다.")