fix: use season name instead of season id in past results rankings

Author: FreekBes

src/handlers/filters.ts

@@ -1,6 +1,6 @@
 import { Express } from 'express';
 import nunjucks from 'nunjucks';
-import { formatThousands, timeAgo, timeFromNow } from '../utils';
+import { formatThousands, getSeasonName, timeAgo, timeFromNow } from '../utils';
 
 export const setupNunjucksFilters = function(app: Express): void {
 	const nunjucksEnv = nunjucks.configure('templates', {
@@ -122,8 +122,7 @@ export const setupNunjucksFilters = function(app: Express): void {
 		if (!season || !season.begin_at || !season.end_at) {
 			return 'Unknown season';
 		}
-		// return `${season.begin_at.getFullYear()}-${season.begin_at.getMonth() + 1} > ${season.end_at.getFullYear()}-${season.end_at.getMonth() + 1}`;
-		return `${season.end_at.toLocaleString('en-US', { month: 'short' })} ${season.end_at.getFullYear()}`;
+		return getSeasonName(season);
 	});
 
 	// Add filter to remove the first item from a list

src/routes/results.ts

@@ -1,6 +1,6 @@
 import { PrismaClient } from '@prisma/client';
 import { Express } from 'express';
-import { getEndedSeasons, getSeasonResults, RANKING_MAX } from '../utils';
+import { getEndedSeasons, getSeasonName, getSeasonResults, RANKING_MAX } from '../utils';
 
 export const setupResultsRoutes = function(app: Express, prisma: PrismaClient): void {
 	app.get('/results', async (req, res) => {
@@ -45,13 +45,13 @@ export const setupResultsRoutes = function(app: Express, prisma: PrismaClient):
 
 		return res.render('ranking.njk', {
 			pageranking: seasonResult.scores.map((entry, index) => ({ // Transform to match ranking.njk expected format
-				rankingName: `${seasonResult.coalition.intra_coalition.name} Leaderboards - Season ${season.id}`,
+				rankingName: `${seasonResult.coalition.intra_coalition.name} Leaderboards - Season ${getSeasonName(season)}`,
 				user: entry.user.intra_user,
 				coalition: seasonResult.coalition,
 				score: entry.score,
 				rank: entry.coalition_rank,
 			})),
-			rankingTitle: `${seasonResult.coalition.intra_coalition.name} Leaderboards - Season ${season.id}`,
+			rankingTitle: `${seasonResult.coalition.intra_coalition.name} Leaderboards - Season ${getSeasonName(season)}`,
 			coalitionColored: false,
 		});
 	});
@@ -101,7 +101,7 @@ export const setupResultsRoutes = function(app: Express, prisma: PrismaClient):
 				score: entry.score,
 				rank: entry.rank,
 			})),
-			rankingTitle: `${ranking.name} - Season ${season.id}`,
+			rankingTitle: `${ranking.name} - Season ${getSeasonName(season)}`,
 			rankingDescription: ranking.description,
 			coalitionColored: true,
 		});

src/utils.ts

@@ -765,6 +765,11 @@ export const getEndedSeasons = async function(prisma: PrismaClient): Promise<(In
 	return seasons;
 };
 
+export const getSeasonName = function(bloc: IntraBlocDeadline): string {
+	// return `${bloc.begin_at.getFullYear()}-${bloc.begin_at.getMonth() + 1} > ${bloc.end_at.getFullYear()}-${bloc.end_at.getMonth() + 1}`;
+	return `${bloc.end_at.toLocaleString('en-US', { month: 'short' })} ${bloc.end_at.getFullYear()}`;
+};
+
 export const getSeasonResults = async function(prisma: PrismaClient, blocDeadlineId: number, topAmount: number = RANKING_MAX) { // Implicit return type
 	const bloc = await prisma.intraBlocDeadline.findUnique({
 		where: {