[feat/api/chat/FLOW-35] 메시지 불러오기, 전송중, 전송, 참여 멤버 리슽 다이얼로그, 멘션 추가(각각, everyone)

src/service/feature/auth/types/user.ts

@@ -0,0 +1,5 @@
+export interface User {
+    id: string;
+    name: string;
+    avatarUrl: string;
+}

src/service/feature/chat/api/chatAPI.ts

@@ -1,4 +1,5 @@
 import { createAxiosInstance } from '../../common/axios/axiosInstance';
+import { Chat } from '../type/messages.ts'
 
 const axios = createAxiosInstance();
 
@@ -7,9 +8,9 @@ export const fetchChannels = async () => {
   return res.data;
 };
 
-export const fetchLatestMessages = async (channelId: string | undefined) => {
+export const fetchLatestMessages = async (channelId: string | undefined): Promise<Chat[]> => {
   const res = await axios.get(`/message/latest?chatId=${channelId}`);
-  return Array.isArray(res.data) ? res.data : [];
+  return Array.isArray(res.data.data) ? res.data.data : [];
 };
 
 export const deleteMessage = async (messageId: string) => {

src/service/feature/chat/context/SocketProvider.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { CompatClient, Stomp } from '@stomp/stompjs';
 import SockJS from 'sockjs-client';
 import { SocketContext } from './SocketContext';
-
+import {getCookie} from "@service/feature/auth/lib/getCookie.ts";
 
 type Props = {
   children: React.ReactNode;
@@ -13,13 +13,11 @@ export const SocketProvider = ({ children }: Props) => {
   const clientRef = useRef<CompatClient | null>(null);
 
   useEffect(() => {
-    // const token = getTokenFromCookie();
-    // if (token === null) {
-    //   console.error('토큰을 찾을 수 없습니다.');
-    //   return;
-    // }
-
-    const token = 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJmYzgxMGZmMy1hMTU2LTQxMGMtODBkYi05Mzk0NDA1MDdkYzM6TUVNQkVSIiwiaXNzIjoiamVycnkwMzM5IiwiaWF0IjoxNzQ4NjE5MDY0LCJleHAiOjE3ODEwMTkwNjR9.IO6VIqIfoS1EosqkAMTDd8Xv34HhmTbtp-CDppDcidjnsOOIpMyjNTnHgDS-2RsmFLIWQzvZjBKd-rvdebxkBA';
+    const token = getCookie("accessToken");
+    if (!token) {
+      console.error('토큰을 찾을 수 없습니다.');
+      return;
+    }
 
     const socket = new SockJS(`http://flowchat.shop:30100/ws/chat?token=${token}`);
     const stompClient = Stomp.over(socket);
@@ -53,17 +51,4 @@ export const SocketProvider = ({ children }: Props) => {
       {children}
     </SocketContext.Provider>
   );
-};
-
-// function getTokenFromCookie(): string | null {
-//   const cookies = document.cookie;
-//   const cookieArray = cookies.split('; ');
-//
-//   for (const cookie of cookieArray) {
-//     const [name, value] = cookie.split('=');
-//     if (name === 'accessToken' && value && value.startsWith('ey')) {
-//       return value;
-//     }
-//   }
-//   return null;
-// }
+};

src/service/feature/chat/hook/useChat.ts

@@ -57,11 +57,8 @@ export const useChat = (chatId: string | undefined, onMessage: (msg: ChatMessage
     const tempId = uuidv4();
     const sendUrl = `/pub/message/${chatId}`;
     const message = {
-      chatId,
       content,
       attachments,
-      createdAt: new Date().toISOString(),
-      tempId
     };
 
     return new Promise((resolve, reject) => {

src/service/feature/chat/hook/useMessageHistory.ts

@@ -6,6 +6,6 @@ export const useMessageHistory = (channelId: string | undefined) => {
     queryKey: ['messages', channelId],
     queryFn: () => fetchLatestMessages(channelId),
     enabled: !!channelId,
-    staleTime: 1000*30
+    staleTime: 1000 * 30,
   });
 };

src/service/feature/chat/schema/messageSchema.ts

@@ -19,6 +19,7 @@ export const messageSchema = z.object({
   isUpdated: z.boolean(),
   isDeleted: z.boolean(),
   attachments: z.array(attachmentSchema).optional(),
+  mentions: z.array(z.string()).optional(),
   status: z.enum(['pending', 'sent', 'error']).optional(),
   tempId: z.string().optional(),
 });

src/service/feature/chat/type/messages.ts

@@ -0,0 +1,9 @@
+export interface Chat {
+    messageId: number;
+    sender: Sender;
+    content: string;
+    createdAt: string;
+    isUpdated: boolean;
+    isDeleted: boolean;
+    attachments: any[];
+}

src/service/feature/common/axios/axiosInstance.ts

@@ -6,7 +6,7 @@ import { getCookie } from '../../auth/lib/getCookie';
 export type ServiceType = 'members' | 'teams' | 'dialog';
 
 const API_CONFIG = {
-  BASE_DOMAIN: 'https://flowchat.shop:30200',
+  BASE_DOMAIN: 'http://flowchat.shop:30100',
   HEADERS: {
     JSON: 'application/json',
   },

src/service/feature/member/types/memberAPI.ts

@@ -14,6 +14,7 @@ export interface MemberInfo {
   nickname: string;
   avatarUrl?: string;
   birth?: string;
+  state?: MemberState;
 }
 
 export interface UpdateMemberStatusRequest {

src/service/feature/team/api/teamsServiceAPI.ts

@@ -21,9 +21,9 @@ export const getTeamList = async () => {
   return response.data;
 };
 
-export const getTeamById = async (teamId: string) => {
+export const getTeamById = async (teamId: string | undefined) => {
   const response = await axios.get(`/teams/${teamId}`);
-  return response.data;
+  return response.data.data;
 };
 
 export const deleteTeam = async (teamId: string) => {

src/service/feature/team/hook/query/useTeamServiceQuery.ts

@@ -13,7 +13,7 @@ export const useTeamListQuery = () => {
   });
 };
 
-export const useTeamDetailQuery = (teamId: string) => {
+export const useTeamDetailQuery = (teamId: string | undefined) => {
   return useQuery<Team>({
     queryKey: ['teamDetail', teamId],
     queryFn: () => getTeamById(teamId),

src/service/feature/team/types/team.ts

@@ -1,7 +1,25 @@
+import {Channel} from "@service/feature/channel/types/channel.ts";
+import {MemberInfo} from "@service/feature/member/types/memberAPI.ts";
+
 export interface Team {
   id: string;
   name: string;
   iconUrl?: string;
   masterId?: string;
   [key: string]: any;
+}
+
+export interface CategoriesView {
+  category: {
+    id: number,
+    name: string,
+    position: number,
+  },
+  channels: Channel[],
+}
+
+export interface TeamMembers {
+  id: number,
+  role: "ADMIN",
+  memberInfo: MemberInfo,
 }