fix: wrong query to fetch currently ongoing season

Author: FreekBes

src/routes/admin/dashboard.ts

@@ -4,15 +4,19 @@ import { CoalitionScore, getCoalitionScore, getScoresPerType } from '../../utils
 
 export const setupAdminDashboardRoutes = function(app: Express, prisma: PrismaClient): void {
 	app.get('/admin', async (req, res) => {
+		const now = new Date();
+
 		// Get current bloc deadline
 		const currentBlocDeadline = await prisma.intraBlocDeadline.findFirst({
 			orderBy: {
 				end_at: 'desc',
 			},
 			where: {
+				begin_at: {
+					gte: now,
+				},
 				end_at: {
-					lt: new Date(),
-					gte: new Date(),
+					lt: now,
 				},
 			},
 		});

src/routes/home.ts

@@ -10,6 +10,7 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 		keepSessionInfo: true,
 	}), async (req, res) => {
 		const user = req.user as ExpressIntraUser;
+		const now = new Date();
 
 		// Get all coalitions
 		const coalitions = await prisma.codamCoalition.findMany({
@@ -50,9 +51,11 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 				end_at: 'desc',
 			},
 			where: {
+				begin_at: {
+					gte: now,
+				},
 				end_at: {
-					lt: new Date(),
-					gte: new Date(),
+					lt: now,
 				},
 			},
 		});
@@ -62,7 +65,7 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 			},
 			where: {
 				begin_at: {
-					gt: new Date(),
+					gt: now,
 				},
 			},
 		});
@@ -109,9 +112,6 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 		// Check if quiz is currently available
 		const quiz_available = await isQuizAvailable(user, prisma);
 
-		// Current datetime
-		const now = new Date();
-
 		return res.render('home.njk', {
 			coalitions,
 			coalitionsObject,