Merge pull request #235 from team-peekabook/feat/#234-version-get-api

[feat] #234 강제 업데이트 버전 확인 시, 토큰 검증 로직 제거
team-peekabook · Dec 8, 2023 · b553b94 · b553b94
2 parents 638625c + cd22912
commit b553b94
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 60 deletions.
diff --git a/src/controller/userController.ts b/src/controller/userController.ts
@@ -8,64 +8,79 @@ import { userTokenCheck } from "../constants/userTokenCheck";
 
 //* 유저닉네임 중복 검사
 const postDuplicateNickname = async (req: Request, res: Response) => {
-    const userId = req.body.userId;
-    const { nickname } = req.body;
-
-    if (!nickname) {
-        return res.status(sc.BAD_REQUEST).send(fail(sc.BAD_REQUEST, rm.NULL_NICKNAME));
-    }
-
-    const refinedNickname = nickname.replace(/ /g,"");
-
-    try {
-
-        const data = await userService.postDuplicateNickname(+userId, refinedNickname);
-        if (!data) {
-            return res.status(sc.BAD_REQUEST).send(fail(sc.BAD_REQUEST, rm.FAIL_CHECK_NICKNAME))
-        }
-
-        return res.status(sc.OK).send(success(sc.OK, rm.SUCCESS_CHECK_NICKNAME, data));
-
-    } catch (error) {
-        const errorMessage = slackErrorMessage(req.method.toUpperCase(), req.originalUrl, error, req.statusCode);
-
-        sendWebhookMessage(errorMessage);
-
-        res.status(sc.INTERNAL_SERVER_ERROR)
-            .send(fail(sc.INTERNAL_SERVER_ERROR, rm.INTERNAL_SERVER_ERROR));
+  const userId = req.body.userId;
+  const { nickname } = req.body;
+
+  if (!nickname) {
+    return res
+      .status(sc.BAD_REQUEST)
+      .send(fail(sc.BAD_REQUEST, rm.NULL_NICKNAME));
+  }
+
+  const refinedNickname = nickname.replace(/ /g, "");
+
+  try {
+    const data = await userService.postDuplicateNickname(
+      +userId,
+      refinedNickname
+    );
+    if (!data) {
+      return res
+        .status(sc.BAD_REQUEST)
+        .send(fail(sc.BAD_REQUEST, rm.FAIL_CHECK_NICKNAME));
     }
 
-}
-
-const getUserVersion = async (req: Request, res:Response) => {
-    const userId = req.body.userId;
-    if (!userId) {
-        return res.status(sc.BAD_REQUEST).send(fail(sc.BAD_REQUEST, rm.BAD_REQUEST));
-    }
-
-    try {
-        const data = await userService.getUserVersion(+userId);
-
-        if(!data) {
-            return res.status(sc.BAD_REQUEST).send(fail(sc.BAD_REQUEST, rm.BAD_REQUEST))
-        }
-
-        return res.status(sc.OK).send(success(sc.OK, rm.GET_USER_VERSION_SUCCESS, data));
-
-    } catch (error) {
-        const errorMessage = slackErrorMessage(req.method.toUpperCase(), req.originalUrl, error, req.statusCode);
-
-        sendWebhookMessage(errorMessage);
-
-        res.status(sc.INTERNAL_SERVER_ERROR)
-            .send(fail(sc.INTERNAL_SERVER_ERROR, rm.INTERNAL_SERVER_ERROR));
+    return res
+      .status(sc.OK)
+      .send(success(sc.OK, rm.SUCCESS_CHECK_NICKNAME, data));
+  } catch (error) {
+    const errorMessage = slackErrorMessage(
+      req.method.toUpperCase(),
+      req.originalUrl,
+      error,
+      req.statusCode
+    );
+
+    sendWebhookMessage(errorMessage);
+
+    res
+      .status(sc.INTERNAL_SERVER_ERROR)
+      .send(fail(sc.INTERNAL_SERVER_ERROR, rm.INTERNAL_SERVER_ERROR));
+  }
+};
+
+const getUserVersion = async (req: Request, res: Response) => {
+  try {
+    const data = await userService.getUserVersion();
+
+    if (!data) {
+      return res
+        .status(sc.BAD_REQUEST)
+        .send(fail(sc.BAD_REQUEST, rm.BAD_REQUEST));
     }
 
-}
+    return res
+      .status(sc.OK)
+      .send(success(sc.OK, rm.GET_USER_VERSION_SUCCESS, data));
+  } catch (error) {
+    const errorMessage = slackErrorMessage(
+      req.method.toUpperCase(),
+      req.originalUrl,
+      error,
+      req.statusCode
+    );
+
+    sendWebhookMessage(errorMessage);
+
+    res
+      .status(sc.INTERNAL_SERVER_ERROR)
+      .send(fail(sc.INTERNAL_SERVER_ERROR, rm.INTERNAL_SERVER_ERROR));
+  }
+};
 
 const userController = {
-    postDuplicateNickname,
-    getUserVersion
-}
+  postDuplicateNickname,
+  getUserVersion,
+};
 
-export default userController;
+export default userController;
diff --git a/src/router/userRouter.ts b/src/router/userRouter.ts
@@ -5,8 +5,8 @@ import { auth } from "../middlewares";
 const router: Router = Router();
 
 //* 닉네임 중복 검사 POST /user/duplicate
-router.post("/duplicate", userController.postDuplicateNickname);
+router.post("/duplicate", auth, userController.postDuplicateNickname);
 //* 유저 업데이트 버전 확인하기 GET /user/version
-router.get("/v1/version", auth, userController.getUserVersion)
+router.get("/v1/version", userController.getUserVersion);
 
-export default router;
+export default router;
diff --git a/src/service/userService.ts b/src/service/userService.ts
@@ -80,9 +80,7 @@ const getUserByRfToken = async (refreshToken: string) => {
   return user;
 };
 
-const getUserVersion = async (
-  userId: number
-): Promise<UserVersionDTO | null> => {
+const getUserVersion = async (): Promise<UserVersionDTO | null> => {
   const versionData = await prisma.version.findUnique({
     where: {
       id: 1,