Deploy: Merge to main

build.gradle

@@ -71,6 +71,9 @@ dependencies {
     // s3
     implementation(platform("software.amazon.awssdk:bom:2.25.8"))
     implementation 'software.amazon.awssdk:s3'
+
+    // websocket
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
 }
 
 tasks.named('test') {

src/main/java/ita/tinybite/domain/chat/controller/ChatController.java

@@ -0,0 +1,59 @@
+package ita.tinybite.domain.chat.controller;
+
+import ita.tinybite.domain.chat.dto.req.ChatMessageReqDto;
+import ita.tinybite.domain.chat.dto.res.ChatMessageResDto;
+import ita.tinybite.domain.chat.entity.ChatMessage;
+import ita.tinybite.domain.chat.service.ChatService;
+import ita.tinybite.global.response.APIResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+
+import static ita.tinybite.global.response.APIResponse.*;
+
+
+@Controller
+@RequiredArgsConstructor
+public class ChatController {
+
+    private final SimpMessagingTemplate simpMessagingTemplate;
+    private final ChatService chatService;
+
+    /**
+     * 1. ws://{server name}/publish/send 으로 요청 <br>
+     * 2. message 저장 <br>
+     * 3. 해당 채팅방을 구독중인 세션에게 해당 메시지 전달 <br>
+     * 4. 만약 해당 채팅방을 구독중이지 않다면 (채팅방을 나간상태), 알림을 보냄 <br>
+     */
+    @MessageMapping("/send")
+    public void sendMessage(ChatMessageReqDto req,
+                            SimpMessageHeaderAccessor accessor) {
+        // message entity 생성
+        ChatMessage message = ChatMessage.builder()
+                .chatRoomId(req.chatRoomId())
+                .senderId((Long) accessor.getSessionAttributes().get("userId"))
+                .senderName(req.nickname())
+                .content(req.content()).build();
+
+        // message 저장
+        ChatMessage saved = chatService.saveMessage(message);
+
+        // subscribe 한 사용자에게 전송
+        simpMessagingTemplate.convertAndSend("/subscribe/chat/room/" + saved.getChatRoomId(), ChatMessageResDto.of(saved));
+
+        // subscribe하지 않았으나, 채팅방에 존재하는 사람들에게 전송
+        chatService.sendNotification(saved, req.chatRoomId());
+    }
+
+    @ResponseBody
+    @GetMapping("/api/v1/chat/{chatRoomId}")
+    public APIResponse<?> getChatMessages(@PathVariable Long chatRoomId,
+                                          @RequestParam(defaultValue = "0") int page,
+                                          @RequestParam(defaultValue = "20") int size) {
+        return success(chatService.getChatMessage(chatRoomId, page, size));
+    }
+}

src/main/java/ita/tinybite/domain/chat/dto/req/ChatMessageReqDto.java

@@ -0,0 +1,13 @@
+package ita.tinybite.domain.chat.dto.req;
+
+import lombok.Builder;
+
+@Builder
+public record ChatMessageReqDto(
+        Long chatRoomId,
+        Long userId,
+        String nickname,
+        String content
+) {
+
+}

src/main/java/ita/tinybite/domain/chat/dto/res/ChatMessageResDto.java

@@ -0,0 +1,19 @@
+package ita.tinybite.domain.chat.dto.res;
+
+import ita.tinybite.domain.chat.entity.ChatMessage;
+import lombok.Builder;
+
+@Builder
+public record ChatMessageResDto(
+        Long userId,
+        String nickname,
+        String content
+) {
+    public static ChatMessageResDto of(ChatMessage chatMessage) {
+        return ChatMessageResDto.builder()
+                .userId(chatMessage.getSenderId())
+                .nickname(chatMessage.getSenderName())
+                .content(chatMessage.getContent())
+                .build();
+    }
+}

src/main/java/ita/tinybite/domain/chat/dto/res/ChatMessageSliceResDto.java

@@ -0,0 +1,13 @@
+package ita.tinybite.domain.chat.dto.res;
+
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record ChatMessageSliceResDto(
+        List<ChatMessageResDto> messages,
+        Boolean hasNext
+) {
+
+}

src/main/java/ita/tinybite/domain/chat/entity/ChatMessage.java

@@ -0,0 +1,31 @@
+package ita.tinybite.domain.chat.entity;
+
+import ita.tinybite.global.entity.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Table(name = "chat_messages")
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ChatMessage extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 채팅룸 아이디
+    private Long chatRoomId;
+
+    // 전송자 아이디
+    private Long senderId;
+
+    // 전송자 이름 (nickname)
+    private String senderName;
+
+    // 메시지 내용
+    private String content;
+}
+

