Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react into feat/OD-131

Author: mimizae

.github/workflows/prod_cicd.yml

@@ -36,7 +36,7 @@ jobs:
           echo "VITE_GOOGLE_CLIENT_ID=${{ secrets.VITE_GOOGLE_CLIENT_ID }}" >> .env
           echo "VITE_GOOGLE_CLIENT_SECRET=${{ secrets.VITE_GOOGLE_CLIENT_SECRET }}" >> .env
 
-      - run: yarn build-prod
+      - run: yarn build
 
       - name: deploy to s3
         uses: jakejarvis/s3-sync-action@master

src/apis/auth/dto.ts

@@ -4,7 +4,7 @@ import { BaseSuccessResponse } from '../core/dto';
 export type getUserInfoByJwtResponse = BaseSuccessResponse<getUserInfoByJwtData>;
 // jwt를 이용한 사용자 정보 조회 응답 데이터
 export interface getUserInfoByJwtData {
-	userId: string;
+	userId: number;
 	name: string;
 	phoneNumber: string;
 	email: string;

src/apis/post-comment/dto.ts

@@ -29,7 +29,7 @@ export interface Comment {
 
 // 댓글 관련 User 정보
 export interface CommentUser {
-	userId: number;
+	id: number;
 	nickname: string;
 	profilePictureUrl: string;
 }

src/apis/post/dto.ts

@@ -30,12 +30,13 @@ export interface PostBase {
 }
 export interface CreatePostData extends PostBase {}
 export interface PostSummary {
-	postId: number;
+	id: number;
 	content: string;
 	postImages: PostImage[];
 	createdAt: Date;
 	isPostLike: boolean;
 	user: User;
+	requestStatus: boolean;
 }
 export interface GetPostListData {
 	post: PostSummary[];
@@ -72,12 +73,16 @@ export interface GetPostDetailData extends PostBase {
 	isPostWriter: boolean;
 }
 export interface User {
-	userId: number;
+	id: number;
 	nickname: string;
 	profilePictureUrl: string;
 }
 export interface PostImage {
-	imageUrl: string;
+	id?: number;
+	status?: string;
+	createdAt?: string;
+	updatedAt?: string;
+	url: string;
 	orderNum: number;
 }
 export interface PostClothing {

src/apis/user-block/dto.ts

@@ -0,0 +1,6 @@
+// 차단/해제 요청 데이터
+export interface PostUserBlockRequest {
+	fromUserId: number;
+	toUserId: number;
+	action: 'block' | 'unblock'; // 차단 또는 해제
+}

src/apis/user-block/index.ts

@@ -0,0 +1,7 @@
+import { PostUserBlockRequest } from './dto';
+import { EmptySuccessResponse } from '../core/dto';
+import { newRequest } from '../core';
+
+// 유저 차단 api
+export const postUserBlockApi = (data: PostUserBlockRequest) =>
+	newRequest.post<EmptySuccessResponse>('/user-block', data);

src/apis/user-report/dto.ts

@@ -0,0 +1,6 @@
+// 사용자 신고 요청 데이터
+export interface PostUserReportRequest {
+	fromUserId: number;
+	toUserId: number;
+	reason: string;
+}

src/apis/user-report/index.ts

@@ -0,0 +1,7 @@
+import { PostUserReportRequest } from './dto';
+import { EmptySuccessResponse } from '../core/dto';
+import { newRequest } from '../core';
+
+// 유저 신고 api
+export const postUserReportApi = (data: PostUserReportRequest) =>
+	newRequest.post<EmptySuccessResponse>('/user-report', data);

src/apis/user/dto.ts

@@ -2,34 +2,20 @@ import { BaseSuccessResponse } from '../core/dto';
 
 // 사용자 정보 공통 인터페이스
 export interface UserInfoData {
-	userId: string;
+	userId: number;
 	name: string;
 	phoneNumber: string;
 	email: string;
 	nickname: string;
 	profilePictureUrl: string;
 	bio: string;
-	joinedAt?: string; // user 공통 인터페이스에 이 두 개는 안 나와있어서 일단 이것들만 optional 처리했습니다...
-	isFriend?: boolean;
+	birthDate: string; // user 공통 인터페이스에 이 두 개는 안 나와있어서 일단 이것들만 optional 처리했습니다...
+	isFriend: boolean;
 }
 
 // 사용자 정보 조회 응답
 export type GetUserInfoResponse = BaseSuccessResponse<UserInfoData>;
 
-// 사용자 신고 요청 데이터
-export interface PostUserReportRequest {
-	fromUserId: number;
-	toUserId: number;
-	reason: string;
-}
-
-// 차단/해제 요청 데이터
-export interface PostUserBlockRequest {
-	fromUserId: number;
-	toUserId: number;
-	action: 'block' | 'unblock'; // 차단 또는 해제
-}
-
 // 사용자 정보 수정 응답
 export type PatchUserInfoResponse = BaseSuccessResponse<UserInfoData>;
 

src/apis/user/index.ts

@@ -1,28 +1,17 @@
-import {
-	PostUserBlockRequest,
-	PostUserReportRequest,
-	PatchUserInfoRequest,
-	PatchUserInfoResponse,
-	PatchUserWithDrawResponse,
-} from './dto';
+import { GetUserInfoResponse, PatchUserInfoRequest, PatchUserInfoResponse, PatchUserWithDrawResponse } from './dto';
 import { newRequest } from '../core';
 import { EmptySuccessResponse } from '../core/dto';
 
 // 유저 정보 수정 api
-export const patchUserInfoApi = (data: PatchUserInfoRequest, userId: string) =>
+export const patchUserInfoApi = (data: PatchUserInfoRequest, userId: number) =>
 	newRequest.patch<PatchUserInfoResponse>(`/user/${userId}`, data);
 
 // 유저 탈퇴 api
-export const patchUserWithdrawApi = (userId: string) =>
+export const patchUserWithdrawApi = (userId: number) =>
 	newRequest.patch<PatchUserWithDrawResponse>(`/user/${userId}/withdraw`);
 
-// 유저 차단 api
-export const postUserBlockApi = (data: PostUserBlockRequest) =>
-	newRequest.post<EmptySuccessResponse>('/user-block', data);
-
-// 유저 신고 api
-export const postUserReportApi = (data: PostUserReportRequest) =>
-	newRequest.post<EmptySuccessResponse>('/user-report', data);
-
 // 이용 약관 동의 api
-export const postTermsAgreementApi = (userId: string) => newRequest.post<EmptySuccessResponse>(`/user/${userId}`);
+export const postTermsAgreementApi = (userId: number) => newRequest.post<EmptySuccessResponse>(`/user/${userId}`);
+
+// 유저 정보 조회 api
+export const getUserInfoApi = (userId: number) => newRequest.get<GetUserInfoResponse>(`/user/${userId}`);