minie4/Timetable-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Return all future substitutions by default

Browse Source
This commit is contained in:
minie4
2022-05-03 20:27:57 +02:00
parent b58a44392f
commit aff1b5991c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/api/index.js
View File

@ -36,9 +36,8 @@ export async function getSubstitutions(req, res) {
if (req.query.from && req.query.to) { if (req.query.from && req.query.to) {
from = new Date(req.query.from).setUTCHours(0, 0, 0, 0); from = new Date(req.query.from).setUTCHours(0, 0, 0, 0);
to = new Date(req.query.to).setUTCHours(0, 0, 0, 0); to = new Date(req.query.to).setUTCHours(0, 0, 0, 0);
} else { } else if (req.query.date) {
date = new Date(req.query.date || new Date()).setUTCHours(0, 0, 0, 0); date = new Date(req.query.date).setUTCHours(0, 0, 0, 0);
console.log(date);
} }
const prismaOptions = { const prismaOptions = {
@ -57,8 +56,12 @@ export async function getSubstitutions(req, res) {
gte: new Date(from), gte: new Date(from),
lte: new Date(to), lte: new Date(to),
}; };
} else { } else if (date) {
prismaOptions.where.date = new Date(date); prismaOptions.where.date = new Date(date);
} else {
prismaOptions.where.date = {
gte: new Date(new Date().setUTCHours(0, 0, 0, 0)),
};
} }
const rawSubstitutions = await prisma.substitution.findMany(prismaOptions); const rawSubstitutions = await prisma.substitution.findMany(prismaOptions);