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
34 changes: 28 additions & 6 deletions apps/web/src/apis/chat/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import type { AxiosResponse } from "axios";
import type { ChatMessage, ChatPartner, ChatRoom } from "@/types/chat";
import { axiosInstance } from "@/utils/axiosInstance";
import {
normalizeChatMessage,
normalizeChatPartner,
normalizeChatRoom,
type RawChatMessage,
type RawChatPartner,
type RawChatRoom,
} from "./normalize";

// QueryKeys for chat domain
export const ChatQueryKeys = {
Expand All @@ -27,20 +35,34 @@ interface GetChatHistoriesParams {
page?: number;
}

interface RawChatHistoriesResponse {
nextPageNumber: number;
content: RawChatMessage[];
}

interface RawChatRoomListResponse {
chatRooms: RawChatRoom[];
}

export const chatApi = {
getChatHistories: async ({ roomId, size = 20, page = 0 }: GetChatHistoriesParams): Promise<ChatHistoriesResponse> => {
const res = await axiosInstance.get<ChatHistoriesResponse>(`/chats/rooms/${roomId}`, {
const res = await axiosInstance.get<RawChatHistoriesResponse>(`/chats/rooms/${roomId}`, {
params: {
size,
page,
},
});
return res.data;
return {
nextPageNumber: res.data.nextPageNumber,
content: (res.data.content ?? []).map(normalizeChatMessage),
};
},

getChatRooms: async (): Promise<ChatRoomListResponse> => {
const res = await axiosInstance.get<ChatRoomListResponse>("/chats/rooms");
return res.data;
const res = await axiosInstance.get<RawChatRoomListResponse>("/chats/rooms");
return {
chatRooms: (res.data.chatRooms ?? []).map(normalizeChatRoom),
};
},

putReadChatRoom: async (roomId: number): Promise<void> => {
Expand All @@ -49,7 +71,7 @@ export const chatApi = {
},

getChatPartner: async (roomId: number): Promise<ChatPartner> => {
const res = await axiosInstance.get<ChatPartner>(`/chats/rooms/${roomId}/partner`);
return res.data;
const res = await axiosInstance.get<RawChatPartner>(`/chats/rooms/${roomId}/partner`);
return normalizeChatPartner(res.data);
},
};
80 changes: 80 additions & 0 deletions apps/web/src/apis/chat/normalize.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import type { ChatAttachment, ChatMessage, ChatPartner, ChatRoom } from "@/types/chat";

type NumericLike = number | string | null | undefined;

interface RawChatAttachment {
id?: NumericLike;
isImage: boolean;
url: string;
thumbnailUrl?: string | null;
createdAt: string;
}

export interface RawChatMessage {
id?: NumericLike;
content: string;
senderId?: NumericLike;
siteUserId?: NumericLike;
createdAt: string;
attachments?: RawChatAttachment[];
}

export interface RawChatPartner {
partnerId?: NumericLike;
siteUserId?: NumericLike;
nickname: string;
profileUrl?: string | null;
university?: string | null;
}

export interface RawChatRoom {
id: number;
lastChatMessage: string;
lastReceivedTime: string;
partner: RawChatPartner;
unReadCount: number;
}

const toNumber = (value: NumericLike): number => {
if (typeof value === "number" && Number.isFinite(value)) {
return value;
}

if (typeof value === "string" && value.trim() !== "") {
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : 0;
}

return 0;
};

const normalizeAttachment = (attachment: RawChatAttachment): ChatAttachment => ({
id: toNumber(attachment.id),
isImage: attachment.isImage,
url: attachment.url,
thumbnailUrl: attachment.thumbnailUrl ?? "",
createdAt: attachment.createdAt,
});

export const normalizeChatMessage = (message: RawChatMessage): ChatMessage => ({
id: toNumber(message.id),
content: message.content,
senderId: toNumber(message.senderId ?? message.siteUserId),
createdAt: message.createdAt,
attachments: (message.attachments ?? []).map(normalizeAttachment),
});

export const normalizeChatPartner = (partner: RawChatPartner): ChatPartner => ({
partnerId: toNumber(partner.partnerId ?? partner.siteUserId),
nickname: partner.nickname,
profileUrl: partner.profileUrl ?? null,
university: partner.university ?? null,
});

export const normalizeChatRoom = (room: RawChatRoom): ChatRoom => ({
id: room.id,
lastChatMessage: room.lastChatMessage,
lastReceivedTime: room.lastReceivedTime,
partner: normalizeChatPartner(room.partner),
unReadCount: room.unReadCount,
});
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface ChatContentProps {
const ChatContent = ({ chatId }: ChatContentProps) => {
const { accessToken } = useAuthStore();
const parsedData = tokenParse(accessToken);
const userId = parsedData?.sub ?? 0;
const userId = Number(parsedData?.sub ?? 0) || 0;

const isMentor = parsedData?.role === UserRole.MENTOR || parsedData?.role === UserRole.ADMIN;

Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/lib/web-socket/useConnectWebSocket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Client } from "@stomp/stompjs";
import type { MutableRefObject } from "react";
import { useEffect, useState } from "react";
import SockJS from "sockjs-client";
import { normalizeChatMessage, type RawChatMessage } from "@/apis/chat/normalize";

import { type ChatMessage, ConnectionStatus } from "@/types/chat";
import useAuthStore from "../zustand/useAuthStore";
Expand Down Expand Up @@ -54,7 +55,7 @@ const useConnectWebSocket = ({ roomId, clientRef }: UseConnectWebSocketProps): U
setConnectionStatus(ConnectionStatus.Connected);
client.subscribe(`/topic/chat/${roomId}`, (message) => {
try {
const receivedMessage = JSON.parse(message.body) as ChatMessage;
const receivedMessage = normalizeChatMessage(JSON.parse(message.body) as RawChatMessage);

if (!receivedMessage.createdAt || Number.isNaN(new Date(receivedMessage.createdAt).getTime())) {
receivedMessage.createdAt = new Date().toISOString();
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/utils/jwtUtils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
interface JwtPayload {
sub: number;
sub: number | string;
role: string;
iat: number;
exp: number;
Expand Down
Loading