From 151efacbfe341adb2a30ccd7446c57af74046b5e Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 20 Jul 2024 21:04:27 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=82=92=E5=8F=97=E3=81=91?= =?UTF-8?q?=E5=8F=96=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/task/historyRouter.ts | 3 +-- src/services/historyService.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/routers/task/historyRouter.ts b/src/routers/task/historyRouter.ts index 66346a1..cee48d1 100644 --- a/src/routers/task/historyRouter.ts +++ b/src/routers/task/historyRouter.ts @@ -11,14 +11,13 @@ const commonRouter = Router(); // 共用エンドポイント commonRouter.get("/:childId", (req, res) => { const containPaid = req.query.containPaid === "true"; - const childId = req.params.childId; if (!childId) { const childIdMissingResponse = requiredFieldMissingResponse(["childId"]); res.status(childIdMissingResponse.statusCode).send(childIdMissingResponse.body); return; } - getHistories(childId).then((histories: HistoryResponse[]) => { + getHistories(childId, containPaid).then((histories: HistoryResponse[]) => { res.status(200).send({ list: histories, } as HistoryListResponse); diff --git a/src/services/historyService.ts b/src/services/historyService.ts index bc59b10..4c71067 100644 --- a/src/services/historyService.ts +++ b/src/services/historyService.ts @@ -1,7 +1,7 @@ import { HistoryResponse } from "@src/models/History"; import prisma from "@src/prisma"; -async function getHistories(childId: string): Promise { +async function getHistories(childId: string, containPaid: boolean): Promise { return prisma.taskCompletion.findMany({ where: { child_id: childId,