Fix: 상세페이지 notFound 처리

Funssion-SWM · Dec 9, 2023 · c5989fb · c5989fb
1 parent a40f8d1
commit c5989fb
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 41 deletions.
diff --git a/src/app/me/[slug]/page.tsx b/src/app/me/[slug]/page.tsx
@@ -22,6 +22,7 @@ import {
   getCoverletterInfoByUserId,
   getCoverletterVisibleMode,
 } from '@/service/coverletter';
+import { notFound } from 'next/navigation';
 
 type Props = {
   params: {
@@ -35,8 +36,12 @@ export default async function MePage({ params: { slug } }: Props) {
   const cookie = `${ACCESS_TOKEN}=${accessToken}; ${REFRESH_TOKEN}=${refreshToken}`;
   const userId = Number(slug);
 
+  const userInfo = await getUserInfo(userId, cookie);
+  if (userInfo.userId === undefined) {
+    notFound();
+  }
+
   const memosData = getMemosByUserId(userId);
-  const userData = getUserInfo(userId, cookie);
   const historyData = getHistory(
     userId,
     new Date().getFullYear(),
@@ -54,7 +59,6 @@ export default async function MePage({ params: { slug } }: Props) {
 
   const [
     memos,
-    userInfo,
     history,
     { id, isLogin, authority },
     tags,
@@ -66,7 +70,6 @@ export default async function MePage({ params: { slug } }: Props) {
     coverletterIsVisible,
   ] = await Promise.all([
     memosData,
-    userData,
     historyData,
     myData,
     tagData,
@@ -137,9 +140,12 @@ export default async function MePage({ params: { slug } }: Props) {
   );
 }
 
-export async function generateMetadata({ params }: Props) {
-  const userId = Number(params.slug);
+export async function generateMetadata({ params: { slug } }: Props) {
+  const userId = Number(slug);
   const { nickname } = await getUserInfo(userId);
+  if (nickname === undefined) {
+    notFound();
+  }
 
   return {
     title: `${nickname} - 인포럼`,

diff --git a/src/app/memos/[slug]/page.tsx b/src/app/memos/[slug]/page.tsx
@@ -10,6 +10,7 @@ import { ACCESS_TOKEN, REFRESH_TOKEN } from '@/utils/const';
 import { checkUser, getUserInfo } from '@/service/auth';
 import { getQuestionsByMemoId } from '@/service/questions';
 import { getNotificationsTop30 } from '@/service/notification';
+import { notFound } from 'next/navigation';
 
 type Props = {
   params: {
@@ -23,36 +24,39 @@ export default async function MemoPage({ params: { slug } }: Props) {
   const cookie = `${ACCESS_TOKEN}=${accessToken}; ${REFRESH_TOKEN}=${refreshToken}`;
   const memoId = Number(slug);
 
-  const memoData = getMemoById(memoId, cookie);
+  const {
+    memoTitle,
+    memoColor,
+    memoText,
+    authorId,
+    likes,
+    authorName,
+    authorProfileImagePath,
+    memoTags,
+    isMine,
+    createdDate,
+    seriesId,
+    seriesTitle,
+    authorRank,
+  } = await getMemoById(memoId, cookie);
+
+  if (memoTitle === undefined) {
+    notFound();
+  }
+
   const likeData = getIsLike('memos', memoId, cookie);
   const commentData = getCommentsByPostTypeAndPostId('memo', memoId, cookie);
   const myData = checkUser(cookie);
   const questionsData = getQuestionsByMemoId(memoId);
   const recommendationsData = getMemoRecommendationsById(memoId);
 
   const [
-    {
-      memoTitle,
-      memoColor,
-      memoText,
-      authorId,
-      likes,
-      authorName,
-      authorProfileImagePath,
-      memoTags,
-      isMine,
-      createdDate,
-      seriesId,
-      seriesTitle,
-      authorRank,
-    },
     { isLike },
     comments,
     { id, isLogin, authority },
     recommendations,
     questions,
   ] = await Promise.all([
-    memoData,
     likeData,
     commentData,
     myData,
@@ -121,6 +125,9 @@ export default async function MemoPage({ params: { slug } }: Props) {
 export async function generateMetadata({ params: { slug } }: Props) {
   const memoId = Number(slug);
   const { memoTitle, memoDescription } = await getMemoById(memoId);
+  if (memoTitle === undefined) {
+    notFound();
+  }
 
   return {
     title: memoTitle,

diff --git a/src/app/questions/[slug]/page.tsx b/src/app/questions/[slug]/page.tsx
@@ -9,6 +9,7 @@ import { getNotificationsTop30 } from '@/service/notification';
 import { getQuestionById } from '@/service/questions';
 import { ACCESS_TOKEN, REFRESH_TOKEN } from '@/utils/const';
 import { cookies } from 'next/headers';
+import { notFound } from 'next/navigation';
 
 type Props = {
   params: {
@@ -22,13 +23,20 @@ export default async function QuestionPage({ params: { slug } }: Props) {
   const cookie = `${ACCESS_TOKEN}=${accessToken}; ${REFRESH_TOKEN}=${refreshToken}`;
   const questionId = Number(slug);
 
-  const questionData = getQuestionById(questionId, cookie);
+  const question = await getQuestionById(questionId, cookie);
+  if (question.id === undefined) {
+    notFound();
+  }
+
   const answersData = getAnswersByQuestionId(questionId, cookie);
   const myData = checkUser(cookie);
   const likeData = getIsLike('questions', questionId, cookie);
 
-  const [question, answers, { id, isLogin, authority }, { isLike }] =
-    await Promise.all([questionData, answersData, myData, likeData]);
+  const [answers, { id, isLogin, authority }, { isLike }] = await Promise.all([
+    answersData,
+    myData,
+    likeData,
+  ]);
 
   const { profileImageFilePath } = isLogin
     ? await getUserInfo(id)
@@ -68,6 +76,9 @@ export default async function QuestionPage({ params: { slug } }: Props) {
 export async function generateMetadata({ params: { slug } }: Props) {
   const questionId = Number(slug);
   const { title, description } = await getQuestionById(questionId);
+  if (title === undefined) {
+    notFound();
+  }
 
   return {
     title: title,

diff --git a/src/app/series/[slug]/page.tsx b/src/app/series/[slug]/page.tsx
@@ -10,6 +10,7 @@ import { getQuestionsByMemoId } from '@/service/questions';
 import { getSeriesById } from '@/service/series';
 import { ACCESS_TOKEN, REFRESH_TOKEN } from '@/utils/const';
 import { cookies } from 'next/headers';
+import { notFound } from 'next/navigation';
 
 type Props = {
   params: {
@@ -24,6 +25,9 @@ export default async function SeriesDetailPage({ params: { slug } }: Props) {
   const seriesId = Number(slug);
 
   const { memoInfoList, likes, title } = await getSeriesById(seriesId);
+  if (title === undefined) {
+    notFound();
+  }
 
   const memoData = getMemoById(memoInfoList[0].id, cookie);
   const likeData = getIsLike('series', seriesId, cookie);
@@ -98,6 +102,9 @@ export default async function SeriesDetailPage({ params: { slug } }: Props) {
 export async function generateMetadata({ params: { slug } }: Props) {
   const seriesId = Number(slug);
   const { title, description } = await getSeriesById(seriesId);
+  if (title === undefined) {
+    notFound();
+  }
 
   return {
     title: title,

diff --git a/src/service/auth.ts b/src/service/auth.ts
@@ -11,7 +11,9 @@ import {
 } from '@/types';
 import { URLSearchParams } from 'next/dist/compiled/@edge-runtime/primitives/url';
 
-export async function userSignUp(userData: UserSignUpData): Promise<SignupResponse> {
+export async function userSignUp(
+  userData: UserSignUpData
+): Promise<SignupResponse> {
   return fetch(`${process.env.NEXT_PUBLIC_SERVER_IP_ADDRESS_SECURE}/users`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -27,13 +29,18 @@ export async function userSignUp(userData: UserSignUpData): Promise<SignupRespon
     .catch(console.error);
 }
 
-export async function employerSignUp(userData: EmployerSignUpData): Promise<SignupResponse> {
-  return fetch(`${process.env.NEXT_PUBLIC_SERVER_IP_ADDRESS_SECURE}/users/employer`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    credentials: 'include',
-    body: JSON.stringify(userData),
-  })
+export async function employerSignUp(
+  userData: EmployerSignUpData
+): Promise<SignupResponse> {
+  return fetch(
+    `${process.env.NEXT_PUBLIC_SERVER_IP_ADDRESS_SECURE}/users/employer`,
+    {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      credentials: 'include',
+      body: JSON.stringify(userData),
+    }
+  )
     .then((res) => {
       if (!res.ok) {
         throw new Error('error');
@@ -211,10 +218,7 @@ export async function getUserInfo(
           credentials: 'include',
         }
   )
-    .then((res) => {
-      if (!res.ok) throw new Error('error 발생!');
-      return res.json();
-    })
+    .then((res) => res.json())
     .catch(console.error);
 }
 

diff --git a/src/service/memos.ts b/src/service/memos.ts
@@ -56,10 +56,7 @@ export async function getMemoById(
           credentials: 'include',
         }
   )
-    .then((res) => {
-      if (!res.ok) throw new Error('error');
-      return res.json();
-    })
+    .then((res) => res.json())
     .catch(console.error);
 }