feat: update all dependencies

FreekBes · FreekBes · commit c81f1deb770f · 2026-03-18T12:06:41.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,36 +17,38 @@
 	"license": "MIT",
 	"dependencies": {
 		"@codam/fast42": "^2.1.6",
-		"@prisma/client": "^5.20.0",
-		"@quixo3/prisma-session-store": "^3.1.13",
-		"body-parser": "^1.20.4",
-		"canvas": "^3.2.0",
-		"dotenv": "^16.4.5",
-		"express": "^4.22.1",
+		"@prisma/adapter-pg": "^7.5.0",
+		"@prisma/client": "^7.5.0",
+		"@quixo3/prisma-session-store": "^3.1.19",
+		"body-parser": "^2.2.2",
+		"canvas": "^3.2.1",
+		"dotenv": "^17.3.1",
+		"express": "^5.2.1",
 		"express-session": "^1.19.0",
 		"helmet": "^8.1.0",
 		"node-cache": "^5.1.2",
 		"nunjucks": "^3.2.4",
 		"passport": "^0.7.0",
-		"passport-oauth2": "^1.8.0"
+		"passport-oauth2": "^1.8.0",
+		"pg": "^8.20.0"
 	},
 	"devDependencies": {
 		"@semantic-release-plus/docker": "^3.1.3",
 		"@semantic-release/changelog": "^6.0.3",
-		"@semantic-release/commit-analyzer": "^13.0.0",
+		"@semantic-release/commit-analyzer": "^13.0.1",
 		"@semantic-release/git": "^10.0.1",
-		"@semantic-release/github": "^10.0.6",
+		"@semantic-release/github": "^12.0.6",
 		"@semantic-release/npm": "^13.1.5",
-		"@types/chart.js": "^2.9.41",
+		"@types/chart.js": "^4.0.1",
 		"@types/cookie-session": "^2.0.49",
-		"@types/express": "^4.17.21",
-		"@types/express-session": "^1.18.0",
+		"@types/express": "^5.0.6",
+		"@types/express-session": "^1.18.2",
 		"@types/nunjucks": "^3.2.6",
-		"@types/passport": "^1.0.16",
-		"@types/passport-oauth2": "^1.4.17",
-		"@types/uuid": "^10.0.0",
-		"prisma": "^5.20.0",
+		"@types/passport": "^1.0.17",
+		"@types/passport-oauth2": "^1.8.0",
+		"@types/uuid": "^11.0.0",
+		"prisma": "^7.5.0",
 		"semantic-release": "^25.0.3",
-		"typescript": "^5.4.5"
+		"typescript": "^5.9.3"
 	}
 }
