Merge pull request #112 from YAPP-Github/qa/workbook-111

[ Qa/workbook 111 ] workbook qa
YAPP-Github · Jul 12, 2024 · f90f43c · f90f43c
2 parents 70f4be3 + a85bbeb
commit f90f43c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/app/workbook/[id]/page.tsx b/src/app/workbook/[id]/page.tsx
@@ -7,7 +7,6 @@ import { useQuery } from "@tanstack/react-query";
 
 import TitleSection from "@shared/components/TitleSection";
 
-import { ClientSubscribePopup } from "@workbook/components/ClientSubscribePopup";
 import CurriculumSection from "@workbook/components/CurriculumSection";
 import OverviewSection from "@workbook/components/OverviewSection";
 import WorkbookSkeleton from "@workbook/components/WorkbookSkeleton";
@@ -41,7 +40,6 @@ export default function WorkbookPage() {
   return (
     <main className="flex h-[100vh] w-full flex-col items-center overflow-x-hidden">
       <article className="flex h-full w-full max-w-screen-sm flex-col space-y-[24px] overflow-y-scroll">
-        <ClientSubscribePopup />
         {workbookInfo && (
           <>
             <figure>

diff --git a/src/subscription/constants/subscribe.ts b/src/subscription/constants/subscribe.ts
@@ -1,7 +1,7 @@
 export const SUBSCRIBE_TITLES = {
     SUBSCRIBE_TITLE_1: "매일 아침마다",
     SUBSCRIBE_TITLE_2: "경제 아티클과 문제를 보내드려요!",
-    SUBSCRIBE_TITLE_FEW: "FEW는 매일 경제 아티클과 문제를 보내드려요!"
+    SUBSCRIBE_TITLE_FEW: "매일 아티클과 문제를 보내드려요!"
 }
 export const EMAIL_CONTROL = {
     EMAIL_PLACEHOLDER: "이메일을 입력해주세요",
@@ -17,5 +17,6 @@ export const SUBSCRIBE_USER_ACTIONS = {
     SUBSCRIBE_REJECT: "좀 더 둘러볼래요",
     SUBSCRIBE_ACCEPT: "구독할게요",
     SUBSCRIBE_SUCCESS: "구독 신청이 완료되었어요!",
-    SUBSCRIBE_CONFIRM:  "구독하기"
+    SUBSCRIBE_FAIL: "구독 신청이 되지 않았습니다.",
+    SUBSCRIBE_CONFIRM:  "이 학습지 구독하기"
 }
diff --git a/src/subscription/hooks/useSubscribeForm.tsx b/src/subscription/hooks/useSubscribeForm.tsx
@@ -4,6 +4,8 @@ import { useForm } from 'react-hook-form';
 
 import { useMutation } from '@tanstack/react-query';
 
+import axios from 'axios';
+
 import { useToast } from '@shared/components/ui/use-toast';
 import useWorkbookId from '@shared/hooks/useWorkbookId';
 
@@ -43,15 +45,20 @@ export const useSubscribeForm = () => {
           });
         },
         onError: (error) => {
-          console.error(error);
+          let errorMessage = SUBSCRIBE_USER_ACTIONS.SUBSCRIBE_FAIL;
+          if (axios.isAxiosError(error) && error.response) {
+            errorMessage = error.response.data.message || errorMessage;
+          }
           toast({
-            title: '구독 신청이 되지 않았습니다.'
+            title: errorMessage,
           });
         },
       });
     } catch (error) {
+      console.error('catch error', error);
+
       toast({
-        title: '구독 신청이 되지 않았습니다.'
+        title: SUBSCRIBE_USER_ACTIONS.SUBSCRIBE_FAIL
       });
     }
   };