refactor: 1차 리펙토링 코드 배포 브랜치 병합

src/@types/api.ts

@@ -3,11 +3,21 @@ export interface APIError extends Error {
   message: string;
 }
 
-export interface ApiResponse<T> {
+export interface FetcherError extends Error {
+  status?: number;
+}
+
+export interface BaseResponse<T> {
   status: string;
   data: T;
 }
 
-export interface FetcherError extends Error {
-  status?: number;
+export interface ListResponse<T> {
+  status: string;
+  data: {
+    content: T[];
+    total: number;
+    currentPage: number;
+    hasNext: boolean;
+  };
 }

src/@types/auth.ts

@@ -1,23 +1,18 @@
-interface TextInput {
+export interface AuthInput {
   email: string;
   verifyNumber: number;
   name: string;
   nickname: string;
   birthDate: number;
   contact: string;
-}
-
-interface PasswordInput {
   currentPassword: string;
   password: string;
   newPassword: string;
   passwordConfirm: string;
 }
 
-interface ValidateOptions {
-  name: keyof TextInput | keyof PasswordInput;
+export interface ValidateOptions {
+  name: keyof AuthInput;
   value: string;
   password?: string;
 }
-
-export type { TextInput, PasswordInput, ValidateOptions };

src/@types/chat.ts

@@ -1,26 +1,30 @@
 import { CHAT_SORT_OPTIONS } from '@/constants/chat';
+import { User } from './user';
 
-export type SortType = keyof typeof CHAT_SORT_OPTIONS;
-
-export interface RoomResponse {
+export interface ChatRoom {
   chatId: string;
   chattingName: string;
+  description: string;
   host: string;
+  hostProfileImage: string;
   hasJoined: boolean;
+  unreadMessageCount: number;
   lastMessageTime: string;
   image: string;
-  unreadMessageCount: number;
   membersCount: number;
   totalMembersCount: number;
-  hostProfileImage: string;
-  description: string;
 }
 
-export interface ChattingResponse {
+export interface Chat {
   chatTitle: string;
   chatMessages: ChatMessage[];
 }
 
+export interface ChatOverview {
+  participants: Participant[];
+  album: ImageInfo[];
+}
+
 export interface ChatMessage {
   chatMessageId: string;
   images: string[];
@@ -31,20 +35,15 @@ export interface ChatMessage {
   unreadCount: number;
 }
 
-export interface ChatOverview {
-  participants: Participant[];
-  album: ImageInfo[];
-}
-
 export interface ImageInfo {
   images: string[];
   uploadDate: string;
   uploader: string;
 }
-export interface Participant {
-  user: string;
-  email: string;
-  description: string;
-  profileImage: string;
+
+export interface Participant
+  extends Pick<User, 'email' | 'profileImage' | 'nickname' | 'description'> {
   travelCount: number;
 }
+
+export type SortType = keyof typeof CHAT_SORT_OPTIONS;

src/@types/review.ts

@@ -1,58 +1,41 @@
 export interface Review {
+  // 리뷰 정보
   reviewId: number;
-  id: number;
-  title: string;
-  nickname?: string;
-  profileImage?: string;
-  imageUrl: string;
   reviewImage: string;
+  title: string;
   content: string;
-  score?: number;
+  reviewImages: string[];
   starRating: number;
-  travelLocation: string;
+  likesCount: number;
+  likesFlag: boolean;
   createdAt: string;
-  isLast: boolean;
-  likesFlag?: boolean;
-}
-
-export interface ReviewResponse {
-  content: Review[];
-  currentPage: number;
-  size: number;
-  total: number;
-  hasNext: boolean;
-}
-
-export interface Filters {
-  sortOrder: 'createdAt' | 'popular';
-}
-export interface ReviewListFilters {
-  sortOrder: 'LATEST' | 'POPULAR';
-}
+  travelLocation: string;
 
-export interface ReviewDetail {
-  reviewId: number;
+  // 여행 정보
   travelId: number;
   travelTitle: string;
-  userProfileImage: string;
+
+  // 유저 정보
   nickname: string;
-  title: string;
-  comment: string;
-  starRating: number;
-  reviewImages: string[];
-  likesCount: number;
-  likesFlag: boolean;
-  travelLocation: string;
-  createdAt: string;
+  profileImage: string;
 }
 
-export interface ReviewDetailResponse {
-  status: string;
-  data: ReviewDetail;
+export interface ReviewRatings {
+  totalReviews: number;
+  oneStarReviews: number;
+  twoStarReviews: number;
+  threeStarReviews: number;
+  fourStarReviews: number;
+  fiveStarReviews: number;
 }
 
-export interface CreateReview {
-  score: number;
-  content: string;
-  reviewImage: File[];
+export interface ReviewScore {
+  totalRating: number;
+  reviewRatings: ReviewRatings;
+}
+
+export interface ReviewListFilters {
+  sortOrder: 'LATEST' | 'POPULAR';
+  pageParam: number;
+  size: number;
 }

src/@types/travel.ts

@@ -1,47 +1,18 @@
-export interface Travel {
-  travelId: number;
-  travelName: string;
-  isDomestic: boolean;
-  travelStatus?: string;
-  location: string;
-  image: string;
-  startAt: string;
-  endAt: string;
-  maxTravelMateCount: number;
-  currentTravelMateCount: number;
-  formattedStartDate?: string;
-  expectedTripCost?: number;
-  isBookmark: boolean | null;
-}
+import { User } from './user';
 
-export interface TravelPlan {
-  tripDay: number;
-  tripOrderNumber: number;
-  destination: string;
-  description: string;
-  image: string;
-}
-
-export interface Participant {
-  id: number;
-  nickname: string;
-  role: string;
-  profileImage: string;
-}
-
-export interface TravelDetail {
+export interface Travel {
   travelId: number;
   travelName: string;
   description: string;
-  image: string;
-  expectedTripCost: number;
+  travelImage: string;
+  expectedTripCost?: number;
   currentTravelMateCount: number;
   minTravelMateCount: number;
   maxTravelMateCount: number;
   hashTags: string;
   isDomestic: boolean;
   travelLocation: string;
-  departureLocation: string;
+  departureLocation?: string;
   startAt: string;
   endAt: string;
   registrationEnd: string;
@@ -52,6 +23,33 @@ export interface TravelDetail {
   bookmarkFlag: boolean | null;
 }
 
+export interface TravelPlan {
+  tripDay: number;
+  tripOrderNumber: number;
+  destination: string;
+  description: string;
+  travelPlanImage: string;
+}
+
+export type TravelCard = Pick<
+  Travel,
+  | 'travelId'
+  | 'travelImage'
+  | 'isDomestic'
+  | 'travelName'
+  | 'travelLocation'
+  | 'maxTravelMateCount'
+  | 'currentTravelMateCount'
+  | 'startAt'
+  | 'endAt'
+  | 'bookmarkFlag'
+>;
+
+export interface Participant
+  extends Pick<User, 'userId' | 'profileImage' | 'nickname'> {
+  role: string;
+}
+
 export interface TravelReviewRateScore {
   oneStarReviews: number;
   twoStarReviews: number;
@@ -82,11 +80,6 @@ export interface TravelParams {
   filters?: Filters;
 }
 
-export interface TravelFilterResponse {
-  content: Travel[];
-  currentPage: number;
-  hasNext: boolean;
-}
 export interface TravelList {
   travelId: number;
   travelName: string;
@@ -103,7 +96,7 @@ export interface TravelList {
 }
 
 export interface MyTravel {
-  content: TravelList[];
+  content: Travel[];
   total: number;
   currentPage: number;
   hasNext: boolean;

src/@types/user.ts

@@ -1,32 +1,7 @@
 export interface User {
-  id: number;
-  email: string;
-  password: string;
-  name: string;
-  nickname: string;
-  contact: string;
-  birthDate: number;
-  image: string;
-  createdAt: string;
-  updatedAt: string;
-  SaveList: [];
-  LikesList: [];
-  ParticipationList: [];
-}
-
-export interface UserList {
-  userId: number;
-  profileImage: string;
-  nickName: string;
-  openTravelCount: number;
-  reviewCount: number;
-  hashTags: string;
-}
-
-export interface MyPageProfile {
   userId: number;
   email: string;
   nickname: string;
-  image: string;
+  profileImage: string;
   description: string;
 }

src/api/auth/deleteAccount.ts

@@ -1,9 +1,17 @@
+import { AuthInput } from '@/@types/auth';
+import { BaseResponse } from '@/@types/api';
 import { http } from '../fetcher';
 
-export const checkPassword = (password: { password: string }) => {
-  return http.post<any>('/users/check/password', password);
+type PasswordRequestBody = Pick<AuthInput, 'password'>;
+
+interface CheckPasswordToken {
+  deleteUserToken: string;
+}
+
+export const checkPassword = (password: PasswordRequestBody) => {
+  return http.post<BaseResponse<object>>('/users/check/password', password);
 };
 
 export const deleteAccount = () => {
-  return http.delete<any>('/users');
+  return http.delete<BaseResponse<CheckPasswordToken>>('/users');
 };

src/api/auth/login.ts

@@ -1,8 +1,9 @@
-import { User } from '@/@types/user';
+import { AuthInput } from '@/@types/auth';
+import { BaseResponse } from '@/@types/api';
 import { http } from '../fetcher';
 
-type LoginRequestBody = Pick<User, 'email' | 'password'>;
+type LoginRequestBody = Pick<AuthInput, 'email' | 'password'>;
 
 export const login = (credentials: LoginRequestBody) => {
-  return http.post<any>('/auth/sign-in', credentials);
+  return http.post<BaseResponse<object>>('/auth/sign-in', credentials);
 };

src/api/auth/logout.ts

@@ -1,5 +1,6 @@
+import { BaseResponse } from '@/@types/api';
 import { http } from '../fetcher';
 
 export const logout = () => {
-  return http.post<any>('/auth/sign-out');
+  return http.post<BaseResponse<object>>('/auth/sign-out');
 };