Merge pull request #85 from modern-agile-team/feature/acceptAndRefuse/#…

…83 Add(DongGun/ListResponse) : 친구요청 수락, 거절 기능 구현
modern-agile-team · Nov 15, 2023 · 3b78193 · 3b78193
2 parents d8e598b + 9aeca22
commit 3b78193
Show file tree

Hide file tree

Showing 20 changed files with 553 additions and 407 deletions.
diff --git a/src/apis/friend-api/friendList.ts b/src/apis/friend-api/friendList.ts
@@ -1,28 +1,30 @@
 import instance from '../axiosInstance';
 import { Axios, AxiosResponse, AxiosError } from 'axios';
 
-export interface Friend {
-  data: {
-    id: number;
-    requesterId: number; //요청 보낸 자
-    respondentId: number; // 요청 받은 자
-    status: string; // 서로의 상태값(수락, 대기, 영구거절 등)
-    createAt: string; // 상태가 변경된 때.
-    requester: {
-      // 요청 보낸 자
-      name: string;
-      userImage: {
-        imageUrl: string;
-      };
+interface FriendData {
+  id: number;
+  requesterId: number; //요청 보낸 자
+  respondentId: number; // 요청 받은 자
+  status: string; // 서로의 상태값(수락, 대기, 영구거절 등)
+  createAt: string; // 상태가 변경된 때.
+  requester: {
+    // 요청 보낸 자
+    name: string;
+    userImage: {
+      imageUrl: string;
     };
-    respondent: {
-      // 요청 받은 자
-      name: string;
-      userImage: {
-        imageUrl: string;
-      };
+  };
+  respondent: {
+    // 요청 받은 자
+    name: string;
+    userImage: {
+      imageUrl: string;
     };
-  }[];
+  };
+}
+
+export interface Friend {
+  data: FriendData[];
 }
 
 const FRIENDS = {
@@ -33,46 +35,27 @@ const FRIENDS = {
     const result: AxiosResponse<Friend[]> = await instance.post(
       `${FRIENDS.path}/requests/${friendId}`,
       {
-        friendId: friendId,
+        params: {
+          friend_id: friendId,
+        },
       },
     );
     return result;
   },
 
   // 친구 목록 조회 api(get)
-  async friendList(): Promise<any> {
+  async getFriendList(): Promise<any> {
     const result: AxiosResponse<any> = await instance.get(`${FRIENDS.path}`);
     return result.data;
   },
 
-  // 차단 목록(영구 거절) api(get)
-  async rejectList(): Promise<AxiosResponse<Friend[]>> {
-    const result: AxiosResponse<Friend[]> = await instance.get(
-      `${FRIENDS.path}/responses/reject/permanent`,
-    );
-    return result;
-  },
-
-  // 친구 요청 영구 거절 취소 api(delete)
-  async cancelPermanent(friendId: number): Promise<AxiosResponse<Friend[]>> {
-    const result: AxiosResponse<Friend[]> = await instance.delete(
-      `${FRIENDS.path}/reponses/reject/permanent/${friendId}`,
-      {
-        data: {
-          friendId: friendId,
-        },
-      },
-    );
-    return result;
-  },
-
   // 친구 삭제 api(delete)
-  async deleteFriend(friendId: number): Promise<AxiosResponse<Friend[]>> {
-    const result: AxiosResponse<Friend[]> = await instance.delete(
+  async deleteFriend(friendId: number): Promise<any> {
+    const result: AxiosResponse<any> = await instance.delete(
       `${FRIENDS.path}/${friendId}`,
       {
-        data: {
-          friendId: friendId,
+        params: {
+          friend_Id: friendId,
         },
       },
     );

diff --git a/src/apis/friend-api/friendListDummy.ts b/src/apis/friend-api/friendListDummy.ts
diff --git a/src/apis/friend-api/friendRejectPermanent.ts b/src/apis/friend-api/friendRejectPermanent.ts
@@ -0,0 +1,47 @@
+import instance from '../axiosInstance';
+import { AxiosResponse } from 'axios';
+
+interface RejectPermanentFriendData {
+  id: number;
+  requesterId: number;
+  respondentId: number;
+  status: string;
+  createdAt: string;
+  requester: {
+    name: string;
+    userImage: {
+      imageUrl: string;
+    };
+  };
+}
+
+export interface RejectPermanentFriend {
+  data: RejectPermanentFriendData[];
+}
+
+const PermanentREJECT = {
+  path: '/friends',
+
+  // 영구 거절한 목록 api(get)
+  async getRejectPermanentFriendList(): Promise<any> {
+    const result: AxiosResponse<any> = await instance.get(
+      `${PermanentREJECT.path}/responses/reject/permanent`,
+    );
+    return result.data;
+  },
+
+  // 친구 요청 영구 거절 취소 api(delete)
+  async cancelPermanentRejectFriend(friendId: number): Promise<any> {
+    const result: AxiosResponse<any> = await instance.delete(
+      `${PermanentREJECT.path}/responses/reject/permanent/${friendId}`,
+      {
+        params: {
+          friend_Id: friendId,
+        },
+      },
+    );
+    return result;
+  },
+};
+
+export default PermanentREJECT;
diff --git a/src/apis/friend-api/friendRequest.ts b/src/apis/friend-api/friendRequest.ts
@@ -1,31 +1,33 @@
 import instance from '../axiosInstance';
 import { AxiosResponse } from 'axios';
 
-export interface RequestFriend {
-  data: {
-    id: number;
-    requesterId: number;
-    respondentId: number;
-    status: string;
-    createdAt: string;
-    respondent: {
-      name: string;
-      userImage: {
-        imageUrl: string;
-      };
+interface RequestFriendData {
+  id: number;
+  requesterId: number;
+  respondentId: number;
+  status: string;
+  createdAt: string;
+  respondent: {
+    name: string;
+    userImage: {
+      imageUrl: string;
     };
-  }[];
+  };
+}
+
+export interface RequestFriend {
+  data: RequestFriendData[];
 }
 
-const REQUEST = {
+const FriendREQUEST = {
   path: '/friends',
   // 내가 요청 보낸 친구 목록 api(get)
-  async requestedList(): Promise<any> {
+  async getRequestedList(): Promise<any> {
     const result: AxiosResponse<any> = await instance.get(
-      `${REQUEST.path}/requests/pending`,
+      `${FriendREQUEST.path}/requests/pending`,
     );
     return result.data;
   },
 };
 
-export default REQUEST;
+export default FriendREQUEST;
diff --git a/src/apis/friend-api/friendResponse.ts b/src/apis/friend-api/friendResponse.ts
@@ -1,65 +1,71 @@
 import instance from '../axiosInstance';
 import { AxiosResponse } from 'axios';
 
-export interface ResponseFriend {
-  data: {
-    id: number;
-    requesterId: number;
-    respondentId: number;
-    status: string;
-    createdAt: string;
-    requester: {
-      name: string;
-      userImage: {
-        imageUrl: string;
-      };
+export interface ResponseFriendData {
+  id: number;
+  requesterId: number;
+  respondentId: number;
+  status: string;
+  createdAt: string;
+  requester: {
+    name: string;
+    userImage: {
+      imageUrl: string;
     };
-  }[];
+  };
+}
+export interface ResponseFriend {
+  data: ResponseFriendData[];
 }
 
-const RESPONSE = {
+const FriendRESPONSE = {
   path: '/friends',
   // 내가 요청 받은 친구 목록 api(get)
-  async responsedList(): Promise<any> {
+  async getResponsedList(): Promise<any> {
     const result: AxiosResponse<any> = await instance.get(
-      `${RESPONSE.path}/responses/pending`,
+      `${FriendRESPONSE.path}/responses/pending`,
     );
-    console.log(result);
     return result.data;
   },
 
   // 친구 요청 수락 api(patch)
-  async friendAccept(requesterId: number): Promise<any> {
+  async friendAccept(friendId: number): Promise<any> {
     const result: AxiosResponse<any> = await instance.patch(
-      `${RESPONSE.path}/reponses/accept/${requesterId}`,
+      `${FriendRESPONSE.path}/responses/accept/${friendId}`,
       {
-        requesterId: requesterId,
+        params: {
+          friend_id: friendId,
+        },
       },
     );
     return result;
   },
 
   // 친구 요청 거절 api(patch)
-  async friendRefuse(friendId: number): Promise<any> {
+  async friendReject(friendId: number): Promise<any> {
     const result: AxiosResponse<any> = await instance.patch(
-      `${RESPONSE.path}/reponses/reject/${friendId}`,
+      `${FriendRESPONSE.path}/responses/reject/${friendId}`,
       {
-        friendId: friendId,
+        params: {
+          friend_Id: friendId,
+        },
       },
     );
     return result;
   },
 
   // 친구 요청 영구 거절 api(patch)
-  async friendReject(friendId: number): Promise<any> {
+  async friendRejectPermanent(friendId: number): Promise<any> {
     const result: AxiosResponse<any> = await instance.patch(
-      `${RESPONSE.path}/reponses/reject/permanent/${friendId}`,
+      `${FriendRESPONSE.path}/responses/reject/permanent/${friendId}`,
       {
-        friendId: friendId,
+        params: {
+          friend_Id: friendId,
+        },
       },
     );
     return result;
   },
 };
 
-export default RESPONSE;
+export default FriendRESPONSE;
diff --git a/src/apis/user.ts b/src/apis/user.ts
@@ -16,8 +16,17 @@ const USERS = {
 
   //유저정보조회api
   async getUserProfile(): Promise<UserInfo> {
-    const result: AxiosResponse = await instance.get(`${USERS.path}/my-info`);
-    return result.data;
+    try {
+      const result: AxiosResponse = await instance.get(`${USERS.path}/my-info`);
+      return result.data;
+    } catch (error: any) {
+      if (error.response && error.response.status === 403) {
+        // 403 에러 발생 시 로그인하지 않은 상태로 간주하고 빈 객체 반환
+        return {} as UserInfo;
+      }
+      // 다른 에러는 그대로 throw
+      throw error;
+    }
   },
 };