fix: fix several cases of cursus users only being considered active when no end date is set

Author: FreekBes

src/handlers/points.ts

@@ -33,16 +33,15 @@ export const createScore = async function(prisma: PrismaClient, type: CodamCoali
 			},
 			cursus_users: {
 				where: { // only get active cursus_users for the relevant cursus
-					OR: [
+					AND: [
 						{
 							cursus_id: CURSUS_ID,
-							end_at: null,
 						},
 						{
-							cursus_id: CURSUS_ID,
-							end_at: {
-								gt: scoreDate, // also consider cursus_users that were still active at the score creation date
-							},
+							OR: [
+								{ end_at: null },
+								{ end_at: { gt: scoreDate } }, // also consider cursus_users that were still active at the score creation date
+							],
 						},
 					],
 				},

src/routes/admin/apisearcher.ts

@@ -525,7 +525,10 @@ export const setupAPISearchRoutes = function(app: Express, prisma: PrismaClient)
 				cursus_users: {
 					some: {
 						cursus_id: CURSUS_ID,
-						end_at: null,
+						OR: [
+							{ end_at: null },
+							{ end_at: { gt: new Date() } }, // also consider cursus_users that are still active
+						],
 					},
 				},
 			},

src/routes/admin/charts.ts

@@ -27,10 +27,13 @@ export const setupAdminChartsRoutes = function(app: Express, prisma: PrismaClien
 					cursus_users: {
 						some: {
 							cursus_id: CURSUS_ID,
-							end_at: null,
-						}
-					}
-				}
+							OR: [
+								{ end_at: null },
+								{ end_at: { gt: new Date() } }, // also consider cursus_users that are still active at the current date
+							],
+						},
+					},
+				},
 			},
 			orderBy: {
 				_count: {
@@ -64,7 +67,10 @@ export const setupAdminChartsRoutes = function(app: Express, prisma: PrismaClien
 					cursus_users: {
 						some: {
 							cursus_id: CURSUS_ID,
-							end_at: null,
+							OR: [
+								{ end_at: null },
+								{ end_at: { gt: new Date() } }, // also consider cursus_users that are still active at the current date
+							],
 						},
 					},
 				},

src/routes/coalitions.ts

@@ -39,7 +39,10 @@ export const setupCoalitionRoutes = function(app: Express, prisma: PrismaClient)
 				},
 				cursus_users: {
 					some: {
-						end_at: null, // Make sure to only get active staff members
+						OR: [
+							{ end_at: null },
+							{ end_at: { gt: now } }, // also consider cursus_users that are still active
+						],
 					},
 				},
 			},

src/routes/quiz.ts

@@ -73,16 +73,15 @@ export const isQuizAvailable = async function(user: IntraUser | ExpressIntraUser
 			},
 			cursus_users: {
 				where: {
-					OR: [ // only consider active cursus users for the relevant cursus
+					AND: [ // only consider active cursus users for the relevant cursus
 						{
 							cursus_id: CURSUS_ID,
-							end_at: null,
 						},
 						{
-							cursus_id: CURSUS_ID,
-							end_at: {
-								gt: currentDate, // also consider cursus_users that are still active at the current date
-							},
+							OR: [
+								{ end_at: null },
+								{ end_at: { gt: currentDate } }, // also consider cursus_users that are still active at the current date
+							],
 						},
 					],
 				},

src/utils.ts

@@ -66,9 +66,18 @@ export const isStudent = async function(prisma: PrismaClient, intraUser: Express
 	// Or the student is not a part of the campus the coalition system is part of.
 	const cursusUser = await prisma.intraCursusUser.findFirst({
 		where: {
-			user_id: userId,
-			cursus_id: CURSUS_ID,
-			end_at: null,
+			AND: [
+				{
+					user_id: userId,
+					cursus_id: CURSUS_ID,
+				},
+				{
+					OR: [
+						{ end_at: null },
+						{ end_at: { gt: new Date() } }, // also consider cursus_users that were still active at the score creation date
+					],
+				},
+			],
 		},
 	});
 	return (cursusUser !== null);
@@ -524,7 +533,10 @@ export const getCoalitionScore = async function(prisma: PrismaClient, coalitionI
 				cursus_users: {
 					some: {
 						cursus_id: CURSUS_ID,
-						end_at: null,
+						OR: [
+							{ end_at: null },
+							{ end_at: { gt: atDateTime } }, // also consider cursus_users that were still active at the score creation date
+						],
 					}
 				}
 			},