From 295840a518805ee86b89e734b9bd9c2af7f9a1fe Mon Sep 17 00:00:00 2001
From: Eugene Kim <67894159+eugene028@users.noreply.github.com>
Date: Wed, 31 Jul 2024 22:09:55 +0900
Subject: [PATCH] =?UTF-8?q?[Fix]:=20=EB=94=94=EC=8A=A4=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=97=B0=EB=8F=99=20=EB=A7=88=EC=9D=B4=EB=84=88=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=EC=88=98=EC=A0=95=20=20(#75)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 디스코드 합류 체크 관련 API 호출 개선 및 문구 변경

* fix: 메서드 잘못된거 하나 슬쩍 고치기

* fix: API 문서 수정
---
 src/apis/auth/verifyStudentApi.ts              |  6 +++---
 src/components/discordConnect/DiscordName.tsx  |  2 +-
 .../discordConnect/DiscordNickName.tsx         |  2 +-
 src/components/discordConnect/JoinServer.tsx   |  4 +++-
 src/hooks/mutation/index.ts                    |  1 +
 src/hooks/mutation/useVerifyStudentEmail.ts    | 14 ++++++++++++++
 src/hooks/query/index.ts                       |  1 -
 src/hooks/query/useGetDiscordJoined.ts         |  3 ++-
 src/hooks/query/useVerifyStudentEmail.ts       | 18 ------------------
 .../StudentVerificationServerRedirect.tsx      | 10 ++++++++--
 src/routes/routePath.ts                        |  1 +
 11 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 src/hooks/mutation/useVerifyStudentEmail.ts
 delete mode 100644 src/hooks/query/useVerifyStudentEmail.ts

diff --git a/src/apis/auth/verifyStudentApi.ts b/src/apis/auth/verifyStudentApi.ts
index bbb991d..c2dfc96 100644
--- a/src/apis/auth/verifyStudentApi.ts
+++ b/src/apis/auth/verifyStudentApi.ts
@@ -15,9 +15,9 @@ const verifyStudentApi = {
     return response.data;
   },
   VERIFY_STUDENT_EMAIL: async (token: string) => {
-    const response = await apiClient.get(
-      `/onboarding/verify-email?token=${token}`
-    );
+    const response = await apiClient.patch(`/onboarding/verify-email`, {
+      token: token
+    });
     return response.data;
   }
 };
