resolve conflict

src/@types/global.d.ts

@@ -11,5 +11,6 @@ declare global {
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
   interface ObjectConstructor {
     entries<T, K>(o: { [s: T]: K } | ArrayLike<T>): [T, K][]
+    keys<T = string>(o: object): T[]
   }
 }

src/apis/image/queries.ts

@@ -1,8 +1,9 @@
+import type { DefaultError } from '@tanstack/react-query'
 import { useMutation } from '@tanstack/react-query'
 import { createUploadImages } from './apis'
-import type { CreateUploadImagesReq } from './types'
+import type { CreateUploadImagesReq, CreateUploadImagesRes } from './types'
 
 export const useCreateUploadImagesMutation = () =>
-  useMutation({
-    mutationFn: (files: CreateUploadImagesReq) => createUploadImages(files)
+  useMutation<CreateUploadImagesRes, DefaultError, CreateUploadImagesReq>({
+    mutationFn: files => createUploadImages(files)
   })

src/apis/image/types.ts

@@ -1,14 +1,9 @@
-import type { ImagesUpload, ImageUpload } from '@types'
+import type { ImagesUpload } from '@types'
 
 export type CreateUploadImagesReq = FormData
 
 export type CreateUploadImagesRes = ImagesUpload
 
-export type PostUploadImageReq = {
-  file: string
-}
-export type PostUploadImageRes = ImageUpload
-
 export type GetImageReq = {
   path: string
 }

src/apis/like/apis.ts

@@ -1,5 +1,12 @@
-import type { UpdateLikeStatusReq } from './types'
+import type {
+  GetLikedPostsReq,
+  GetLikedPostsRes,
+  UpdateLikeStatusReq
+} from './types'
 import { http } from '@utils/http'
 
 export const updateLikeStatus = (postId: number) =>
   http.put<UpdateLikeStatusReq, null>('/posts/likes', { postId })
+
+export const getLikedPosts = (params: GetLikedPostsReq) =>
+  http.get<GetLikedPostsReq, GetLikedPostsRes>('/posts/likes', params)

src/apis/like/index.ts

@@ -1,2 +1,3 @@
 export * from './types'
+export * from './apis'
 export * from './queries'

src/apis/like/queries.ts

@@ -1,7 +1,15 @@
-import { useMutation } from '@tanstack/react-query'
-import { updateLikeStatus } from './apis'
+import type { DefaultError } from '@tanstack/react-query'
+import { useQuery, useMutation } from '@tanstack/react-query'
+import { getLikedPosts, updateLikeStatus } from './apis'
+import type { GetLikedPostsReq, UpdateLikeStatusReq } from './types'
+
+export const useGetLikedPostsQuery = (searchOptions: GetLikedPostsReq) =>
+  useQuery({
+    queryKey: ['likedPosts', searchOptions],
+    queryFn: () => getLikedPosts(searchOptions)
+  })
 
 export const useUpdateLikeStatusMutation = () =>
-  useMutation({
-    mutationFn: (postId: number) => updateLikeStatus(postId)
+  useMutation<null, DefaultError, UpdateLikeStatusReq['postId']>({
+    mutationFn: postId => updateLikeStatus(postId)
   })

src/apis/like/types.ts

@@ -2,8 +2,8 @@ import type { PostSummaries } from '@types'
 
 export type GetLikedPostsReq = {
   sort: string
-  lastId: number
-  limit: number
+  lastId?: number
+  limit?: number
 }
 export type GetLikedPostsRes = PostSummaries
 

src/apis/member/apis.ts

@@ -1,7 +1,11 @@
 import type {
   GetMemberProfileRes,
   GetMemberProfileReq,
-  GetMyProfileRes
+  GetMyProfileRes,
+  CheckValidNicknameReq,
+  CheckValidNicknameRes,
+  UpdateMyProfileReq,
+  UpdateMyProfileRes
 } from './types'
 import { http } from '@utils/http'
 
@@ -11,3 +15,18 @@ export const getMyProfile = () =>
 export const getMemberProfile = async (
   memberId: GetMemberProfileReq['memberId']
 ) => http.get<null, GetMemberProfileRes>(`/member/${memberId}`)
+
+export const updateMyProfile = async ({
+  memberId,
+  ...payload
+}: UpdateMyProfileReq) =>
+  http.put<Omit<UpdateMyProfileReq, 'memberId'>, UpdateMyProfileRes>(
+    `/member/${memberId}`,
+    payload
+  )
+
+export const checkValidNickname = async (payload: CheckValidNicknameReq) =>
+  http.post<CheckValidNicknameReq, CheckValidNicknameRes>(
+    '/nickname-duplicate',
+    payload
+  )

src/apis/member/data.ts

@@ -8,3 +8,13 @@ export const initialMyProfile = {
   reviewCount: 0,
   likeProductCount: 0
 }
+
+export const initialMemberProfile = {
+  id: 0,
+  nickname: '',
+  profileImageUrl: '',
+  offerLevel: 0,
+  sellingProductCount: 0,
+  soldProductCount: 0,
+  reviewCount: 0
+}

src/apis/member/queries.ts

@@ -1,6 +1,31 @@
-import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
-import { getMemberProfile, getMyProfile } from './apis'
-import { initialMyProfile } from './data'
+import type { DefaultError } from '@tanstack/react-query'
+import { useMutation, useQuery } from '@tanstack/react-query'
+import {
+  checkValidNickname,
+  getMemberProfile,
+  getMyProfile,
+  updateMyProfile
+} from './apis'
+import { initialMemberProfile, initialMyProfile } from './data'
+import type {
+  CheckValidNicknameReq,
+  CheckValidNicknameRes,
+  UpdateMyProfileReq,
+  UpdateMyProfileRes
+} from './types'
+
+export const useGetProfileQuery = (memberId: null | number) =>
+  useQuery({
+    queryKey: ['profile', memberId],
+    queryFn: () => {
+      if (!memberId) {
+        return getMyProfile()
+      }
+
+      return getMemberProfile(memberId)
+    },
+    initialData: memberId ? initialMemberProfile : initialMyProfile
+  })
 
 export const useGetMyProfileQuery = (accessToken?: string) =>
   useQuery({
@@ -10,8 +35,16 @@ export const useGetMyProfileQuery = (accessToken?: string) =>
     initialData: initialMyProfile
   })
 
-export const useGetMemberProfileQuery = (memberId = '') =>
-  useSuspenseQuery({
-    queryKey: ['memberProfile', memberId],
-    queryFn: () => getMemberProfile(Number(memberId))
+export const useUpdateMyProfileMutation = () =>
+  useMutation<UpdateMyProfileRes, DefaultError, UpdateMyProfileReq>({
+    mutationFn: payload => updateMyProfile(payload)
+  })
+
+export const useCheckValidNicknameMutation = () =>
+  useMutation<
+    CheckValidNicknameRes,
+    DefaultError,
+    CheckValidNicknameReq['nickname']
+  >({
+    mutationFn: nickname => checkValidNickname({ nickname })
   })

src/apis/member/types.ts

@@ -7,18 +7,16 @@ export type GetMemberProfileReq = {
 }
 export type GetMemberProfileRes = MemberProfile
 
-export type UpdateMemberProfileReq = {
+export type UpdateMyProfileReq = {
   memberId: number
   nickname: string
   profileImageUrl: string
 }
-// TODO: 정확한 타입 BE 확인 필요
-export type UpdateMemberProfileRes = number
+export type UpdateMyProfileRes = number
 
-export type CheckValidNickNameReq = {
-  nickName: string
+export type CheckValidNicknameReq = {
+  nickname: string
 }
-// TODO: 정확한 타입 BE 확인 필요
-export type CheckValidNickNameRes = {
-  [key in string]: boolean
+export type CheckValidNicknameRes = {
+  duplicate: boolean
 }

src/apis/offer/apis.ts

@@ -1,10 +1,15 @@
 import type {
+  GetMyOffersReq,
+  GetMyOffersRes,
   GetPostOffersReq,
   CreateOfferReq,
   GetPostOffersRes
 } from './types'
 import { http } from '@utils/http'
 
+export const getMyOffers = (params: GetMyOffersReq) =>
+  http.get<GetMyOffersReq, GetMyOffersRes>('/posts/offers', params)
+
 export const getPostOffers = (params: GetPostOffersReq) =>
   http.get<GetPostOffersReq, GetPostOffersRes>(
     `/posts/${params.postId}/offers`,

src/apis/offer/index.ts

@@ -1,2 +1,3 @@
 export * from './types'
+export * from './apis'
 export * from './queries'

src/apis/offer/queries.ts

@@ -1,6 +1,12 @@
 import { useMutation, useQuery } from '@tanstack/react-query'
-import { getPostOffers, createOffer } from './apis'
-import type { CreateOfferReq, GetPostOffersReq } from './types'
+import { getPostOffers, createOffer, getMyOffers } from './apis'
+import type { CreateOfferReq, GetPostOffersReq, GetMyOffersReq } from './types'
+
+export const useGetMyOffersQuery = (searchOptions: GetMyOffersReq) =>
+  useQuery({
+    queryKey: ['myOffers', searchOptions],
+    queryFn: () => getMyOffers(searchOptions)
+  })
 
 export const useGetPostOffersQuery = (params: GetPostOffersReq) =>
   useQuery({

src/apis/offer/types.ts

@@ -21,7 +21,7 @@ export type CreateOfferRes = CommonCreation
 
 export type GetMyOffersReq = {
   sort: string
-  lastId: number
-  limit: number
+  lastId?: number
+  limit?: number
 }
 export type GetMyOffersRes = OfferSummaries

src/apis/post/apis.ts

@@ -32,7 +32,7 @@ export const getCategories = () =>
 export const getPosts = (params: GetPostsReq) =>
   http.get<GetPostsReq, GetPostsRes>('/posts', params)
 
-export const updateTradeStatus = ({
+export const updatePostTradeStatus = ({
   postId,
   ...params
 }: UpdateTradeStatusReq) =>

src/apis/post/queries.ts

@@ -4,7 +4,7 @@ import {
   getCategories,
   createPost,
   getPosts,
-  updateTradeStatus,
+  updatePostTradeStatus,
   deletePost,
   updatePost
 } from './apis'
@@ -73,15 +73,16 @@ export const useGetCategoriesQuery = () =>
     queryFn: getCategories
   })
 
-export const useGetPostsQuery = (params: GetPostsReq) =>
+export const useGetPostsQuery = (searchOptions: GetPostsReq) =>
   useQuery({
-    queryKey: ['getPosts'],
-    queryFn: () => getPosts(params)
+    queryKey: ['posts', searchOptions],
+    queryFn: () => getPosts(searchOptions),
+    enabled: typeof searchOptions.sellerId === 'number'
   })
 
 export const useGetInfinitePostsQuery = (params: GetPostsReq) =>
   useInfiniteQuery<GetPostsRes>({
-    queryKey: ['getPosts'],
+    queryKey: ['infinitePosts'],
     queryFn: () => getPosts(params),
     initialPageParam: null,
     getNextPageParam: lastPage =>
@@ -92,7 +93,7 @@ export const useGetInfinitePostsQuery = (params: GetPostsReq) =>
 
 export const useUpdateTradeStatusMutation = () =>
   useMutation({
-    mutationFn: (params: UpdateTradeStatusReq) => updateTradeStatus(params)
+    mutationFn: (params: UpdateTradeStatusReq) => updatePostTradeStatus(params)
   })
 
 export const useDeletePostMutation = (postId: DeletePostReq) =>

src/apis/post/types.ts

@@ -30,7 +30,6 @@ export type DeletePostRes = {
   // TODO: 정확한 타입 BE 확인 필요
 }
 
-// TODO: 정확한 타입 BE 확인 필요
 export type UpdateTradeStatusReq = {
   postId: number
   tradeStatus: TradeStatusCodes

src/apis/review/apis.ts

@@ -0,0 +1,20 @@
+import type {
+  GetReviewsReq,
+  GetReviewsRes,
+  CreateReviewReq,
+  CreateReviewRes,
+  GetReviewsCountsReq,
+  GetReviewsCountsRes
+} from './types'
+import { http } from '@utils/http'
+
+export const getReviews = (params: GetReviewsReq) =>
+  http.get<GetReviewsReq, GetReviewsRes>('/reviews', params)
+
+export const createReviews = (payload: CreateReviewReq) =>
+  http.post<CreateReviewReq, CreateReviewRes>('/reviews', payload)
+
+export const getReviewsCounts = (params: GetReviewsCountsReq) =>
+  http.get<GetReviewsCountsReq, GetReviewsCountsRes>(
+    `/reviews/counts?memberId=${params.memberId}`
+  )

src/apis/review/data.ts

@@ -0,0 +1,16 @@
+import type { TradeReviewActivityCodes } from '@types'
+
+export type SelectReviewCounts = {
+  [key in TradeReviewActivityCodes]: number
+}
+
+export const initialReviewsCounts = {
+  all: 0,
+  seller: 0,
+  buyer: 0
+}
+
+export const initialReviews = {
+  hasNext: false,
+  reviews: []
+}

src/apis/review/index.ts

@@ -1 +1,3 @@
 export * from './types'
+export * from './apis'
+export * from './queries'

src/apis/review/queries.ts

@@ -0,0 +1,33 @@
+import type { DefaultError } from '@tanstack/react-query'
+import { useMutation, useQuery } from '@tanstack/react-query'
+import { createReviews, getReviews, getReviewsCounts } from './apis'
+import type { SelectReviewCounts } from './data'
+import { initialReviewsCounts, initialReviews } from './data'
+import type { CreateReviewReq, CreateReviewRes, GetReviewsReq } from './types'
+import type { ReviewCount } from '@types'
+
+export const useGetReviewsCountsQuery = (memberId: number) =>
+  useQuery<ReviewCount, Error, SelectReviewCounts>({
+    queryKey: ['reviewsCounts', memberId],
+    queryFn: async () => getReviewsCounts({ memberId }),
+    select: ({ all, seller, buyer }) => ({
+      ALL: all,
+      SELLER: seller,
+      BUYER: buyer
+    }),
+    enabled: Boolean(memberId),
+    initialData: initialReviewsCounts
+  })
+
+export const useGetReviewsQuery = (searchOptions: GetReviewsReq) =>
+  useQuery({
+    queryKey: ['reviews', searchOptions],
+    queryFn: async () => getReviews({ ...searchOptions }),
+    enabled: Boolean(searchOptions.memberId),
+    initialData: initialReviews
+  })
+
+export const useReviewsMutation = () =>
+  useMutation<CreateReviewRes, DefaultError, CreateReviewReq>({
+    mutationFn: payload => createReviews(payload)
+  })