feat: add alumni overview and alumni badges

Author: FreekBes

prisma/migrations/20260124131340_add_user_alumnization_date/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN "alumnized_at" DATETIME;

prisma/schema.prisma

@@ -30,6 +30,7 @@ model User {
 	pool_year        String?
 	pool_year_num    Int?
 	anonymize_date   DateTime?
+	alumnized_at     DateTime?
 
 	created_at       DateTime
 	updated_at       DateTime

src/handlers/disco.ts

@@ -135,6 +135,10 @@ export const getDiscoPiscineData = async function(prisma: PrismaClient, year: nu
 	// For each user, check if they are also a student in the regular cursus
 	let activeStudents: { [login: string]: boolean } = {};
 	for (const user of users) {
+		if (user.alumnized_at) {
+			activeStudents[user.login] = false; // Alumni are not active students
+			continue;
+		}
 		const cursusUsers = await prisma.cursusUser.findMany({
 			where: {
 				user_id: user.id,

src/handlers/piscine.ts

@@ -122,6 +122,10 @@ export const getCPiscineData = async function(prisma: PrismaClient, year: number
 	// For each user, check if they are also a student in the regular cursus
 	let activeStudents: { [login: string]: boolean } = {};
 	for (const user of users) {
+		if (user.alumnized_at) {
+			activeStudents[user.login] = false; // Alumni are not active students
+			continue;
+		}
 		const cursusUsers = await prisma.cursusUser.findMany({
 			where: {
 				user_id: user.id,

src/intra/users.ts

@@ -23,6 +23,7 @@ export const syncUser = async function(user: any): Promise<void> {
 				pool_year: user.pool_year,
 				pool_year_num: parseInt(user.pool_year),
 				anonymize_date: new Date(user.anonymize_date),
+				alumnized_at: user.alumnized_at ? new Date(user.alumnized_at) : null,
 				updated_at: new Date(user.updated_at),
 				image: (user.image && user.image.versions && user.image.versions.large) ? user.image.versions.large : null,
 			},
@@ -40,6 +41,7 @@ export const syncUser = async function(user: any): Promise<void> {
 				pool_year: user.pool_year,
 				pool_year_num: parseInt(user.pool_year),
 				anonymize_date: new Date(user.anonymize_date),
+				alumnized_at: user.alumnized_at ? new Date(user.alumnized_at) : null,
 				created_at: new Date(user.created_at),
 				updated_at: new Date(user.updated_at),
 				kind: user.kind,

src/routes/users.ts

@@ -25,9 +25,10 @@ export const setupUsersRoutes = function(app: Express, prisma: PrismaClient): vo
 				cursus_users: {
 					some: {
 						cursus_id: 21,
-						end_at: null,
+						end_at: null, // Exclude dropouts
 					},
 				},
+				alumnized_at: null, // Exclude alumni
 			},
 			include: {
 				cursus_users: {
@@ -68,6 +69,7 @@ export const setupUsersRoutes = function(app: Express, prisma: PrismaClient): vo
 						},
 					},
 				},
+				// Include dropouts and alumni for the year overview
 			},
 			include: {
 				cursus_users: {
@@ -84,6 +86,36 @@ export const setupUsersRoutes = function(app: Express, prisma: PrismaClient): vo
 		return res.render('users.njk', { subtitle: `Students (${year} cohort)`, cohorts, users, year });
 	});
 
+	app.get('/users/alumni', passport.authenticate('session'), async (req, res) => {
+		const users = await prisma.user.findMany({
+			where: {
+				login: {
+					not: {
+						startsWith: '3b3-',
+					},
+				},
+				kind: {
+					not: "admin",
+				},
+				alumnized_at: {
+					not: null, // Only include alumni
+				},
+			},
+			include: {
+				cursus_users: {
+					where: {
+						cursus_id: 21,
+					},
+				},
+			},
+			orderBy: [
+				{ usual_full_name: 'asc' }
+			],
+		});
+
+		return res.render('users.njk', { subtitle: 'Alumni', users });
+	});
+
 	app.get('/users/staff', passport.authenticate('session'), async (req, res) => {
 		const users = await prisma.user.findMany({
 			where: {

static/css/base.css

@@ -3,6 +3,7 @@
 /* *************************************** */
 
 :root {
+	--intra: #00BABC;
 	--blue: #3AA2DB;
 	--indigo: #6610f2;
 	--purple: #B73188;
@@ -380,11 +381,19 @@ nav a {
 	padding: 2px 6px;
 	font-size: small;
 	color: var(--white);
-	background-color: var(--blue);
+	background-color: var(--gray-dark);
 	border-radius: 4px;
 	text-transform: uppercase;
 }
 
+.user .badge.student {
+	background-color: var(--blue);
+}
+
+.user .badge.alumni {
+	background-color: var(--intra); /* same color as this badge on Intra */
+}
+
 .user .pool {
 	font-size: small;
 }

templates/disco.njk

@@ -78,7 +78,7 @@
 		<!-- big li element above, spanning multiple lines -->
 			<div class="basic-info">
 				<div class="name">{{ user.usual_full_name | e }}</div>
-				<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a>{% if activeStudents[user.login] %} <span class="badge" title="User is currently an active student">Student</span>{% endif %}</div>
+				<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a>{% if activeStudents[user.login] %} <span class="badge student" title="User is currently an active student">Student</span>{% endif %}{% if user.alumnized_at %} <span class="badge alumni" title="User has been alumnized">Alumni</span>{% endif %}</div>
 				<div class="level">{{ user.cursus_users[0].level | formatFloat }}{{ " (dropout)" if dropouts[user.login] }}</div>
 				<img class="picture" src="{{ user.image if user.image else "/images/default.png" }}" loading="lazy" />
 			</div>

templates/piscines.njk

@@ -89,7 +89,7 @@
 		<!-- big li element above, spanning multiple lines -->
 			<div class="basic-info">
 				<div class="name">{{ user.usual_full_name | e }}</div>
-				<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a>{% if activeStudents[user.login] %} <span class="badge" title="User is currently an active student">Student</span>{% endif %}</div>
+				<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a>{% if activeStudents[user.login] %} <span class="badge student" title="User is currently an active student">Student</span>{% endif %}{% if user.alumnized_at %} <span class="badge alumni" title="User has been alumnized">Alumni</span>{% endif %}</div>
 				<div class="level">{{ user.cursus_users[0].level | formatFloat }}{{ " (dropout)" if dropouts[user.login] }}{{ " (potential dropout)" if potentialDropouts[user.login] }}</div>
 				<img class="picture" src="{{ user.image if user.image else "/images/default.png" }}" loading="lazy" />
 			</div>

templates/users.njk

@@ -5,6 +5,7 @@
 <!-- selection of users -->
 <nav>
 	<a class="userlist-selector" href="/users/students">Students</a>
+	<a class="userlist-selector" href="/users/alumni">Alumni</a>
 	<a class="userlist-selector" href="/users/pisciners">C Pisciners</a>
 	<a class="userlist-selector" href="/users/disco">Discovery Pisciners</a>
 	<a class="userlist-selector" href="/users/staff">Staff</a>
@@ -60,7 +61,7 @@
 		<!-- display user information -->
 		<li class="user {{ user.cursus_users[0] | markDropout }}">
 			<div class="name">{{ user.usual_full_name | e }}</div>
-			<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a></div>
+			<div class="login" title="User ID {{ user.id | int }}"><a class="external" target="_blank" href="https://profile.intra.42.fr/users/{{ user.login | e }}/">{{ user.login | e }}</a>{% if user.alumnized_at %} <span class="badge alumni" title="User has been alumnized">Alumni</span>{% endif %}</div>
 			<div class="pool">{{ user.pool_month | e }} {{ user.pool_year | int }}</div>
 			<img class="picture" src="{{ user.image | e if user.image else "/images/default.png" }}" loading="lazy" />
 		</li>