From 80461ecb176fe4532fafbf0db99fb2d53edbd9d2 Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 03:48:43 +0900 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=A4=87=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/parent/index.ts | 2 - src/routers/parent/taskRouter.ts | 158 ------------------------------- 2 files changed, 160 deletions(-) delete mode 100644 src/routers/parent/taskRouter.ts diff --git a/src/routers/parent/index.ts b/src/routers/parent/index.ts index e8ec9b8..54c11c2 100644 --- a/src/routers/parent/index.ts +++ b/src/routers/parent/index.ts @@ -4,7 +4,6 @@ import verifyToken from '../middlewares/verifyToken'; import verifyParent from '../middlewares/verifyParent'; import authRouter from './authRouter'; -import taskRouter from './taskRouter'; import accountRouter from './accountRouter'; const router = Router(); @@ -12,7 +11,6 @@ const logger = new Logger(); logger.setTag('parent/index.ts'); router.use('/auth', authRouter); -router.use('/task', verifyToken, verifyParent, taskRouter); router.use('/account', verifyToken, verifyParent, accountRouter); export default router; diff --git a/src/routers/parent/taskRouter.ts b/src/routers/parent/taskRouter.ts deleted file mode 100644 index a98641e..0000000 --- a/src/routers/parent/taskRouter.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { Router } from 'express'; -import { Task } from '@prisma/client'; -import { getTask, createTask, getTasks, updateTask, deleteTask, registCompleteTask } from '@src/services/taskService'; -import { TaskListResponse, TaskAddRequest } from '@src/models/Task'; - -const router = Router(); - -router.get('/', (req, res) => { - if (req.user === undefined) { - res.status(500).json({ - message: 'エラーが発生しました(JWT解析結果が不正/未設定です)' - }); - return; - } - getTasks(req.user.claims.home_group_id) - .then((taskListResponse: TaskListResponse) => { - res.status(200).json(taskListResponse); - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); - return; -}); - -router.post('/', (req, res) => { - // BodyをTaskAddRequestにマッピングできるかチェック - let requestBody: TaskAddRequest; - try { - requestBody = req.body; - if (!requestBody) { - res.status(400).json({ - message: 'リクエストボディが空です' - }); - return; - } - if (!requestBody.name || !requestBody.reward) { - res.status(400).json({ - message: 'name, rewardは必須です' - }); - return; - } - } catch (e) { - res.status(400).json({ - message: 'リクエストボディが不正です' - }); - return; - } - - if (req.user === undefined) { - res.status(500).json({ - message: 'エラーが発生しました(JWT解析結果が不正/未設定です)' - }); - return; - } - - createTask(requestBody, req.user.claims.home_group_id) - .then((task: Task) => { - res.status(201).json(task); // TODO - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); -}); - -router.get('/:taskId', (req, res) => { - getTask(req.params.taskId) - .then((task: Task | null) => { - if (task) { - res.status(200).json(task); - } else { - res.status(404).json({ - message: 'タスクが見つかりませんでした' - }); - } - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); -}); - -router.put('/:taskId', (req, res) => { - const body = req.body; - if (!body) { - res.status(400).json({ - message: '不正なリクエスト: リクエストボディが空です' - }); - return; - } - if (!body.displayName || !body.reward) { - res.status(400).json({ - message: '不正なリクエスト: displayName, rewardは必須です' - }); - return; - } else { - const task: Task = {} as Task; - // TODO: 共通化 - task.id = req.params.taskId; - task.display_name = body.displayName; - task.reward = body.reward; - updateTask(task) - .then((task: Task) => { - res.status(200).json(task); - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); - } -}); - -router.delete('/:taskId', (req, res) => { - deleteTask(req.params.taskId) - .then(() => { - res.status(200).json({ - message: 'OK', - }); - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); -}); - -router.post('/:taskId/complete', (req, res) => { - if (req.query.childId === undefined) { - res.status(400).json({ - message: '不正なリクエスト: childIdは必須です' - }); - return; - } - registCompleteTask(req.params.taskId, req.query.childId as string) - .then(() => { - res.status(200).json({ - message: 'OK', - }); - }) - .catch((err) => { - res.status(500).json({ - message: 'エラーが発生しました', - error: err - }); - }); -}); - -export default router;