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

Author: xxinzzi

src/apis/auth/dto.ts

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

src/apis/auth/index.ts

@@ -1,5 +1,5 @@
-import { getUserInfoByJwtResponse } from './dto';
-import { newRequest } from '../core';
+import { newRequest } from '@apis/core';
+import type { getUserInfoByJwtResponse } from './dto';
 
 // jwt로 사용자 정보 조회 api /auth/me
 export const getUserInfoByJwtApi = () => newRequest.get<getUserInfoByJwtResponse>('/auth/me');

src/apis/user-block/index.ts

@@ -1,5 +1,5 @@
-import { EmptySuccessResponse } from '@apis/core/dto';
 import { newRequest } from '@apis/core';
+import type { EmptySuccessResponse } from '@apis/core/dto';
 import type { PostUserBlockRequest } from './dto';
 
 // 유저 차단 api

src/apis/user-report/index.ts

@@ -1,5 +1,5 @@
-import { EmptySuccessResponse } from '@apis/core/dto';
 import { newRequest } from '@apis/core';
+import type { EmptySuccessResponse } from '@apis/core/dto';
 import type { PostUserReportRequest } from './dto';
 
 // 유저 신고 api

src/apis/user/dto.ts

@@ -1,15 +1,15 @@
-import { BaseSuccessResponse } from '../core/dto';
+import type { BaseSuccessResponse } from '@apis/core/dto';
 
 // 사용자 정보 공통 인터페이스
 export interface UserInfoData {
-	userId: number;
+	id: number;
 	name: string;
 	phoneNumber: string;
 	email: string;
 	nickname: string;
 	profilePictureUrl: string;
 	bio: string;
-	birthDate: string; // user 공통 인터페이스에 이 두 개는 안 나와있어서 일단 이것들만 optional 처리했습니다...
+	birthDate: string;
 	isFriend: boolean;
 }
 
@@ -37,5 +37,5 @@ export type PatchUserWithDrawResponse = BaseSuccessResponse<PatchUserWithdrawDat
 export interface PatchUserWithdrawData {
 	isSuccess: boolean;
 	code: string;
-	data: Record<string, never>; // 탈퇴 성공 시 항상 빈 객체가 응답으로 온다면 Record<string, never>으로 타입 안정성 높일 수 있답니다
+	data: Record<string, never>; // 탈퇴 성공 시 항상 빈 객체가 응답으로 온다면 Record<string, never>으로 타입 안정성 높일 수 있음
 }

src/apis/user/index.ts

@@ -1,6 +1,11 @@
-import { GetUserInfoResponse, PatchUserInfoRequest, PatchUserInfoResponse, PatchUserWithDrawResponse } from './dto';
-import { newRequest } from '../core';
-import { EmptySuccessResponse } from '../core/dto';
+import { newRequest } from '@apis/core';
+import type { EmptySuccessResponse } from '@apis/core/dto';
+import type {
+	GetUserInfoResponse,
+	PatchUserInfoRequest,
+	PatchUserInfoResponse,
+	PatchUserWithDrawResponse,
+} from './dto';
 
 // 유저 정보 수정 api
 export const patchUserInfoApi = (data: Partial<PatchUserInfoRequest>, userId: number) =>

src/pages/Login/LoginComplete/index.tsx

@@ -43,13 +43,13 @@ const LoginComplete: React.FC = () => {
 					const response = await getUserInfoByJwtApi();
 					console.log(response);
 
-					const { nickname, name, userId } = response.data;
-					localStorage.setItem('current_user_id', `${userId}`);
+					const { nickname, name, id } = response.data;
+					localStorage.setItem('current_user_id', `${id}`);
 
 					if (nickname && name) {
 						if (nickname && name) {
-							const isAgreed = await hasAgreedToTerms(userId);
-							navigate(isAgreed ? '/' : '/terms-agreement'); // 이용 약관이 필요하면 (false) 해당 페이지로 이동
+							const isAgreed = await hasAgreedToTerms(id);
+							navigate(isAgreed ? '/' : '/signup/terms-agreement'); // 이용 약관이 필요하면 (false) 해당 페이지로 이동
 						}
 					} else {
 						navigate('/signup');

src/recoil/ProfileViewer/userDetailsAtom.ts

@@ -2,12 +2,12 @@ import { atom } from 'recoil';
 import type { UserInfoData } from '@apis/user/dto';
 import imageBasic from '@assets/default/defaultProfile.svg';
 
-type BasicUserInfo = Pick<UserInfoData, 'userId' | 'nickname' | 'bio' | 'isFriend' | 'profilePictureUrl'>;
+type BasicUserInfo = Pick<UserInfoData, 'id' | 'nickname' | 'bio' | 'isFriend' | 'profilePictureUrl'>;
 
 export const UserInfoAtom = atom<BasicUserInfo | null>({
 	key: 'UserInfoAtom',
 	default: {
-		userId: -1,
+		id: -1,
 		nickname: '알 수 없음',
 		bio: '',
 		isFriend: false,