fix: use getBlocAtDate function to fetch current bloc

Author: FreekBes

src/routes/admin/dashboard.ts

@@ -1,25 +1,13 @@
 import { Express } from 'express';
 import { PrismaClient } from '@prisma/client';
-import { CoalitionScore, getCoalitionScore, getScoresPerType } from '../../utils';
+import { CoalitionScore, getBlocAtDate, 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: now,
-				},
-			},
-		});
+		const currentBlocDeadline = await getBlocAtDate(prisma);
 
 		// Get previous bloc deadlines
 		const blocDeadlines = await prisma.intraBlocDeadline.findMany({

src/routes/home.ts

@@ -46,19 +46,7 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 		const sortedCoalitionScores = Object.entries(coalitionScores).sort((a, b) => b[1].score - a[1].score);
 
 		// Get current bloc deadline
-		const currentBlocDeadline = await prisma.intraBlocDeadline.findFirst({
-			orderBy: {
-				end_at: 'desc',
-			},
-			where: {
-				begin_at: {
-					gte: now,
-				},
-				end_at: {
-					lt: now,
-				},
-			},
-		});
+		const currentBlocDeadline = await getBlocAtDate(prisma);
 		const nextBlocDeadline = await prisma.intraBlocDeadline.findFirst({
 			orderBy: {
 				begin_at: 'asc',