mirror of
https://github.com/r-ca/kidshift-be.git
synced 2024-10-25 16:14:02 +00:00
切り分け
This commit is contained in:
parent
81e006772e
commit
cf6a6cea64
|
@ -1,6 +1,6 @@
|
|||
import { Router } from 'express';
|
||||
import { Task } from '@prisma/client';
|
||||
import { createTask, getTasks } from '@src/services/taskService';
|
||||
import { createTask, getTasks, getTasksByChild } from '@src/services/taskService';
|
||||
|
||||
const router = Router();
|
||||
|
||||
|
@ -18,16 +18,30 @@ router.get('/', (req, res) => {
|
|||
});
|
||||
return;
|
||||
} else {
|
||||
getTasks(body.home_group_id, body.child_id)
|
||||
.then((tasks: Task[]) => {
|
||||
res.status(200).json(tasks);
|
||||
})
|
||||
.catch((err) => {
|
||||
res.status(500).json({
|
||||
message: 'エラーが発生しました',
|
||||
error: err
|
||||
if (!body.child_id) {
|
||||
getTasks(body.home_group_id)
|
||||
.then((tasks: Task[]) => {
|
||||
res.status(200).json(tasks);
|
||||
})
|
||||
.catch((err) => {
|
||||
res.status(500).json({
|
||||
message: 'エラーが発生しました',
|
||||
error: err
|
||||
});
|
||||
});
|
||||
});
|
||||
return;
|
||||
} else {
|
||||
getTasksByChild(body.child_id)
|
||||
.then((tasks: Task[]) => {
|
||||
res.status(200).json(tasks);
|
||||
})
|
||||
.catch((err) => {
|
||||
res.status(500).json({
|
||||
message: 'エラーが発生しました',
|
||||
error: err
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -1,12 +1,19 @@
|
|||
import { PrismaPromise, Task } from "@prisma/client";
|
||||
import prisma from "@src/prisma";
|
||||
|
||||
function getTasks(homeGroupId: string, childId?: string): PrismaPromise<Task[]> {
|
||||
function getTasks(homeGroupId: string): PrismaPromise<Task[]> {
|
||||
return prisma.task.findMany({
|
||||
where: {
|
||||
home_group_id: {
|
||||
equals: homeGroupId
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function getTasksByChild(childId: string): PrismaPromise<Task[]> {
|
||||
return prisma.task.findMany({
|
||||
where: {
|
||||
TaskChildLinkage: {
|
||||
some: {
|
||||
child_id: {
|
||||
|
@ -27,4 +34,4 @@ function createTask(task: Task): PrismaPromise<Task> {
|
|||
});
|
||||
}
|
||||
|
||||
export { getTasks, createTask }
|
||||
export { getTasks, createTask, getTasksByChild }
|
||||
|
|
Loading…
Reference in New Issue
Block a user