diff --git a/prisma.config.ts b/prisma.config.ts
@@ -0,0 +1,13 @@
+import "dotenv/config";
+import type { PrismaConfig } from "prisma";
+import { env } from "prisma/config";
+
+export default {
+	schema: "prisma/schema.prisma",
+	migrations: {
+		path: "prisma/migrations",
+	},
+	datasource: {
+		url: env("PRISMA_DB_URL"),
+	},
+} satisfies PrismaConfig;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -4,7 +4,6 @@ generator client {
 
 datasource db {
 	provider = "postgresql"
-	url      = env("PRISMA_DB_URL")
 }
 
 // ********************************************* //
diff --git a/src/dev/create_codam_titles.ts b/src/dev/create_codam_titles.ts
@@ -1,6 +1,5 @@
 import readline from 'readline';
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const main = async function(): Promise<void> {
 	console.warn('Are you from the Codam (42 Amsterdam) campus? If not, please do not run this script as it is Codam-specific and may break our system on Intra.  Are you sure you want to continue? (yes/no)');
diff --git a/src/dev/create_quiz_questions.ts b/src/dev/create_quiz_questions.ts
@@ -1,6 +1,5 @@
-import { PrismaClient } from '@prisma/client';
 import { getCoalitionIds } from '../utils';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const deleteExistingQuizQuestions = async function(): Promise<void> {
 	await prisma.codamCoalitionTestAnswer.deleteMany({});
diff --git a/src/dev/create_rankings.ts b/src/dev/create_rankings.ts
@@ -1,5 +1,4 @@
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const deleteExistingRankings = async function(): Promise<void> {
 	await prisma.codamCoalitionRanking.deleteMany({});
diff --git a/src/dev/delete_all_results.ts b/src/dev/delete_all_results.ts
@@ -1,5 +1,4 @@
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 import readline from 'readline';
 
 const main = async function(): Promise<void> {
diff --git a/src/dev/delete_all_scores.ts b/src/dev/delete_all_scores.ts
@@ -1,5 +1,4 @@
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 import readline from 'readline';
 
 const main = async function(): Promise<void> {
diff --git a/src/dev/delete_all_sessions.ts b/src/dev/delete_all_sessions.ts
@@ -1,5 +1,4 @@
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 import readline from 'readline';
 
 const main = async function(): Promise<void> {
diff --git a/src/dev/delete_synced_intra_scores.ts b/src/dev/delete_synced_intra_scores.ts
@@ -1,6 +1,5 @@
-import { PrismaClient } from '@prisma/client';
+import { prisma } from '../handlers/db';
 import Fast42 from '@codam/fast42';
-const prisma = new PrismaClient();
 import readline from 'readline';
 
 const main = async function(): Promise<void> {
diff --git a/src/dev/get_intra_scoreable_types.ts b/src/dev/get_intra_scoreable_types.ts
@@ -1,8 +1,7 @@
 import { fetchMultiple42ApiPagesCallback } from "../sync/base";
 import Fast42 from "@codam/fast42";
-import { PrismaClient } from '@prisma/client';
 import { INTRA_API_UID, INTRA_API_SECRET } from "../env";
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const getAllScoreableTypes = async function(api: Fast42): Promise<void> {
 	const coalition = await prisma.intraCoalition.findFirst({});
diff --git a/src/dev/recalculate_pool_donation_scores.ts b/src/dev/recalculate_pool_donation_scores.ts
@@ -1,5 +1,4 @@
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const TYPE_POINT_DONATED = 'point_donated';
 
diff --git a/src/dev/remove_all_intra_titles.ts b/src/dev/remove_all_intra_titles.ts
@@ -1,7 +1,6 @@
 import readline from 'readline';
 import Fast42 from '@codam/fast42';
-import { PrismaClient } from '@prisma/client';
-const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 const PAGE_SIZE = 100;
 
diff --git a/src/dev/test_create_score.ts b/src/dev/test_create_score.ts
@@ -1,7 +1,6 @@
 import Fast42 from "@codam/fast42";
-import { PrismaClient } from '@prisma/client';
+import { prisma } from '../handlers/db';
 import { INTRA_API_UID, INTRA_API_SECRET } from "../env";
-const prisma = new PrismaClient();
 
 const createScore = async function(api: Fast42, login: string): Promise<void> {
 	const user = await prisma.intraUser.findFirst({
diff --git a/src/env.ts b/src/env.ts
@@ -1,3 +1,6 @@
+import dotenv from 'dotenv';
+dotenv.config({ path: '.env', debug: (process.env.NODE_ENV === 'development') });
+
 export const NODE_ENV = process.env.NODE_ENV || 'development';
 export const URL_ORIGIN = process.env.URL_ORIGIN!;
 export const SESSION_SECRET = process.env.SESSION_SECRET!;
@@ -8,6 +11,7 @@ export const CURSUS_ID: number = parseInt(process.env.INTRA_CURSUS_ID!);
 export const ASSISTANT_GROUP_ID: number = parseInt(process.env.INTRA_ASSISTANT_GROUP_ID!);
 export const INTRA_TEST_ACCOUNTS: string[] = (process.env.INTRA_TEST_ACCOUNTS || '').split(',');
 export const ASSISTANTS_CAN_QUIZ: boolean = process.env.ASSISTANTS_CAN_QUIZ === 'true';
+export const PRISMA_DB_URL = process.env.PRISMA_DB_URL!;
 
 // Not defined in .env but in regular shell environment variables
 export const DEV_DAYS_LIMIT: number = process.env.DEV_DAYS_LIMIT ? parseInt(process.env.DEV_DAYS_LIMIT) : 365;
diff --git a/src/handlers/db.ts b/src/handlers/db.ts
@@ -0,0 +1,8 @@
+import { PrismaClient } from "@prisma/client";
+import { PrismaPg } from "@prisma/adapter-pg";
+import { PRISMA_DB_URL } from "../env";
+
+const adapter = new PrismaPg({
+	connectionString: PRISMA_DB_URL,
+});
+export const prisma = new PrismaClient({ adapter });
diff --git a/src/handlers/middleware.ts b/src/handlers/middleware.ts
@@ -1,10 +1,10 @@
 import bodyParser from 'body-parser';
 import NodeCache from 'node-cache';
-import { Request, Response, NextFunction } from "express";
+import { Request, Response, NextFunction, Express } from "express";
 import { CustomSessionData } from "./session";
 import { ExpressIntraUser } from '../sync/oauth';
 import { isStaff } from '../utils';
-import { prisma } from '../main';
+import { prisma } from '../handlers/db';
 
 
 const checkIfAuthenticated = function(req: Request, res: Response, next: NextFunction) {
@@ -79,13 +79,13 @@ const staffMiddleware = async function(req: Request, res: Response, next: NextFu
 	return res.status(403).send('Forbidden');
 };
 
-export const setupExpressMiddleware = function(app: any) {
+export const setupExpressMiddleware = function(app: Express): void {
 	app.use(bodyParser.json());
 	app.use(bodyParser.urlencoded({ extended: true }));
 	app.use(checkIfAuthenticated);
 	app.use(includeUser);
 	app.use(includeCoalitions);
-	app.all('/admin*', staffMiddleware); // require staff accounts to access admin routes
+	app.all('/admin{/*path}', staffMiddleware); // require staff accounts to access admin routes
 	app.use(expressErrorHandler); // should remain last
 	// More middleware for session management and authentication are defined in usePassport in authentication.ts
 };
diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,5 @@
 // Load the .env file
-import dotenv from 'dotenv';
-dotenv.config({ path: '.env', debug: (process.env.NODE_ENV === 'development') });
+import { INTRA_API_UID, INTRA_API_SECRET, NODE_ENV } from './env';
 
 // Imports for the server
 import express from 'express';
@@ -9,12 +8,10 @@ import express from 'express';
 import helmet from "helmet";
 
 // Imports for the database connection
-import { PrismaClient } from "@prisma/client";
-export const prisma = new PrismaClient();
+import { prisma } from './handlers/db';
 
 // Imports for the Intra API
 import Fast42 from '@codam/fast42';
-import { INTRA_API_UID, INTRA_API_SECRET, NODE_ENV } from './env';
 import { syncWithIntra } from './sync/base';
 const NO_INTRA_SYNC = process.argv.includes('--nosync');
 let initSyncComplete = false;
diff --git a/src/routes/admin/apisearcher.ts b/src/routes/admin/apisearcher.ts
@@ -1,6 +1,6 @@
 import { Express } from 'express';
 import { Prisma, PrismaClient } from '@prisma/client';
-import { DefaultArgs } from '@prisma/client/runtime/library';
+import { DefaultArgs } from '@prisma/client/runtime/client';
 import { CAMPUS_ID, CURSUS_ID } from '../../env';
 import { getAPIClient, fetchSingleApiPage, parseTeamInAPISearcher, parseScaleTeamInAPISearcher, getPageNumber, getOffset } from '../../utils';
 
diff --git a/src/routes/admin/charts.ts b/src/routes/admin/charts.ts
@@ -1,7 +1,7 @@
 import { Express } from 'express';
 import { PrismaClient } from '@prisma/client';
 import { CURSUS_ID } from '../../env';
-import { ChartConfiguration } from 'chart.js';
+import type { ChartConfiguration } from 'chart.js';
 import { getBlocAtDate } from '../../utils';
 import NodeCache from 'node-cache';
 
@@ -187,7 +187,7 @@ export const setupAdminChartsRoutes = function(app: Express, prisma: PrismaClien
 					datasets: [
 						{
 							label: 'Scores',
-							data: scoresPerUser.map((score) => ({ x: score.amount, y: score.count })) as Chart.ChartPoint[],
+							data: scoresPerUser.map((score) => ({ x: score.amount, y: score.count })),
 							backgroundColor: coalition.color ? coalition.color : '#808080',
 							borderWidth: 1,
 						},
diff --git a/src/routes/charts.ts b/src/routes/charts.ts
@@ -1,5 +1,5 @@
 import { PrismaClient } from '@prisma/client';
-import { ChartConfiguration } from 'chart.js';
+import type { ChartConfiguration } from 'chart.js';
 import { Express } from 'express';
 import { CoalitionScore, getBlocAtDate, getCoalitionScore } from '../utils';
 import NodeCache from 'node-cache';
@@ -57,7 +57,6 @@ export const generateChartAllCoalitionScoreHistory = async function(prisma: Pris
 			datasets: [],
 		},
 		options: {
-			showLines: true,
 			scales: {
 				// @ts-ignore
 				x: {
@@ -88,6 +87,7 @@ export const generateChartAllCoalitionScoreHistory = async function(prisma: Pris
 			fill: false,
 			// @ts-ignore
 			tension: 0.25,
+			showLine: true,
 		});
 	}
 
@@ -150,11 +150,11 @@ export const generateChartCoalitionScoreHistory = async function(prisma: PrismaC
 					fill: false,
 					// @ts-ignore
 					tension: 0.25,
+					showLine: true,
 				},
 			],
 		},
 		options: {
-			showLines: true,
 			scales: {
 				// @ts-ignore
 				x: {
@@ -290,10 +290,10 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 						data: dates.map(date => scoreSumsPerDate[date.getTime()] || 0),
 						// @ts-ignore
 						tension: 0.25,
+						showLine: true,
 					}],
 				},
 				options: {
-					showLines: true,
 					scales: {
 						// @ts-ignore
 						x: {
@@ -425,11 +425,11 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 							data: dates.map(date => scoreSumsPerTypePerDate[fixedPointType.type || 'null'][date.getTime()] || 0),
 							// @ts-ignore
 							tension: 0.25,
+							showLine: true,
 						};
 					}),
 				},
 				options: {
-					showLines: true,
 					scales: {
 						// @ts-ignore
 						x: {
diff --git a/src/sync/base.ts b/src/sync/base.ts
@@ -1,5 +1,4 @@
 import fs from 'fs';
-import { PrismaClient } from "@prisma/client";
 import Fast42 from "@codam/fast42";
 import { initCodamQuiz } from "./quiz";
 import { initCodamCoalitionFixedTypes } from "./fixed_point_types";
@@ -16,8 +15,7 @@ import { handleRankingTitleCreation, handleRankingBonuses } from './rankings';
 import { syncTitles } from './titles';
 import { calculateResults } from './results';
 import { syncGroups, syncGroupsUsers } from './groups';
-
-export const prisma = new PrismaClient();
+import { prisma } from '../handlers/db';
 
 /**
  * Fetch all items from all pages of a Fast42 API endpoint.
diff --git a/src/sync/blocs.ts b/src/sync/blocs.ts
@@ -1,5 +1,6 @@
 import Fast42 from '@codam/fast42';
-import { prisma, syncData } from './base';
+import { prisma } from '../handlers/db';
+import { syncData } from './base';
 import { linkCoalitionToBloc, syncCoalition } from './coalitions';
 import { CAMPUS_ID, CURSUS_ID } from '../env';
 
diff --git a/src/sync/cleanup.ts b/src/sync/cleanup.ts
@@ -1,4 +1,5 @@
-import { prisma, fetchSingle42ApiPage, fetchMultiple42ApiPages } from './base';
+import { prisma } from '../handlers/db';
+import { fetchSingle42ApiPage, fetchMultiple42ApiPages } from './base';
 import Fast42 from '@codam/fast42';
 import { syncUser } from './users';
 import { getCoalitionIds } from '../utils';
diff --git a/src/sync/coalitions.ts b/src/sync/coalitions.ts
@@ -1,4 +1,4 @@
-import { prisma } from './base';
+import { prisma } from '../handlers/db';
 
 // Coalition object can be an object returned by /v2/coalition/:id !
 export const syncCoalition = async function(coalition: any): Promise<void> {
diff --git a/src/sync/coalitions_users.ts b/src/sync/coalitions_users.ts
@@ -1,5 +1,6 @@
+import { prisma } from '../handlers/db';
 import Fast42 from '@codam/fast42';
-import { prisma, syncData } from './base';
+import { syncData } from './base';
 import { getCoalitionIds } from '../utils';
 
 // User object can be an object returned by /v2/users/:id or the user object in /v2/cursus_users/:id !
diff --git a/src/sync/cursus_users.ts b/src/sync/cursus_users.ts
@@ -1,5 +1,6 @@
 import Fast42 from '@codam/fast42';
-import { prisma, syncData } from './base';
+import { prisma } from '../handlers/db';
+import { syncData } from './base';
 import { CAMPUS_ID, CURSUS_ID } from '../env';
 
 export const syncCursusUser = async function(cursusUser: any): Promise<void> {
diff --git a/src/sync/fixed_point_types.ts b/src/sync/fixed_point_types.ts
@@ -1,4 +1,4 @@
-import { prisma } from './base';
+import { prisma } from '../handlers/db';
 
 const createFixedTypeIfNotExists = async function(type: string, desc: string, points: number): Promise<void> {
 	const fixedPointType = await prisma.codamCoalitionFixedType.findFirst({
diff --git a/src/sync/groups.ts b/src/sync/groups.ts
@@ -1,5 +1,6 @@
 import Fast42 from '@codam/fast42';
-import { prisma, syncData, syncDataCB } from './base';
+import { prisma } from '../handlers/db';
+import { syncData, syncDataCB } from './base';
 import { ASSISTANT_GROUP_ID } from '../env';
 
 export const syncGroups = async function(api: Fast42, syncSince: Date, syncDate: Date): Promise<void> {
diff --git a/src/sync/oauth.ts b/src/sync/oauth.ts
diff --git a/src/sync/projects.ts b/src/sync/projects.ts
diff --git a/src/sync/quiz.ts b/src/sync/quiz.ts
diff --git a/src/sync/rankings.ts b/src/sync/rankings.ts
diff --git a/src/sync/results.ts b/src/sync/results.ts
diff --git a/src/sync/scores.ts b/src/sync/scores.ts
diff --git a/src/sync/titles.ts b/src/sync/titles.ts
diff --git a/src/sync/users.ts b/src/sync/users.ts
diff --git a/templates/base.njk b/templates/base.njk
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ generator client {`
`4`	`4`
`5`	`5`	`datasource db {`
`6`	`6`	`provider = "postgresql"`
`7`		`- url = env("PRISMA_DB_URL")`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`// ********************************************* //`