From 348c85f77e28e374b56ed0034bce0953cf7bd137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= Date: Mon, 23 Dec 2024 10:23:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Refact:=20user-block,=20user-report=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=EC=84=9C=EC=9D=98=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/user-block/index.ts | 6 +++--- src/apis/user-report/index.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/apis/user-block/index.ts b/src/apis/user-block/index.ts index d4c4c6ca..ff97f4b7 100644 --- a/src/apis/user-block/index.ts +++ b/src/apis/user-block/index.ts @@ -1,6 +1,6 @@ -import { PostUserBlockRequest } from './dto'; -import { EmptySuccessResponse } from '../core/dto'; -import { newRequest } from '../core'; +import { EmptySuccessResponse } from '@apis/core/dto'; +import { newRequest } from '@apis/core'; +import type { PostUserBlockRequest } from './dto'; // 유저 차단 api export const postUserBlockApi = (data: PostUserBlockRequest) => diff --git a/src/apis/user-report/index.ts b/src/apis/user-report/index.ts index 2983fdf0..20155d76 100644 --- a/src/apis/user-report/index.ts +++ b/src/apis/user-report/index.ts @@ -1,6 +1,6 @@ -import { PostUserReportRequest } from './dto'; -import { EmptySuccessResponse } from '../core/dto'; -import { newRequest } from '../core'; +import { EmptySuccessResponse } from '@apis/core/dto'; +import { newRequest } from '@apis/core'; +import type { PostUserReportRequest } from './dto'; // 유저 신고 api export const postUserReportApi = (data: PostUserReportRequest) => From ed411fa5a9ddf2c368c856d633ecf2981d276c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= Date: Sat, 28 Dec 2024 17:03:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Refact:=20api=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/user-block/dto.ts | 4 ++-- src/apis/user-report/dto.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apis/user-block/dto.ts b/src/apis/user-block/dto.ts index ed8a314a..f5ba92bb 100644 --- a/src/apis/user-block/dto.ts +++ b/src/apis/user-block/dto.ts @@ -1,6 +1,6 @@ // 차단/해제 요청 데이터 export interface PostUserBlockRequest { - fromUserId: number; - toUserId: number; + requesterId: number; + targetId: number; action: 'block' | 'unblock'; // 차단 또는 해제 } diff --git a/src/apis/user-report/dto.ts b/src/apis/user-report/dto.ts index dcf4ad7f..6c6add04 100644 --- a/src/apis/user-report/dto.ts +++ b/src/apis/user-report/dto.ts @@ -1,6 +1,6 @@ // 사용자 신고 요청 데이터 export interface PostUserReportRequest { - fromUserId: number; - toUserId: number; + requesterId: number; + targetId: number; reason: string; } From e6da535c60b4cf7cde08daf74ae2760994ec40d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= Date: Sat, 28 Dec 2024 17:21:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0,=20=EB=B3=80=EA=B2=BD=EB=90=9C?= =?UTF-8?q?=20user-block=20user-report=20request=20=ED=98=95=EC=8B=9D?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EC=9D=B4=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=9D=84=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=93=A4=EC=9D=98=20request=20data=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BottomSheet/OptionsBottomSheet/index.tsx | 8 ++++---- .../PostBase/LikeCommentBottomSheetContent/index.tsx | 4 ++-- src/pages/Chats/ChatRoom/index.tsx | 4 ++-- src/pages/Home/OOTD/Feed/index.tsx | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/BottomSheet/OptionsBottomSheet/index.tsx b/src/components/BottomSheet/OptionsBottomSheet/index.tsx index 454ff160..3ee66ca0 100644 --- a/src/components/BottomSheet/OptionsBottomSheet/index.tsx +++ b/src/components/BottomSheet/OptionsBottomSheet/index.tsx @@ -59,8 +59,8 @@ const OptionsBottomSheet: React.FC = ({ const postUserBlock = async () => { try { const request: PostUserBlockRequest = { - fromUserId: currentUserId, - toUserId: targetId.userId || -1, + requesterId: currentUserId, + targetId: targetId.userId || -1, action: 'block', }; const response = await postUserBlockApi(request); @@ -84,8 +84,8 @@ const OptionsBottomSheet: React.FC = ({ if (domain === 'user') { reportData = { - fromUserId: currentUserId, - toUserId: targetId.userId || -1, + requesterId: currentUserId, + targetId: targetId.userId || -1, reason: reason, }; } else { diff --git a/src/components/PostBase/LikeCommentBottomSheetContent/index.tsx b/src/components/PostBase/LikeCommentBottomSheetContent/index.tsx index fb56b4d6..91d4eaf7 100644 --- a/src/components/PostBase/LikeCommentBottomSheetContent/index.tsx +++ b/src/components/PostBase/LikeCommentBottomSheetContent/index.tsx @@ -213,8 +213,8 @@ const LikeCommentBottomSheetContent: React.FC = ({ try { const blockRequest: PostUserBlockRequest = { - fromUserId: Number(storedUserId), - toUserId: selectedComment.user.id, + requesterId: Number(storedUserId), + targetId: selectedComment.user.id, action: 'block', }; diff --git a/src/pages/Chats/ChatRoom/index.tsx b/src/pages/Chats/ChatRoom/index.tsx index 3ef4132a..6a01fccb 100644 --- a/src/pages/Chats/ChatRoom/index.tsx +++ b/src/pages/Chats/ChatRoom/index.tsx @@ -74,8 +74,8 @@ const ChatRoom: React.FC = () => { const postUserBlock = async () => { try { const data: PostUserBlockRequest = { - fromUserId: currentUserId, - toUserId: opponentInfo?.id || -1, + requesterId: currentUserId, + targetId: opponentInfo?.id || -1, action: 'block', }; const response = await postUserBlockApi(data); diff --git a/src/pages/Home/OOTD/Feed/index.tsx b/src/pages/Home/OOTD/Feed/index.tsx index 4d6be4ed..e429e0f2 100644 --- a/src/pages/Home/OOTD/Feed/index.tsx +++ b/src/pages/Home/OOTD/Feed/index.tsx @@ -111,8 +111,8 @@ const Feed: React.FC = ({ feed }) => { const postUserBlock = async () => { try { const data: PostUserBlockRequest = { - fromUserId: currentUserId || -1, - toUserId: feed.user.id, + requesterId: currentUserId || -1, + targetId: feed.user.id, action: 'block', }; const response = await postUserBlockApi(data);