src/main/java/ita/tinybite/domain/chat/entity/ChatRoom.java

@@ -2,6 +2,7 @@
 
 import ita.tinybite.domain.chat.enums.ChatRoomType;
 import ita.tinybite.domain.party.entity.Party;
+import ita.tinybite.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
@@ -43,20 +44,24 @@ public class ChatRoom {
 
     @OneToMany(mappedBy = "chatRoom", cascade = CascadeType.ALL, orphanRemoval = true)
     @Builder.Default
-    private List<ChatRoomMember> members = new ArrayList<>();
+    private List<ChatRoomMember> participants = new ArrayList<>();
 
     // ========== 비즈니스 메서드 ==========
 
+    public void addParticipants(ChatRoomMember... participants) {
+        this.participants.addAll(List.of(participants));
+    }
+
     /**
      * 멤버 추가
      */
-    public void addMember(ita.tinybite.domain.user.entity.User user) {
+    public void addMember(User user) {
         ChatRoomMember member = ChatRoomMember.builder()
                 .chatRoom(this)
                 .user(user)
                 .isActive(true)
                 .build();
-        members.add(member);
+        participants.add(member);
     }
 
     /**

src/main/java/ita/tinybite/domain/chat/entity/ChatRoomMember.java

@@ -28,10 +28,6 @@ public class ChatRoomMember {
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "party_id")
-    private Party party;
-
     @Column(nullable = false)
     @Builder.Default
     private Boolean isActive = true;
@@ -42,6 +38,8 @@ public class ChatRoomMember {
 
     private LocalDateTime leftAt;
 
+    private LocalDateTime lastReadAt;
+
     /**
      * 퇴장
      */

src/main/java/ita/tinybite/domain/chat/repository/ChatMessageRepository.java

@@ -0,0 +1,14 @@
+package ita.tinybite.domain.chat.repository;
+
+import ita.tinybite.domain.chat.entity.ChatMessage;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
+
+    Slice<ChatMessage> findByChatRoomId(Long roomId, Pageable pageable);
+}

src/main/java/ita/tinybite/domain/chat/service/ChatEventListener.java

@@ -0,0 +1,84 @@
+package ita.tinybite.domain.chat.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.messaging.SessionDisconnectEvent;
+import org.springframework.web.socket.messaging.SessionSubscribeEvent;
+import org.springframework.web.socket.messaging.SessionUnsubscribeEvent;
+
+/**
+ * subscribe, unsubscribe, disconnect 이벤트 발생 시 registry에 자동으로 값을 변경하는 스프링 빈 클래스
+ */
+@Component
+@RequiredArgsConstructor
+public class ChatEventListener {
+
+    private final ChatSubscribeRegistry registry;
+
+    /**
+     * 구독 시, 호출되는 메서드 <br>
+     * 1. StompHeader에서 userId, destination, sessionId, subscriptionId 받아옴 (destination 예 : /subscribe/chat/room/{chatRoomId}) <br>
+     * 2. destination에서 roomId resolve <br>
+     * 3. 이후 세션정보를 registry에 등록
+     */
+    @EventListener
+    public void onSubscribe(SessionSubscribeEvent event) {
+        StompHeaderAccessor acc = StompHeaderAccessor.wrap(event.getMessage());
+
+        Long userId = (Long) acc.getSessionAttributes().get("userId");
+        String destination = acc.getDestination();
+        String sessionId = acc.getSessionId();
+        String subscriptionId = acc.getSubscriptionId();
+
+        if (userId == null || destination == null) return;
+
+        // /subscribe/chat/room/1
+        Long roomId = extractRoomId(destination);
+        registry.register(sessionId, subscriptionId, roomId, userId);
+    }
+
+    /**
+     * 구독취소시 호출되는 메서드 <br>
+     * 1. StompHeader에서 sessionId, subscriptionId resolve <br>
+     * 2. 해당 구독정보를 가지고 있는 사용자를 registry에서 삭제 <br>
+     * 3. 만약 네트워크 에러 등으로 유저 정보가 없을 시, 유저에 해당하는 구독 정보를 삭제
+     */
+    @EventListener
+    public void onUnsubscribe(SessionUnsubscribeEvent event) {
+        StompHeaderAccessor acc = StompHeaderAccessor.wrap(event.getMessage());
+
+        String sessionId = acc.getSessionId();
+        String subscriptionId = acc.getSubscriptionId();
+
+        if (sessionId != null && subscriptionId != null) {
+            registry.unregister(sessionId, subscriptionId);
+        }
+    }
+
+    @EventListener
+    public void onDisconnect(SessionDisconnectEvent event) {
+        StompHeaderAccessor acc = StompHeaderAccessor.wrap(event.getMessage());
+
+        String sessionId = acc.getSessionId();
+        if (sessionId != null) {
+            registry.unregisterSession(sessionId);
+            return;
+        }
+
+        Long userId = acc.getSessionAttributes() != null ? (Long) acc.getSessionAttributes().get("userId") : null;
+        if (userId != null) {
+            registry.removeUserEverywhere(userId);
+        }
+    }
+
+    private Long extractRoomId(String destination) {
+        // /subscribe/chat/room/{roomId}
+        try {
+            return Long.parseLong(destination.substring("/subscribe/chat/room/".length()));
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+}

src/main/java/ita/tinybite/domain/chat/service/ChatService.java

@@ -0,0 +1,76 @@
+package ita.tinybite.domain.chat.service;
+
+import ita.tinybite.domain.chat.dto.res.ChatMessageResDto;
+import ita.tinybite.domain.chat.dto.res.ChatMessageSliceResDto;
+import ita.tinybite.domain.chat.entity.ChatMessage;
+import ita.tinybite.domain.chat.entity.ChatRoomMember;
+import ita.tinybite.domain.chat.repository.ChatMessageRepository;
+import ita.tinybite.domain.chat.repository.ChatRoomRepository;
+import ita.tinybite.domain.notification.service.facade.NotificationFacade;
+import ita.tinybite.domain.user.entity.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ChatService {
+
+    private final ChatMessageRepository chatMessageRepository;
+    private final ChatRoomRepository chatRoomRepository;
+    private final ChatSubscribeRegistry registry;
+    private final NotificationFacade notificationFacade;
+
+    public ChatMessage saveMessage(ChatMessage message) {
+        return chatMessageRepository.save(message);
+    }
+
+    /**
+     * 구독하지 않은 채팅방 사용자에게 fcm알림을 전송함
+     */
+    public void sendNotification(ChatMessage message, Long chatRoomId) {
+        // 1. 채팅방의 모든 참여자 조회
+        Set<ChatRoomMember> participants = new HashSet<>(chatRoomRepository.findById(chatRoomId).orElseThrow().getParticipants());
+
+        // 2. 이 중 구독하고있는 참여자 조회
+        Set<Long> subscriberIds = registry.getSubscribers(chatRoomId);
+
+        // 3. 모든 참여자에서 구독중인 참여자 & 본인 제외 -> 비구독자
+        Set<User> unsubscribers = participants.stream()
+                .map(ChatRoomMember::getUser)
+                .filter(user -> !subscriberIds.contains(user.getUserId()))
+                .filter(user -> !user.getUserId().equals(message.getSenderId()))
+                .collect(Collectors.toSet());
+
+        // 4. 해당 비구독자 유저들에게 메시지가 왔다는 알림 전송
+        unsubscribers.forEach(unsubscriber ->
+                notificationFacade.notifyNewChatMessage(unsubscriber.getUserId(), chatRoomId, unsubscriber.getNickname(), message.getContent())
+        );
+    }
+
+    public ChatMessageSliceResDto getChatMessage(Long roomId, int page, int size) {
+        Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        Slice<ChatMessage> messages = chatMessageRepository.findByChatRoomId(roomId, pageable);
+
+        List<ChatMessageResDto> list = messages
+                .getContent()
+                .stream()
+                .map(ChatMessageResDto::of)
+                .toList();
+
+        return ChatMessageSliceResDto.builder()
+                .messages(list)
+                .hasNext(messages.hasNext())
+                .build();
+    }
+}