Skip to content

Commit 7674b8b

Browse files
authored
Merge pull request #114 from oodd-team/feat/OD-156
[OD-156] user-block, user-report 도메인 request 수정
2 parents 937d340 + e6da535 commit 7674b8b

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

src/apis/user-block/dto.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 차단/해제 요청 데이터
22
export interface PostUserBlockRequest {
3-
fromUserId: number;
4-
toUserId: number;
3+
requesterId: number;
4+
targetId: number;
55
action: 'block' | 'unblock'; // 차단 또는 해제
66
}

src/apis/user-block/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PostUserBlockRequest } from './dto';
2-
import { EmptySuccessResponse } from '../core/dto';
3-
import { newRequest } from '../core';
1+
import { EmptySuccessResponse } from '@apis/core/dto';
2+
import { newRequest } from '@apis/core';
3+
import type { PostUserBlockRequest } from './dto';
44

55
// 유저 차단 api
66
export const postUserBlockApi = (data: PostUserBlockRequest) =>

src/apis/user-report/dto.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 사용자 신고 요청 데이터
22
export interface PostUserReportRequest {
3-
fromUserId: number;
4-
toUserId: number;
3+
requesterId: number;
4+
targetId: number;
55
reason: string;
66
}

src/apis/user-report/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PostUserReportRequest } from './dto';
2-
import { EmptySuccessResponse } from '../core/dto';
3-
import { newRequest } from '../core';
1+
import { EmptySuccessResponse } from '@apis/core/dto';
2+
import { newRequest } from '@apis/core';
3+
import type { PostUserReportRequest } from './dto';
44

55
// 유저 신고 api
66
export const postUserReportApi = (data: PostUserReportRequest) =>

src/components/BottomSheet/OptionsBottomSheet/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const OptionsBottomSheet: React.FC<OptionsBottomSheetProps> = ({
5959
const postUserBlock = async () => {
6060
try {
6161
const request: PostUserBlockRequest = {
62-
fromUserId: currentUserId,
63-
toUserId: targetId.userId || -1,
62+
requesterId: currentUserId,
63+
targetId: targetId.userId || -1,
6464
action: 'block',
6565
};
6666
const response = await postUserBlockApi(request);
@@ -84,8 +84,8 @@ const OptionsBottomSheet: React.FC<OptionsBottomSheetProps> = ({
8484

8585
if (domain === 'user') {
8686
reportData = {
87-
fromUserId: currentUserId,
88-
toUserId: targetId.userId || -1,
87+
requesterId: currentUserId,
88+
targetId: targetId.userId || -1,
8989
reason: reason,
9090
};
9191
} else {

src/components/PostBase/LikeCommentBottomSheetContent/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ const LikeCommentBottomSheetContent: React.FC<LikeCommentBottomSheetProps> = ({
213213

214214
try {
215215
const blockRequest: PostUserBlockRequest = {
216-
fromUserId: Number(storedUserId),
217-
toUserId: selectedComment.user.id,
216+
requesterId: Number(storedUserId),
217+
targetId: selectedComment.user.id,
218218
action: 'block',
219219
};
220220

src/pages/Chats/ChatRoom/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ const ChatRoom: React.FC = () => {
7474
const postUserBlock = async () => {
7575
try {
7676
const data: PostUserBlockRequest = {
77-
fromUserId: currentUserId,
78-
toUserId: opponentInfo?.id || -1,
77+
requesterId: currentUserId,
78+
targetId: opponentInfo?.id || -1,
7979
action: 'block',
8080
};
8181
const response = await postUserBlockApi(data);

src/pages/Home/OOTD/Feed/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ const Feed: React.FC<FeedProps> = ({ feed }) => {
111111
const postUserBlock = async () => {
112112
try {
113113
const data: PostUserBlockRequest = {
114-
fromUserId: currentUserId || -1,
115-
toUserId: feed.user.id,
114+
requesterId: currentUserId || -1,
115+
targetId: feed.user.id,
116116
action: 'block',
117117
};
118118
const response = await postUserBlockApi(data);

0 commit comments

Comments
 (0)