Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] 채팅방 목록 불러오기 #64

Merged
merged 2 commits into from
Sep 2, 2024
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
58 changes: 32 additions & 26 deletions src/app/chatting/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import ChattingMessage from '@/components/chatting/ChattingMessage'
import { ChattingMessageI, ChattingRoomI } from '@/model/Chatting'
import { useWebSocket } from '@/hooks/useSocket'
import { userInfoState } from '@/recoil/UserInfo'
import { useRecoilValue } from 'recoil'
import { useRecoilState, useRecoilValue } from 'recoil'
import { chatRoomsState } from '@/recoil/chatRoomsState'

const Chatting = () => {
const [chatRooms, setChatRooms] = useState<ChattingRoomI[]>([])
const [chatRooms, setChatRooms] = useRecoilState(chatRoomsState)
const [currentChatRoomId, setCurrentChatRoomId] = useState<number | null>(
null,
)
Expand Down Expand Up @@ -47,7 +48,9 @@ const Chatting = () => {
`https://ik7f6nxm8g.execute-api.ap-northeast-2.amazonaws.com/mssaem/chatroom?memberId=${userInfo?.id}`,
)
const rooms = response.data
setChatRooms(rooms)
if (rooms.length > 0) {
setChatRooms(rooms)
}

if (rooms.length > 0 && currentChatRoomId === null) {
setCurrentChatRoomId(rooms[0].chatRoomId)
Expand All @@ -70,9 +73,9 @@ const Chatting = () => {
/* 채팅방 변경 시 메시지 불러오기 */
useEffect(() => {
if (currentChatRoomId) {
const selectedRoom = chatRooms.find(
(room) => room.chatRoomId === currentChatRoomId,
)
const selectedRoom =
chatRooms &&
chatRooms.find((room) => room.chatRoomId === currentChatRoomId)

if (selectedRoom) {
const fetchMessages = async () => {
Expand Down Expand Up @@ -125,12 +128,12 @@ const Chatting = () => {
await axios.delete(
`https://ik7f6nxm8g.execute-api.ap-northeast-2.amazonaws.com/mssaem/chatroom?chatRoomId=${chatRoomId}&memberId=${userInfo?.id}`,
)
setChatRooms((prevRooms) =>
prevRooms.filter((room) => room.chatRoomId !== chatRoomId),
setChatRooms((prevRooms: any) =>
prevRooms.filter((room: any) => room.chatRoomId !== chatRoomId),
)
setMessages([])
setCurrentChatRoomId(
chatRooms.length > 1 ? chatRooms[0].chatRoomId : null,
chatRooms && chatRooms.length > 1 ? chatRooms[0].chatRoomId : null,
)
} catch (error) {
console.error('Failed to leave the chat room:', error)
Expand All @@ -145,20 +148,21 @@ const Chatting = () => {
채팅 목록
</div>
<ul>
{chatRooms.map((room) => (
<li
key={room.chatRoomId}
className="border-b last:border-none box-border"
>
<ChattingProfile
user={room.memberSimpleInfo}
lastMessage={room.lastMessage}
lastSendAt={room.lastSendAt}
onClick={() => setCurrentChatRoomId(room.chatRoomId)}
current={room.chatRoomId === currentChatRoomId}
/>
</li>
))}
{chatRooms &&
chatRooms.map((room) => (
<li
key={room.chatRoomId}
className="border-b last:border-none box-border"
>
<ChattingProfile
user={room.memberSimpleInfo}
lastMessage={room.lastMessage}
lastSendAt={room.lastSendAt}
onClick={() => setCurrentChatRoomId(room.chatRoomId)}
current={room.chatRoomId === currentChatRoomId}
/>
</li>
))}
</ul>
</div>

Expand All @@ -177,9 +181,11 @@ const Chatting = () => {
<div className="flex-1 overflow-y-auto box-border">
{messages.length > 0 ? (
messages.map((msg, index) => {
const currentRoom = chatRooms.find(
(room) => room.chatRoomId === currentChatRoomId,
)
const currentRoom =
chatRooms &&
chatRooms.find(
(room) => room.chatRoomId === currentChatRoomId,
)
return (
<div key={index} className="my-2 p-2 box-border">
<ChattingMessage
Expand Down
30 changes: 22 additions & 8 deletions src/app/worry/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import WorryProfile from '@/components/user/WorryProfile'
import { useUserInfo } from '@/service/user/useUserService'
import { useToast } from '@/hooks/useToast'
import { useWebSocket } from '@/hooks/useSocket'
import axios from 'axios'
import { useSetRecoilState } from 'recoil'
import { chatRoomsState } from '@/recoil/chatRoomsState'

const WorryDetail = () => {
const { id } = useParams()
Expand All @@ -23,6 +26,21 @@ const WorryDetail = () => {
const { data: userInfo } = useUserInfo()
const { mutate: postChattingRoom } = usePostChattingRoom()
const { connectSocket, socketRefs } = useWebSocket()
const setChatRooms = useSetRecoilState(chatRoomsState)

/* 채팅방 목록 불러오기 */
const fetchChatRoomsAndConnectSockets = async () => {
try {
const response = await axios.get(
`https://ik7f6nxm8g.execute-api.ap-northeast-2.amazonaws.com/mssaem/chatroom?memberId=${userInfo?.id}`,
)
const rooms = response.data
setChatRooms(rooms)
router.push(`/chatting`)
} catch (error) {
console.error('Failed to fetch chat rooms:', error)
}
}

const handleChattingStartClick = () => {
if (userInfo?.id === worryDetail?.memberSimpleInfo.id) {
Expand All @@ -46,15 +64,11 @@ const WorryDetail = () => {
connectSocket(wsUrlOwner, ownerKey)

if (socketRefs[userKey]) {
socketRefs[userKey]!.onopen = () => {
socketRefs[userKey]!.onopen = async () => {
console.log('User WebSocket is connected')
router.push(`/chatting`)
}
socketRefs[userKey]!.onclose = () => {
console.log('User WebSocket is closed')
}
socketRefs[userKey]!.onerror = (error: any) => {
console.error('User WebSocket error:', error)
setTimeout(() => {
fetchChatRoomsAndConnectSockets()
}, 1000)
}
}
},
Expand Down
7 changes: 7 additions & 0 deletions src/recoil/chatRoomsState.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { ChattingRoomI } from '@/model/Chatting'
import { atom } from 'recoil'

export const chatRoomsState = atom<ChattingRoomI[] | null>({
key: 'chatRoomsState',
default: null,
})