Merge pull request #172 from prgrms-web-devcourse-final-project/feat/#…

…150

Feat/#150 굿즈, 메이트 채팅 연동, 리스트 데이터 산출

index.html

@@ -27,5 +27,8 @@
       type="module"
       src="/src/main.tsx"
     ></script>
+    <script>
+      const global = globalThis
+    </script>
   </body>
 </html>

package.json

@@ -23,6 +23,7 @@
     "react-kakao-maps-sdk": "^1.1.27",
     "react-loading-skeleton": "^3.5.0",
     "react-router-dom": "^6.28.0",
+    "sockjs-client": "^1.6.1",
     "styled-components": "^6.1.13",
     "styled-normalize": "^8.1.1",
     "swiper": "^11.1.14",
@@ -33,6 +34,7 @@
     "@types/node": "^22.9.0",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
+    "@types/sockjs-client": "^1.5.4",
     "@typescript-eslint/parser": "^7.0.0",
     "@vitejs/plugin-react": "^4.3.3",
     "eslint": "^8.2.0",

src/apis/goodsChatService.ts

@@ -1,29 +1,35 @@
+import {
+  GoodsChatParticipantResponse,
+  GoodsChatroom,
+  GoodsChatroomResponse,
+} from '@typings/db'
 import fetchApi from './ky'
 
 const goodsChatService = {
-  createGoodsChatroom: async (buyerId: number, goodsPostId: number) => {
+  createGoodsChatroom: async (buyerId: number, goodsPostId: string) => {
     const response = await fetchApi
       .post(`goods/chat?buyerId=${buyerId}&goodsPostId=${goodsPostId}`)
       .json()
 
     return response
   },
 
-  getGoodsChatList: async (memberId: number, page: number, size: number) => {
+  // 채팅 페이지 => 채팅방 목록
+  getGoodsChatroomList: async (page: number, size: number) => {
     const response = await fetchApi
-      .get(`goods/chat?memberId=${memberId}&page=${page}&size=${size}`)
+      .get<GoodsChatroomResponse>(`goods/chat?page=${page}&size=${size}`)
       .json()
 
-    return response
+    return response.data
   },
 
   // 채팅 페이지 => 채팅방 상세
-  getGoodsChatroom: async (chatRoomId: number, memberId: number) => {
+  getGoodsChatroom: async (chatRoomId: string) => {
     const response = await fetchApi
-      .get(`goods/chat/${chatRoomId}?memberId=${memberId}`)
+      .get<GoodsChatroomResponse>(`goods/chat/${chatRoomId}`)
       .json()
 
-    return response
+    return response.data
   },
 
   getChatList: async (
@@ -41,20 +47,18 @@ const goodsChatService = {
     return response
   },
 
-  exitGoodsChat: async (chatRoomId: number, memberId: number) => {
-    const response = await fetchApi
-      .delete(`goods/chat/${chatRoomId}?memberId=${memberId}`)
-      .json()
+  exitGoodsChat: async (chatRoomId: string) => {
+    const response = await fetchApi.delete(`goods/chat/${chatRoomId}`).json()
 
     return response
   },
 
-  goodsParticipantList: async (chatRoomId: number, memberId: number) => {
+  goodsParticipantList: async (chatRoomId: string) => {
     const response = await fetchApi
-      .get(`goods/chat/${chatRoomId}/members?memberId=${memberId}`)
+      .get<GoodsChatParticipantResponse>(`goods/chat/${chatRoomId}/members`)
       .json()
 
-    return response
+    return response.data
   },
 }
 

src/apis/goodsPostService.ts

@@ -1,21 +1,15 @@
 import { GoodsDetailResponse, GoodsListResponse } from '@typings/db'
 import fetchApi from './ky'
 const goodsPostService = {
-  postGoodsPost: async (memberId: number, formData: FormData) => {
-    const response = await fetchApi
-      .post(`goods/${memberId}`, { body: formData })
-      .json()
+  postGoodsPost: async (formData: FormData) => {
+    const response = await fetchApi.post(`goods`, { body: formData }).json()
 
     return response
   },
 
-  editGoodsPost: async (
-    memberId: number,
-    goodsId: number,
-    formData: FormData,
-  ) => {
+  editGoodsPost: async (goodsId: number, formData: FormData) => {
     const response = await fetchApi
-      .put(`goods/${memberId}/post/${goodsId}`, { body: formData })
+      .put(`goods/${goodsId}`, { body: formData })
       .json()
 
     return response
@@ -35,21 +29,15 @@ const goodsPostService = {
     return response
   },
 
-  deleteGoodsPost: async (memberId: number, goodsPostId: number) => {
-    const response = await fetchApi
-      .delete(`goods/${memberId}/post/${goodsPostId}`)
-      .json()
+  deleteGoodsPost: async (goodsPostId: number) => {
+    const response = await fetchApi.delete(`goods/${goodsPostId}`).json()
 
     return response
   },
 
-  completeGoodsPost: async (
-    memberId: number,
-    goodsPostId: number,
-    buyerId: number,
-  ) => {
+  completeGoodsPost: async (goodsPostId: string, buyerId: string) => {
     const response = await fetchApi
-      .post(`goods/${memberId}/post/${goodsPostId}/complete?buyerId=${buyerId}`)
+      .post(`goods/${goodsPostId}/complete?buyerId=${buyerId}`)
       .json()
 
     return response