diff --git a/src/components/discordConnect/DiscordName.tsx b/src/components/discordConnect/DiscordName.tsx
index d8c84a1..7f0b317 100644
--- a/src/components/discordConnect/DiscordName.tsx
+++ b/src/components/discordConnect/DiscordName.tsx
@@ -25,7 +25,7 @@ export const DiscordName = ({ onNext }: { onNext: () => void }) => {
         setError('discordUsername', {
           type: 'manual',
           message:
-            '이미 가입된 사용자명이에요. 이전에 가입한 적이 있으신 경우, 채널톡으로 문의해주세요.'
+            '이미 가입된 사용자명이에요. 이전에 가입한 적이 있으신 경우, 카카오톡 채널로 문의해주세요.'
         });
       } else {
         onNext();
diff --git a/src/components/discordConnect/DiscordNickName.tsx b/src/components/discordConnect/DiscordNickName.tsx
index 67a7be2..76cc1ce 100644
--- a/src/components/discordConnect/DiscordNickName.tsx
+++ b/src/components/discordConnect/DiscordNickName.tsx
@@ -74,7 +74,7 @@ const TextSection = memo(() => (
     <Image src={DiscordImage} alt="discord-nickname" width={325} height={157} />
     <Text typo="body1">
       가입이 완료되면 가입 신청서에 제출하신 별명으로 자동으로 수정될 거예요.
-      추후 별명을 수정하고 싶다면 채널톡으로 코어멤버에게 연락 주세요.
+      추후 별명을 수정하고 싶다면 카카오톡 채널로 코어멤버에게 연락 주세요.
     </Text>
   </>
 ));
diff --git a/src/components/discordConnect/JoinServer.tsx b/src/components/discordConnect/JoinServer.tsx
index bd0add7..bf11183 100644
--- a/src/components/discordConnect/JoinServer.tsx
+++ b/src/components/discordConnect/JoinServer.tsx
@@ -6,6 +6,7 @@ import { css } from '@emotion/react';
 import { useFormContext } from 'react-hook-form';
 import useGetDiscordJoined from '@/hooks/query/useGetDiscordJoined';
 import { DiscordFormValues } from '@/types/discord';
+import RoutePath from '@/routes/routePath';
 
 export const JoinServer = ({ onNext }: { onNext: () => void }) => {
   const { getValues } = useFormContext<DiscordFormValues>();
@@ -28,6 +29,7 @@ export const JoinServer = ({ onNext }: { onNext: () => void }) => {
         <TextButton
           text=" GDSC Hongik 공식 디스코드 서버↗︎"
           style={{ color: color.discord }}
+          onClick={() => window.open(RoutePath.GDSCHongikDiscord, '_blank')}
         />
 
         <Button
@@ -46,7 +48,7 @@ export const JoinServer = ({ onNext }: { onNext: () => void }) => {
             text-align: center;
           `}>
           합류가 확인되지 않을 경우 <br />
-          채널톡을 통해 코어멤버에게 문의해주세요!
+          카카오톡 채널을 통해 코어멤버에게 문의해주세요!
         </Text>
       </Flex>
     </>
diff --git a/src/hooks/mutation/index.ts b/src/hooks/mutation/index.ts
index fdbeeaa..f15ca8d 100644
--- a/src/hooks/mutation/index.ts
+++ b/src/hooks/mutation/index.ts
@@ -1 +1,2 @@
 export { default as useSendStudentEmail } from './useSendStudentEmail';
+export { default as useVerifyStudentEmail } from './useVerifyStudentEmail';
diff --git a/src/hooks/mutation/useVerifyStudentEmail.ts b/src/hooks/mutation/useVerifyStudentEmail.ts
new file mode 100644
index 0000000..08d2647
--- /dev/null
+++ b/src/hooks/mutation/useVerifyStudentEmail.ts
@@ -0,0 +1,14 @@
+import { verifyStudentApi } from '@/apis/auth';
+import { useMutation } from '@tanstack/react-query';
+
+export default function useVerifyStudentEmail() {
+  const {
+    mutate: verifyStudentMail,
+    isSuccess,
+    isPending
+  } = useMutation({
+    mutationFn: verifyStudentApi.VERIFY_STUDENT_EMAIL
+  });
+
+  return { verifyStudentMail, isSuccess, isPending };
+}
diff --git a/src/hooks/query/index.ts b/src/hooks/query/index.ts
index 8ca8dff..af421a9 100644
--- a/src/hooks/query/index.ts
+++ b/src/hooks/query/index.ts
@@ -1,3 +1,2 @@
 export { default as useGetDepartmentList } from './useGetDepartmentList';
-export { default as useVerifyStudentEmail } from './useVerifyStudentEmail';
 export { default as useVerifyStudent } from './useVerifyStudent';
diff --git a/src/hooks/query/useGetDiscordJoined.ts b/src/hooks/query/useGetDiscordJoined.ts
index caa5549..2e19d28 100644
--- a/src/hooks/query/useGetDiscordJoined.ts
+++ b/src/hooks/query/useGetDiscordJoined.ts
@@ -5,7 +5,8 @@ import { useQuery } from '@tanstack/react-query';
 export default function useGetDiscordJoined(username: string) {
   const query = useQuery({
     queryKey: [QueryKeys.DiscordJoined],
-    queryFn: () => discordApi.GET_DISCORD_JOIN(username)
+    queryFn: () => discordApi.GET_DISCORD_JOIN(username),
+    refetchOnWindowFocus: true
   });
 
   return query;
diff --git a/src/hooks/query/useVerifyStudentEmail.ts b/src/hooks/query/useVerifyStudentEmail.ts
deleted file mode 100644
index 777e93d..0000000
--- a/src/hooks/query/useVerifyStudentEmail.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { verifyStudentApi } from '@/apis/auth';
-import QueryKeys from '@/constants/queryKey';
-import { useQuery } from '@tanstack/react-query';
-
-export default function useVerifyStudentEmail(token: string | null) {
-  const query = useQuery({
-    queryKey: [QueryKeys.StudentEmailVerification],
-    queryFn: () => {
-      if (!token) {
-        return Promise.reject('empty token');
-      }
-
-      return verifyStudentApi.VERIFY_STUDENT_EMAIL(token);
-    }
-  });
-
-  return query;
-}
diff --git a/src/pages/redirect/StudentVerificationServerRedirect.tsx b/src/pages/redirect/StudentVerificationServerRedirect.tsx
index 6cdfcc8..d2c9056 100644
--- a/src/pages/redirect/StudentVerificationServerRedirect.tsx
+++ b/src/pages/redirect/StudentVerificationServerRedirect.tsx
@@ -1,5 +1,5 @@
 import { Text, Flex } from '@/components/common/Wrapper';
-import { useVerifyStudentEmail } from '@/hooks/query';
+import { useVerifyStudentEmail } from '@/hooks/mutation';
 import { color } from 'wowds-tokens';
 import Button from 'wowds-ui/Button';
 import GlobalSize from '@/constants/globalSize';
@@ -9,12 +9,18 @@ import { css } from '@emotion/react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { PulseLoader } from 'react-spinners';
 import RoutePath from '@/routes/routePath';
+import { useLayoutEffect } from 'react';
 
 export const StudentVerificationServerRedirect = () => {
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();
   const token = searchParams.get('token');
-  const { isSuccess, isPending } = useVerifyStudentEmail(token);
+  const { isSuccess, isPending, verifyStudentMail } = useVerifyStudentEmail();
+
+  useLayoutEffect(() => {
+    if (token) verifyStudentMail(token);
+  }, [token, verifyStudentMail]);
+  console.log(isSuccess);
 
   //TODO: 추후 로딩 스피너 추가 필요
   return (
diff --git a/src/routes/routePath.ts b/src/routes/routePath.ts
index 7b76a1b..cee68c7 100644
--- a/src/routes/routePath.ts
+++ b/src/routes/routePath.ts
@@ -24,6 +24,7 @@ const RoutePath = {
   AuthServerRedirect: '/social-login/redirect',
   StudentVerificationServerRedirect: '/onboarding/verify-email',
   GDSCHongikLink: 'https://www.gdschongik.com',
+  GDSCHongikDiscord: 'https://discord.gg/dSV6vSEuGU',
   GitHubGuideLink: 'https://www.gdschongik.com/guide/github',
   StudentEmailLinkGuideLink: 'https://www.gdschongik.com/guide/student-email',
   CommunityGuideLink: