diff --git a/src/api/service/user-service/index.ts b/src/api/service/user-service/index.ts index 4761601a..7dad9115 100644 --- a/src/api/service/user-service/index.ts +++ b/src/api/service/user-service/index.ts @@ -59,11 +59,6 @@ export const userServiceRemote = () => ({ return baseAPI.get(`/api/v1/users/me`); }, - // 8-1. 본인 프로필 조회(redirect skip) - getMeSkipRedirect: async () => { - return baseAPI.get(`/api/v1/users/me`); - }, - // 9. 이메일 중복 검사 getEmailAvailability: async (queryParams: GetEmailAvailabilityQueryParams) => { return baseAPI.get(`/api/v1/users/email/availability`, { diff --git a/src/app/(user)/profile/[userId]/layout.tsx b/src/app/(user)/profile/[userId]/layout.tsx index 6aeb6f4b..4797db3d 100644 --- a/src/app/(user)/profile/[userId]/layout.tsx +++ b/src/app/(user)/profile/[userId]/layout.tsx @@ -35,7 +35,7 @@ const ProfileLayout = async ({ children, params }: Props) => { queryClient .fetchQuery({ queryKey: userKeys.me(), - queryFn: () => API.userService.getMeSkipRedirect(), + queryFn: () => API.userService.getMe(), }) .catch(() => null), ]); diff --git a/src/app/(user)/profile/[userId]/page.tsx b/src/app/(user)/profile/[userId]/page.tsx index 1fc72d9c..e11fdefb 100644 --- a/src/app/(user)/profile/[userId]/page.tsx +++ b/src/app/(user)/profile/[userId]/page.tsx @@ -1,33 +1,19 @@ 'use client'; -import { useRouter } from 'next/navigation'; - -import { use, useEffect } from 'react'; +import { use } from 'react'; import { ProfileInfo } from '@/components/pages/user/profile'; import { useGetUser } from '@/hooks/use-user'; -import { useUserGetMeSkipRedirect } from '@/hooks/use-user/use-user-get-me'; interface Props { params: Promise<{ userId: string }>; } const ProfilePage = ({ params }: Props) => { - const router = useRouter(); - const { userId: id } = use(params); const userId = Number(id); const { data: user } = useGetUser({ userId }); - const { data: me } = useUserGetMeSkipRedirect(); - - useEffect(() => { - if (user?.userId === me?.userId) { - router.replace('/mypage'); - } - }, [me?.userId, router, user?.userId]); - - if (!user) return null; return ; }; diff --git a/src/app/message/chat/[roomId]/page.tsx b/src/app/message/chat/[roomId]/page.tsx index e9dcb856..6ac7463e 100644 --- a/src/app/message/chat/[roomId]/page.tsx +++ b/src/app/message/chat/[roomId]/page.tsx @@ -9,7 +9,7 @@ export default async function Page({ params }: { params: Promise<{ roomId: strin const cookieStore = await cookies(); const accessToken = cookieStore.get('accessToken')?.value; - const me = await API.userService.getMeSkipRedirect(); + const me = await API.userService.getMe(); const userId = me.userId; return ( diff --git a/src/app/message/page.tsx b/src/app/message/page.tsx index ac1f5946..bf8ea17f 100644 --- a/src/app/message/page.tsx +++ b/src/app/message/page.tsx @@ -23,7 +23,7 @@ export default async function MessagePage() { const accessToken = cookieStore.get('accessToken')?.value || null; const queryClient = getQueryClient(); - const me = await API.userService.getMeSkipRedirect(); + const me = await API.userService.getMe(); const userId = me.userId; await Promise.all([ diff --git a/src/hooks/use-user/use-user-get-me/index.ts b/src/hooks/use-user/use-user-get-me/index.ts index 37fda0b1..aac02b89 100644 --- a/src/hooks/use-user/use-user-get-me/index.ts +++ b/src/hooks/use-user/use-user-get-me/index.ts @@ -1,11 +1,10 @@ -import { useQuery } from '@tanstack/react-query'; +import { useSuspenseQuery } from '@tanstack/react-query'; import { API } from '@/api'; import { userKeys } from '@/lib/query-key/query-key-user'; -import { useAuth } from '@/providers'; export const useUserGetMe = () => { - const query = useQuery({ + const query = useSuspenseQuery({ queryKey: userKeys.me(), queryFn: () => API.userService.getMe(), select: (data) => ({ @@ -17,21 +16,3 @@ export const useUserGetMe = () => { }); return query; }; - -export const useUserGetMeSkipRedirect = () => { - const { isAuthenticated } = useAuth(); - - const query = useQuery({ - queryKey: userKeys.me(), - queryFn: () => API.userService.getMeSkipRedirect(), - select: (data) => ({ - ...data, - profileImage: data.profileImage ?? '', - profileMessage: data.profileMessage ?? '', - mbti: data.mbti ?? '', - }), - retry: false, - enabled: isAuthenticated, - }); - return query; -}; diff --git a/src/hooks/use-user/use-user-get/index.ts b/src/hooks/use-user/use-user-get/index.ts index e56447c2..d2aa247b 100644 --- a/src/hooks/use-user/use-user-get/index.ts +++ b/src/hooks/use-user/use-user-get/index.ts @@ -1,11 +1,11 @@ -import { useQuery } from '@tanstack/react-query'; +import { useSuspenseQuery } from '@tanstack/react-query'; import { API } from '@/api'; import { userKeys } from '@/lib/query-key/query-key-user'; import { GetUserPathParams } from '@/types/service/user'; export const useGetUser = ({ userId }: GetUserPathParams, options?: { enabled?: boolean }) => { - const query = useQuery({ + const query = useSuspenseQuery({ queryKey: userKeys.item(userId), queryFn: () => API.userService.getUser({ userId }), ...options,