Feat/115 일대일 채팅방 정보 조회 및 처리 로직

TinyBite/api/axios.ts

@@ -6,7 +6,6 @@ import * as SecureStore from "expo-secure-store";
 // 인증 필요 x
 export const publicAxios = axios.create({
   baseURL: BASE_URL,
-  withCredentials: true,
 });
 
 publicAxios.interceptors.request.use(
@@ -29,7 +28,6 @@ publicAxios.interceptors.request.use(
 // 인증 필요 o
 export const privateAxios = axios.create({
   baseURL: BASE_URL,
-  withCredentials: true,
 });
 
 privateAxios.interceptors.request.use(
@@ -89,18 +87,21 @@ privateAxios.interceptors.response.use(
   async (error) => {
     const originalRequest = error.config;
 
-    // 401 에러이고 재시도하지 않은 요청인지 확인
+    // 401 | 403 에러이고 재시도하지 않은 요청인지 확인
     if (
-      error.response?.status === 401 &&
-      !originalRequest._retry &&
-      !originalRequest.url?.includes("/refresh")
+      (error.response?.status === 401 || error.response?.status === 403) &&
+      !originalRequest._retry
     ) {
       if (isRefreshing) {
         return new Promise((resolve, reject) => {
           failedQueue.push({ resolve, reject });
         })
           .then((token) => {
             originalRequest.headers.Authorization = `Bearer ${token}`;
+            if (originalRequest.url?.includes(ENDPOINT.AUTH.REFRESH)) {
+              useAuthStore.getState().logout();
+              return Promise.reject(error);
+            }
             return privateAxios(originalRequest);
           })
           .catch((err) => {
@@ -114,6 +115,12 @@ privateAxios.interceptors.response.use(
 
       try {
         const refreshToken = await SecureStore.getItemAsync("refreshToken");
+
+        if (!refreshToken) {
+          useAuthStore.getState().logout();
+          return Promise.reject(new Error("No refresh token"));
+        }
+
         const res = await publicAxios.post(ENDPOINT.AUTH.REFRESH, {
           refreshToken: refreshToken,
         });
@@ -129,6 +136,10 @@ privateAxios.interceptors.response.use(
         const newAccessToken = await SecureStore.getItemAsync("accessToken");
         processQueue(null, newAccessToken);
         originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
+        if (originalRequest.url?.includes(ENDPOINT.AUTH.REFRESH)) {
+          useAuthStore.getState().logout();
+          return Promise.reject(error);
+        }
         return privateAxios(originalRequest);
       } catch (refreshError) {
         processQueue(refreshError, null);

TinyBite/api/chatApi.ts

@@ -2,7 +2,10 @@ import { ApiSuccess } from "@/types/api.types";
 import {
   GetChatMessagesParams,
   GetChatMessagesResponse,
+  GroupChatCardSchema,
+  GroupChatDetailSchema,
   OneToOneChatCardSchema,
+  OneToOneChatDetailSchema,
 } from "@/types/chat.types";
 import { privateAxios } from "./axios";
 import { ENDPOINT } from "./urls";
@@ -36,3 +39,33 @@ export const getOnetoOneRoomList = async () => {
   );
   return res.data.data;
 };
+
+/**
+ * 1:1 채팅방 디테일 조회
+ */
+export const getOnetoOneRoomDetail = async (chatroomId: number) => {
+  const res = await privateAxios.get<ApiSuccess<OneToOneChatDetailSchema>>(
+    ENDPOINT.CHAT_ROOM.DETAIL.ONE_TO_ONE(chatroomId)
+  );
+  return res.data.data;
+};
+
+/**
+ * 그룹 채팅방 목록 조회
+ */
+export const getGroupRoomList = async () => {
+  const res = await privateAxios.get<ApiSuccess<GroupChatCardSchema[]>>(
+    ENDPOINT.CHAT_ROOM.GROUP
+  );
+  return res.data.data;
+};
+
+/**
+ * 그룹 채팅방 디테일 조회
+ */
+export const getGroupRoomDetail = async (chatroomId: number) => {
+  const res = await privateAxios.get<ApiSuccess<GroupChatDetailSchema>>(
+    ENDPOINT.CHAT_ROOM.DETAIL.GROUP(chatroomId)
+  );
+  return res.data.data;
+};

TinyBite/api/partyApi.ts

@@ -166,9 +166,17 @@ export const patchParty = async ({
 /* 참여중인 파티 리스트 조회 API
  * @returns 참여중인 파티 리스트
  */
-export const getActiveParties = async (): Promise<PartyItem[]> => {
+export const getActiveParties = async (
+  latitude: number | undefined,
+  longitude: number | undefined
+): Promise<PartyItem[]> => {
   try {
-    const res = await privateAxios.get(ENDPOINT.USER.ACTIVE_PARTIES);
+    const res = await privateAxios.get(ENDPOINT.USER.ACTIVE_PARTIES, {
+      params: {
+        latitude,
+        longitude,
+      },
+    });
     return res.data || [];
   } catch (error) {
     console.error("참여중인 파티 리스트 로딩 실패:", error);
@@ -180,9 +188,17 @@ export const getActiveParties = async (): Promise<PartyItem[]> => {
  * 호스팅 중인 파티 리스트 조회 API
  * @returns 호스팅 중인 파티 리스트
  */
-export const getHostingParties = async (): Promise<PartyItem[]> => {
+export const getHostingParties = async (
+  latitude: number | undefined,
+  longitude: number | undefined
+): Promise<PartyItem[]> => {
   try {
-    const res = await privateAxios.get(ENDPOINT.USER.HOSTING_PARTIES);
+    const res = await privateAxios.get(ENDPOINT.USER.HOSTING_PARTIES, {
+      params: {
+        latitude,
+        longitude,
+      },
+    });
     return res.data || [];
   } catch (error) {
     console.error("호스팅 중인 파티 리스트 로딩 실패:", error);
@@ -270,3 +286,41 @@ export const postRequestJoinParty = async (partyId: number) => {
 
   return res.data.data;
 };
+
+/**
+ * 파티 참여 승인
+ */
+export const postApproveJoinParty = async (
+  partyId: number,
+  participantId: number
+) => {
+  await privateAxios.post<ApiSuccess<void>>(
+    ENDPOINT.PARTY.PARTICIPANTS.APPROVE(partyId, participantId)
+  );
+};
+
+/**
+ * 파티 참여 거절
+ */
+export const postRejectJoinParty = async (
+  partyId: number,
+  participantId: number
+) => {
+  await privateAxios.post<ApiSuccess<void>>(
+    ENDPOINT.PARTY.PARTICIPANTS.REJECT(partyId, participantId)
+  );
+};
+
+/**
+ * 파티 인원 모집 완료
+ */
+export const postCompleteParty = async (partyId: number) => {
+  await privateAxios.patch<ApiSuccess<void>>(ENDPOINT.PARTY.COMPLETE(partyId));
+};
+
+/**
+ * 파티 종료
+ */
+export const postSettleParty = async (partyId: number) => {
+  await privateAxios.post<ApiSuccess<void>>(ENDPOINT.PARTY.SETTLE(partyId));
+};

TinyBite/api/urls.ts

@@ -28,6 +28,14 @@ export const ENDPOINT = {
     SEARCH_LOG: "/api/parties/search/log",
     SEARCH_LOG_DELETE: (keyword: string) =>
       `/api/parties/search/log/${keyword}`,
+    PARTICIPANTS: {
+      APPROVE: (partyId: number, participantId: number) =>
+        `/api/parties/${partyId}/participants/${participantId}/approve`,
+      REJECT: (partyId: number, participantId: number) =>
+        `/api/parties/${partyId}/participants/${participantId}/reject`,
+    },
+    COMPLETE: (partyId: number) => `/api/parties/${partyId}/complete`,
+    SETTLE: (partyId: number) => `/api/parties/${partyId}/settle`,
   },
   FILE: {
     UPLOAD_FILE: "api/v1/file/upload",
@@ -47,8 +55,15 @@ export const ENDPOINT = {
     WS_SEND: "/publish/send",
   },
   CHAT_ROOM: {
+    // 채팅방 리스트 조회
     ONE_TO_ONE: "/api/v1/chatroom/one-to-one",
     GROUP: "/api/v1/chatroom/group",
+    // 채팅방 정보 조회
+    DETAIL: {
+      ONE_TO_ONE: (chatroomId: number) =>
+        `/api/v1/chatroom/one-to-one/${chatroomId}`,
+      GROUP: (chatroomId: number) => `/api/v1/chatroom/group/${chatroomId}`,
+    },
   },
   FCM: {
     TOKEN: "/api/v1/fcm/token",

TinyBite/app.config.js

@@ -4,7 +4,7 @@ module.exports = {
   name: "한입만",
   slug: "TinyBite",
   owner: "tinybite-2025",
-  version: "0.4.0",
+  version: "0.9.0",
   orientation: "portrait",
   icon: "./assets/images/icon.png",
   scheme: "tinybite",

TinyBite/app/(tabs)/chat.tsx → TinyBite/app/(app)/(tabs)/chat.tsx

@@ -1,10 +1,17 @@
 import ChatCard from "@/components/chat/ChatCard";
-import { useGetOnetoOneRoomListQuery } from "@/hooks/queries/useChatRoom";
+import {
+  useGetGroupRoomListQuery,
+  useGetOnetoOneRoomListQuery,
+} from "@/hooks/queries/useChatRoom";
 import { colors } from "@/styles/colors";
 import { textStyles } from "@/styles/typography/textStyles";
-import { OneToOneChatCardSchema } from "@/types/chat.types";
+import {
+  FilterTab,
+  GroupChatCardSchema,
+  OneToOneChatCardSchema,
+} from "@/types/chat.types";
 import { useFocusEffect } from "expo-router";
-import { useCallback, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import {
   FlatList,
   Image,
@@ -15,10 +22,24 @@ import {
 } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 
+// 필터 탭 목록
+const filters: FilterTab[] = ["전체", "참여중인 파티", "1:1 채팅"];
+
+/**
+ * 채팅 아이템 렌더링 함수
+ */
+const renderChatItem = ({
+  item,
+}: {
+  item: OneToOneChatCardSchema | GroupChatCardSchema;
+}) => {
+  return <ChatCard item={item} />;
+};
+
 /**
- * 필터 탭 타입 정의
+ * 아이템 구분선 컴포넌트 (80% 너비)
  */
-type FilterTab = "전체" | "참여중인 파티" | "1:1 채팅";
+const ItemSeparator = () => <View style={styles.separator} />;
 
 /**
  * 채팅 화면 컴포넌트
@@ -27,51 +48,31 @@ type FilterTab = "전체" | "참여중인 파티" | "1:1 채팅";
  * - 채팅 리스트: 사용자별 채팅 아이템 표시
  */
 export default function ChatScreen() {
-  const { data: onetoOneRoomList = [], refetch } =
-    useGetOnetoOneRoomListQuery();
+  const [selectedFilter, setSelectedFilter] = useState<FilterTab>("전체");
+
+  const groupQuery = useGetGroupRoomListQuery();
+  const oneToOneQuery = useGetOnetoOneRoomListQuery();
 
   useFocusEffect(
     useCallback(() => {
-      refetch();
-    }, [refetch])
+      groupQuery.refetch();
+      oneToOneQuery.refetch();
+    }, [])
   );
 
-  // 선택된 필터 탭 상태
-  const [selectedFilter, setSelectedFilter] = useState<FilterTab>("전체");
-
-  // 필터 탭 목록
-  const filters: FilterTab[] = ["전체", "참여중인 파티", "1:1 채팅"];
+  const mergedData = useMemo(() => {
+    return [...(groupQuery.data ?? []), ...(oneToOneQuery.data ?? [])];
+  }, [groupQuery.data, oneToOneQuery.data]);
 
   /**
    * 필터에 맞는 데이터 필터링
    */
-  const filteredData: OneToOneChatCardSchema[] = onetoOneRoomList.filter(
-    (item) => {
+  const filteredData: (OneToOneChatCardSchema | GroupChatCardSchema)[] =
+    mergedData.filter((item) => {
       if (selectedFilter === "전체") return true;
+      if (selectedFilter === "참여중인 파티") return item.roomType === "GROUP";
       if (selectedFilter === "1:1 채팅") return item.roomType === "ONE_TO_ONE";
-      if (selectedFilter === "참여중인 파티") return item.roomType === "Group";
-      return true;
-    }
-  );
-  // .map((item) => ({
-  //   id: item.chatRoomId,
-  //   lastMessage: item.recentMessage,
-  //   timestamp: item.recentTime,
-  //   targetName: item.partyTitle || "", // Add missing required property
-  //   ...item,
-  // }));
-
-  /**
-   * 채팅 아이템 렌더링 함수
-   */
-  const renderChatItem = ({ item }: { item: OneToOneChatCardSchema }) => {
-    return <ChatCard item={item} />;
-  };
-
-  /**
-   * 아이템 구분선 컴포넌트 (80% 너비)
-   */
-  const ItemSeparator = () => <View style={styles.separator} />;
+    });
 
   return (
     <View style={styles.container}>
@@ -156,6 +157,7 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: colors.background,
   },
+
   // 상단 SafeArea 배경색 (메인 색상)
   safeAreaTop: {
     backgroundColor: colors.main,
@@ -224,8 +226,7 @@ const styles = StyleSheet.create({
   separator: {
     height: 1,
     backgroundColor: colors.gray[4],
-    marginLeft: "10%",
-    marginRight: "10%",
+    marginHorizontal: 20,
   },
   // 빈 상태 컨테이너
   emptyContainer: {