Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/api/service/chat-service/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
GetChatMessagesParams,
GetChatMessagesResponse,
GetChatRoomsResponse,
ReadMessagesParams,
ReadMessagesResponse,
} from '@/types/service/chat';

export const chatServiceRemote = () => ({
Expand All @@ -27,4 +29,9 @@ export const chatServiceRemote = () => ({
},
});
},

// 메세지 읽음 처리
readMessages: async ({ roomId }: ReadMessagesParams) => {
return apiV1.put<ReadMessagesResponse>(`/chat/rooms/${roomId}/read`);
},
});
23 changes: 16 additions & 7 deletions src/app/chat/[roomId]/ChatRoomPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { DEFAULT_PROFILE_IMAGE } from 'constants/default-images';
import { ChatHeader, ChatInput, MyChat, OtherChat } from '@/components/pages/chat';
import { UserList } from '@/components/pages/chat/chat-user-list';
import { useGetChatMessages } from '@/hooks/use-chat';
import { useReadMessages } from '@/hooks/use-chat/use-chat-read';
import { useChatSocket } from '@/hooks/use-chat/use-chat-socket';
import { ChatMessage } from '@/types/service/chat';

Expand Down Expand Up @@ -82,14 +83,9 @@ interface IProps {
const ChatRoomPage = ({ accessToken, roomId, userId }: IProps) => {
const [isUserListOpen, setIsUserListOpen] = useState(false);
const [chatMessages, setChatMessages] = useState<ChatMessage[]>([]);
const { data: previousMessages } = useGetChatMessages(roomId);

useEffect(() => {
if (!previousMessages) return;
// eslint-disable-next-line react-hooks/set-state-in-effect
setChatMessages([...previousMessages.messages].reverse());
}, [previousMessages]);

const { data: previousMessages } = useGetChatMessages(roomId);
const { mutate: readMessages } = useReadMessages(roomId, userId);
const {
messages: newMessages,
sendMessage,
Expand All @@ -103,6 +99,19 @@ const ChatRoomPage = ({ accessToken, roomId, userId }: IProps) => {
setChatMessages((prev) => [...prev, message]);
},
});

useEffect(() => {
if (!isConnected) return;

readMessages();
}, [isConnected, readMessages, newMessages]);

useEffect(() => {
if (!previousMessages) return;
// eslint-disable-next-line react-hooks/set-state-in-effect
setChatMessages([...previousMessages.messages].reverse());
}, [previousMessages]);

console.log(newMessages);

const handleSubmit = (text: string) => {
Expand Down
12 changes: 11 additions & 1 deletion src/components/pages/chat/chat-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
import Image from 'next/image';
import { useRouter } from 'next/navigation';

import { useEffect } from 'react';

import { useQueryClient } from '@tanstack/react-query';
import { DEFAULT_PROFILE_IMAGE } from 'constants/default-images';

import { useGetChatList } from '@/hooks/use-chat/use-chat-list';
Expand All @@ -15,13 +18,20 @@ interface IProps {

export const ChatList = ({ userId }: IProps) => {
const router = useRouter();

const queryClient = useQueryClient();
const handleClick = (chatId: number) => {
router.push(`/chat/${chatId}`);
};
const { data: chatList } = useGetChatList({ userId });

console.log(chatList);

// 현재 방식은 tanstack query를 이용해서 단지 목록 조회
// but, 소켓 통신을 하고 있는 상황이므로 목록 역시 소켓을 열어서 페이지에 머물러 있을 때도 실시간으로 확인 가능하도록
useEffect(() => {
queryClient.invalidateQueries({ queryKey: ['chatList', userId] });
}, [chatList, userId]);

return (
<ul className='flex flex-col'>
{chatList?.chatRooms.length === 0 ? (
Expand Down
1 change: 1 addition & 0 deletions src/hooks/use-chat/use-chat-messages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const useGetChatMessages = (roomId: number, cursor?: number, size?: numbe
const query = useQuery({
queryKey: ['chatMessages', roomId],
queryFn: () => API.chatService.getChatMessages({ roomId, cursor, size }),
staleTime: 0,
});
return query;
};
19 changes: 19 additions & 0 deletions src/hooks/use-chat/use-chat-read/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';

import { API } from '@/api';

export const useReadMessages = (roomId: number, userId: number) => {
const queryClient = useQueryClient();

const query = useMutation({
mutationKey: ['chatMessages', roomId],
mutationFn: () => API.chatService.readMessages({ roomId }),
onSuccess: () => {
console.log('메세지를 읽었어요!');
queryClient.invalidateQueries({
queryKey: ['chatList', userId],
});
},
});
return query;
};
2 changes: 1 addition & 1 deletion src/hooks/use-chat/use-chat-socket/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const useChatSocket = ({
Authorization: `Bearer ${accessToken}`,
},
debug: (str) => console.log(str),
reconnectDelay: 60000,
reconnectDelay: 6000,
heartbeatIncoming: 4000,
heartbeatOutgoing: 4000,
});
Expand Down
10 changes: 10 additions & 0 deletions src/types/service/chat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,13 @@ export interface GetChatMessagesResponse {
nextCursor: number | null;
hasNext: boolean;
}

export interface ReadMessagesParams {
roomId: number;
}

export interface ReadMessagesResponse {
chatRoomId: number;
lastReadMessageId: number;
unreadCount: number;
}