From 71ed1013b753acbdc50311b89ad7130ca8fdc5f8 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 11 Dec 2024 16:54:37 +0000
Subject: [PATCH 01/12] ENCOA-270, ENCOA-265, ENCOA-262, ENCOA-258

---
 src/components/Sidebar.tsx               | 21 +++++++++--------
 src/interfaces/user.ts                   |  1 +
 src/pages/(admin)/Lists/index.tsx        |  2 +-
 src/pages/(status)/PaymentDue.tsx        |  2 ++
 src/pages/dashboard/corporate.tsx        | 22 +++++++++---------
 src/pages/dashboard/teacher.tsx          | 26 ++++++++++-----------
 src/pages/entities/[id]/roles/[role].tsx |  3 ++-
 src/pages/payment.tsx                    | 29 ++++++++++++++++--------
 src/pages/settings.tsx                   |  4 +++-
 src/resources/entityPermissions.ts       |  6 +++--
 10 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 74cc576b..f89c97b9 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -171,16 +171,17 @@ export default function Sidebar({
 						badge={totalAssignedTickets}
 					/>
 				)}
-				{(entitiesAllowGeneration.length > 0 || isAdmin) && (
-					<Nav
-						disabled={disableNavigation}
-						Icon={BsCloudFill}
-						label="Generation"
-						path={path}
-						keyPath="/generation"
-						isMinimized={isMinimized}
-					/>
-				)}
+				{checkAccess(user, ["admin", "developer", "teacher", 'corporate', 'mastercorporate'])
+					&& (entitiesAllowGeneration.length > 0 || isAdmin) && (
+						<Nav
+							disabled={disableNavigation}
+							Icon={BsCloudFill}
+							label="Generation"
+							path={path}
+							keyPath="/generation"
+							isMinimized={isMinimized}
+						/>
+					)}
 			</div>
 			<div className="-xl:flex flex-col gap-3 xl:hidden">
 				<Nav disabled={disableNavigation} Icon={MdSpaceDashboard} label="Dashboard" path={path} keyPath="/" isMinimized />
diff --git a/src/interfaces/user.ts b/src/interfaces/user.ts
index db6ae044..8de4bf56 100644
--- a/src/interfaces/user.ts
+++ b/src/interfaces/user.ts
@@ -155,6 +155,7 @@ export interface GroupWithUsers extends Omit<Group, "participants" | "admin"> {
 export interface Code {
 	id: string;
 	code: string;
+	entity: string
 	creator: string;
 	expiryDate: Date;
 	type: Type;
diff --git a/src/pages/(admin)/Lists/index.tsx b/src/pages/(admin)/Lists/index.tsx
index 6015701b..9a3de65a 100644
--- a/src/pages/(admin)/Lists/index.tsx
+++ b/src/pages/(admin)/Lists/index.tsx
@@ -55,7 +55,7 @@ export default function Lists({ user, entities = [], permissions }: Props) {
 						Exam List
 					</Tab>
 				)}
-				{checkAccess(user, ["developer", "admin", "corporate"]) && entitiesViewCodes.length > 0 && (
+				{checkAccess(user, ["developer", "admin", "corporate", "mastercorporate"]) && entitiesViewCodes.length > 0 && (
 					<Tab
 						className={({ selected }) =>
 							clsx(
diff --git a/src/pages/(status)/PaymentDue.tsx b/src/pages/(status)/PaymentDue.tsx
index a85d52c9..82a081dc 100644
--- a/src/pages/(status)/PaymentDue.tsx
+++ b/src/pages/(status)/PaymentDue.tsx
@@ -15,9 +15,11 @@ import { ToastContainer } from "react-toastify";
 import useDiscounts from "@/hooks/useDiscounts";
 import PaymobPayment from "@/components/PaymobPayment";
 import moment from "moment";
+import { EntityWithRoles } from "@/interfaces/entity";
 
 interface Props {
 	user: User;
+	entities: EntityWithRoles[]
 	hasExpired?: boolean;
 	reload: () => void;
 }
diff --git a/src/pages/dashboard/corporate.tsx b/src/pages/dashboard/corporate.tsx
index 1c43c1dc..be404c9e 100644
--- a/src/pages/dashboard/corporate.tsx
+++ b/src/pages/dashboard/corporate.tsx
@@ -36,6 +36,7 @@ import {
 	BsPersonFillGear,
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
+import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 
 interface Props {
 	user: User;
@@ -67,6 +68,8 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
 	const teachers = useMemo(() => users.filter((u) => u.type === "teacher"), [users]);
 
+	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
+
 	const router = useRouter();
 
 	const averageLevelCalculator = (studentStats: Stat[]) => {
@@ -94,16 +97,6 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 		return calculateAverageLevel(levels);
 	};
 
-	const UserDisplay = (displayUser: User) => (
-		<div className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>{displayUser.name}</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
 	return (
 		<>
 			<Head>
@@ -152,7 +145,14 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 							color="purple"
 						/>
 						<IconCard Icon={BsClipboard2Data} label="Exams Performed" value={uniqBy(stats, "exam").length} color="purple" />
-						<IconCard Icon={BsPaperclip} label="Average Level" value={averageLevelCalculator(stats).toFixed(1)} color="purple" />
+						{allowedEntityStatistics.length > 0 && (
+							<IconCard Icon={BsPersonFillGear}
+								onClick={() => router.push("/statistical")}
+								label="Entity Statistics"
+								value={allowedEntityStatistics.length}
+								color="purple"
+							/>
+						)}
 						<IconCard Icon={BsPersonFillGear}
 							onClick={() => router.push("/users/performance")}
 							label="Student Performance"
diff --git a/src/pages/dashboard/teacher.tsx b/src/pages/dashboard/teacher.tsx
index b86da522..14b52e48 100644
--- a/src/pages/dashboard/teacher.tsx
+++ b/src/pages/dashboard/teacher.tsx
@@ -21,11 +21,12 @@ import { uniqBy } from "lodash";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
-import { BsClipboard2Data, BsEnvelopePaper, BsPaperclip, BsPeople, BsPersonFill } from "react-icons/bs";
+import { BsClipboard2Data, BsEnvelopePaper, BsPaperclip, BsPeople, BsPersonFill, BsPersonFillGear } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 import { requestUser } from "@/utils/api";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 import { filterAllowedUsers } from "@/utils/users.be";
+import { isAdmin } from "@/utils/users";
 
 interface Props {
 	user: User;
@@ -44,7 +45,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 		return redirect("/")
 
 	const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(entityIDS);
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
 	const users = await filterAllowedUsers(user, entities)
 
 	const assignments = await getEntitiesAssignments(entityIDS);
@@ -58,6 +59,8 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
 	const router = useRouter();
 
+	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
+
 	const averageLevelCalculator = (studentStats: Stat[]) => {
 		const formattedStats = studentStats
 			.map((s) => ({
@@ -83,16 +86,6 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 		return calculateAverageLevel(levels);
 	};
 
-	const UserDisplay = (displayUser: User) => (
-		<div className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>{displayUser.name}</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
 	return (
 		<>
 			<Head>
@@ -128,7 +121,14 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 							color="purple"
 						/>
 						<IconCard Icon={BsClipboard2Data} label="Exams Performed" value={uniqBy(stats, "exam").length} color="purple" />
-						<IconCard Icon={BsPaperclip} label="Average Level" value={averageLevelCalculator(stats).toFixed(1)} color="purple" />
+						{allowedEntityStatistics.length > 0 && (
+							<IconCard Icon={BsPersonFillGear}
+								onClick={() => router.push("/statistical")}
+								label="Entity Statistics"
+								value={allowedEntityStatistics.length}
+								color="purple"
+							/>
+						)}
 						<IconCard
 							Icon={BsEnvelopePaper}
 							onClick={() => router.push("/assignments")}
diff --git a/src/pages/entities/[id]/roles/[role].tsx b/src/pages/entities/[id]/roles/[role].tsx
index 561e00d4..3b0d2f86 100644
--- a/src/pages/entities/[id]/roles/[role].tsx
+++ b/src/pages/entities/[id]/roles/[role].tsx
@@ -92,7 +92,8 @@ const ENTITY_MANAGEMENT: PermissionLayout[] = [
 	{ label: "Edit Role Permissions", key: "edit_role_permissions" },
 	{ label: "Assign Role to User", key: "assign_to_role" },
 	{ label: "Delete Entity Role", key: "delete_entity_role" },
-	{ label: "Download Statistics Report", key: "download_statistics_report" }
+	{ label: "Download Statistics Report", key: "download_statistics_report" },
+	{ label: "Edit Grading System", key: "edit_grading_system" }
 ]
 
 const ASSIGNMENT_MANAGEMENT: PermissionLayout[] = [
diff --git a/src/pages/payment.tsx b/src/pages/payment.tsx
index 4b80f906..49854d22 100644
--- a/src/pages/payment.tsx
+++ b/src/pages/payment.tsx
@@ -1,24 +1,35 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { withIronSessionSsr } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
 import useUser from "@/hooks/useUser";
 import PaymentDue from "./(status)/PaymentDue";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
 import { requestUser } from "@/utils/api";
-import { redirect } from "@/utils";
+import { mapBy, redirect, serialize } from "@/utils";
+import { getEntities } from "@/utils/entities.be";
+import { isAdmin } from "@/utils/users";
+import { EntityWithRoles } from "@/interfaces/entity";
+import { User } from "@/interfaces/user";
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
 	if (!user) return redirect("/login")
 
+	const entityIDs = mapBy(user.entities, 'id')
+	const entities = await getEntities(isAdmin(user) ? undefined : entityIDs)
+
 	return {
-		props: {user},
+		props: serialize({ user, entities }),
 	};
 }, sessionOptions);
 
-export default function Home() {
-	const {user} = useUser({redirectTo: "/login"});
+interface Props {
+	user: User,
+	entities: EntityWithRoles[]
+}
+
+export default function Home({ user, entities }: Props) {
 	const router = useRouter();
 
 	return (
@@ -32,7 +43,7 @@ export default function Home() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			{user && <PaymentDue user={user} reload={router.reload} />}
+			<PaymentDue entities={entities} user={user} reload={router.reload} />
 		</>
 	);
 }
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index df2b50ec..5dd67d47 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -70,6 +70,7 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
 	const entitiesAllowCreateUsers = useAllowedEntities(user, entities, 'create_user_batch')
 	const entitiesAllowCreateCode = useAllowedEntities(user, entities, 'create_code')
 	const entitiesAllowCreateCodes = useAllowedEntities(user, entities, 'create_code_batch')
+	const entitiesAllowEditGrading = useAllowedEntities(user, entities, 'edit_grading_system')
 
 	return (
 		<>
@@ -111,7 +112,7 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
 					<CorporateGradingSystem
 						user={user}
 						entitiesGrading={entitiesGrading}
-						entities={entities}
+						entities={entitiesAllowEditGrading}
 						mutate={() => router.replace(router.asPath)}
 					/>
 				</Modal>
@@ -159,6 +160,7 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
 									color="purple"
 									className="w-full h-full col-span-2"
 									onClick={() => setModalOpen("gradingSystem")}
+									disabled={entitiesAllowEditGrading.length === 0}
 								/>
 							)}
 						</div>
diff --git a/src/resources/entityPermissions.ts b/src/resources/entityPermissions.ts
index e3e3dcc9..27b94e7e 100644
--- a/src/resources/entityPermissions.ts
+++ b/src/resources/entityPermissions.ts
@@ -57,7 +57,8 @@ export type RolePermission =
 	"view_code_list" |
 	"delete_code" |
 	"view_statistics" |
-	"download_statistics_report"
+	"download_statistics_report" |
+	"edit_grading_system"
 
 export const DEFAULT_PERMISSIONS: RolePermission[] = [
 	"view_students",
@@ -128,5 +129,6 @@ export const ADMIN_PERMISSIONS: RolePermission[] = [
 	"view_code_list",
 	"delete_code",
 	"view_statistics",
-	"download_statistics_report"
+	"download_statistics_report",
+	"edit_grading_system"
 ]

From 76cbf8dc410300f0ac236c747db1fd6271acc22e Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 11 Dec 2024 17:42:57 +0000
Subject: [PATCH 02/12] ENCOA-269

---
 src/interfaces/entity.ts |  2 +-
 src/pages/stats.tsx      | 85 ++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/interfaces/entity.ts b/src/interfaces/entity.ts
index 3cb45e74..da1e8e5e 100644
--- a/src/interfaces/entity.ts
+++ b/src/interfaces/entity.ts
@@ -3,7 +3,7 @@ import { RolePermission } from "@/resources/entityPermissions";
 export interface Entity {
 	id: string;
 	label: string;
-	licenses: number
+	licenses: number;
 }
 
 export interface Role {
diff --git a/src/pages/stats.tsx b/src/pages/stats.tsx
index 36e5a944..6c402baa 100644
--- a/src/pages/stats.tsx
+++ b/src/pages/stats.tsx
@@ -1,31 +1,31 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {BsArrowClockwise, BsChevronLeft, BsChevronRight, BsFileEarmarkText, BsPencil, BsStar} from "react-icons/bs";
-import {LinearScale, Chart as ChartJS, CategoryScale, PointElement, LineElement, Legend, Tooltip, LineController} from "chart.js";
-import {withIronSessionSsr} from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
-import {useEffect, useState} from "react";
+import { BsArrowClockwise, BsChevronLeft, BsChevronRight, BsFileEarmarkText, BsPencil, BsStar } from "react-icons/bs";
+import { LinearScale, Chart as ChartJS, CategoryScale, PointElement, LineElement, Legend, Tooltip, LineController } from "chart.js";
+import { withIronSessionSsr } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { useEffect, useMemo, useState } from "react";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import {averageScore, totalExamsByModule, groupBySession, groupByModule, timestampToMoment, groupByDate} from "@/utils/stats";
+import { averageScore, totalExamsByModule, groupBySession, groupByModule, timestampToMoment, groupByDate } from "@/utils/stats";
 import useUser from "@/hooks/useUser";
-import {ToastContainer} from "react-toastify";
-import {capitalize, Dictionary} from "lodash";
-import {Module} from "@/interfaces";
+import { ToastContainer } from "react-toastify";
+import { capitalize, Dictionary } from "lodash";
+import { Module } from "@/interfaces";
 import ProgressBar from "@/components/Low/ProgressBar";
 import Layout from "@/components/High/Layout";
-import {calculateAverageLevel, calculateBandScore} from "@/utils/score";
-import {countExamModules, countFullExams, MODULE_ARRAY, sortByModule} from "@/utils/moduleUtils";
-import {Chart} from "react-chartjs-2";
+import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
+import { countExamModules, countFullExams, MODULE_ARRAY, sortByModule } from "@/utils/moduleUtils";
+import { Chart } from "react-chartjs-2";
 import useUsers from "@/hooks/useUsers";
 import useGroups from "@/hooks/useGroups";
 import DatePicker from "react-datepicker";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import ProfileSummary from "@/components/ProfileSummary";
 import moment from "moment";
-import {Group, Stat, User} from "@/interfaces/user";
-import {Divider} from "primereact/divider";
+import { Group, Stat, User } from "@/interfaces/user";
+import { Divider } from "primereact/divider";
 import Badge from "@/components/Low/Badge";
-import { mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { checkAccess } from "@/utils/permissions";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
@@ -38,7 +38,7 @@ ChartJS.register(LinearScale, CategoryScale, PointElement, LineElement, LineCont
 
 const COLORS = ["#1EB3FF", "#FF790A", "#3D9F11", "#EF5DA8", "#414288"];
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
 	if (!user) return redirect("/login")
 
@@ -50,7 +50,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const groups = await (checkAccess(user, ["admin", "developer"]) ? getGroups() : getGroupsByEntities(mapBy(entities, 'id')))
 
 	return {
-		props: serialize({user, entities, users, groups}),
+		props: serialize({ user, entities, users, groups }),
 	};
 }, sessionOptions);
 
@@ -66,6 +66,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 	const [startDate, setStartDate] = useState<Date | null>(moment(new Date()).subtract(1, "weeks").toDate());
 	const [endDate, setEndDate] = useState<Date | null>(new Date());
 	const [initialStatDate, setInitialStatDate] = useState<Date>();
+	const [selectedEntity, setSelectedEntity] = useState<string>()
 
 	const [monthlyOverallScoreDate, setMonthlyOverallScoreDate] = useState<Date | null>(new Date());
 	const [monthlyModuleScoreDate, setMonthlyModuleScoreDate] = useState<Date | null>(new Date());
@@ -73,7 +74,12 @@ export default function Stats({ user, entities, users, groups }: Props) {
 	const [dailyScoreDate, setDailyScoreDate] = useState<Date | null>(new Date());
 	const [intervalDates, setIntervalDates] = useState<Date[]>([]);
 
-	const {data: stats} = useFilterRecordsByUser<Stat[]>(statsUserId, !statsUserId);
+	const { data: stats } = useFilterRecordsByUser<Stat[]>(statsUserId, !statsUserId);
+
+	const students = useMemo(() =>
+		filterBy(users, 'type', 'student').filter(x => !selectedEntity ? true : mapBy(x.entities, 'id').includes((selectedEntity))),
+		[users, selectedEntity]
+	)
 
 	useEffect(() => {
 		setInitialStatDate(
@@ -181,26 +187,24 @@ export default function Stats({ user, entities, users, groups }: Props) {
 
 					<section className="flex flex-col gap-3">
 						<div className="w-full flex justify-between gap-4 items-center">
-							<>
-								{(user.type === "developer" || user.type === "admin") && (
+							{["corporate", "teacher", "mastercorporate", "developer", "admin"].includes(user.type) && (
+								<>
 									<Select
 										className="w-full"
-										options={users.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
-										defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
-										onChange={(value) => setStatsUserId(value?.value || user.id)}
+										options={entities.map(e => ({ value: e.id, label: e.label }))}
+										onChange={(value) => setSelectedEntity(value?.value || undefined)}
+										placeholder="Select an entity..."
+										isClearable
 									/>
-								)}
-								{["corporate", "teacher", "mastercorporate"].includes(user.type) && groups.length > 0 && (
 									<Select
 										className="w-full"
-										options={users
-											.filter((x) => groups.flatMap((y) => y.participants).includes(x.id))
-											.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
-										defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
+										options={students
+											.map((x) => ({ value: x.id, label: `${x.name} - ${x.email}` }))}
+										defaultValue={{ value: user.id, label: `${user.name} - ${user.email}` }}
 										onChange={(value) => setStatsUserId(value?.value || user.id)}
 									/>
-								)}
-							</>
+								</>
+							)}
 						</div>
 
 						{stats.length > 0 && (
@@ -244,8 +248,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 										<div className="w-full grid grid-cols-3 gap-4 items-center">
 											{[...Array(31).keys()].map((day) => {
 												const date = moment(
-													`${(day + 1).toString().padStart(2, "0")}/${
-														moment(monthlyOverallScoreDate).get("month") + 1
+													`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
 													}/${moment(monthlyOverallScoreDate).get("year")}`,
 													"DD/MM/yyyy",
 												);
@@ -319,8 +322,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 												labels: [...Array(31).keys()]
 													.map((day) => {
 														const date = moment(
-															`${(day + 1).toString().padStart(2, "0")}/${
-																moment(monthlyOverallScoreDate).get("month") + 1
+															`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
 															}/${moment(monthlyOverallScoreDate).get("year")}`,
 															"DD/MM/yyyy",
 														);
@@ -339,17 +341,16 @@ export default function Stats({ user, entities, users, groups }: Props) {
 														data: [...Array(31).keys()]
 															.map((day) => {
 																const date = moment(
-																	`${(day + 1).toString().padStart(2, "0")}/${
-																		moment(monthlyOverallScoreDate).get("month") + 1
+																	`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
 																	}/${moment(monthlyOverallScoreDate).get("year")}`,
 																	"DD/MM/yyyy",
 																);
 
 																return date.isValid()
 																	? calculateTotalScore(
-																			stats.filter((s) => timestampToMoment(s).isBefore(date)),
-																			5,
-																	  ).toFixed(1)
+																		stats.filter((s) => timestampToMoment(s).isBefore(date)),
+																		5,
+																	).toFixed(1)
 																	: undefined;
 															})
 															.filter((x) => !!x),
@@ -396,7 +397,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 										<div className="flex flex-col gap-4">
 											{calculateModuleScore(stats.filter((s) => timestampToMoment(s).isBefore(moment(monthlyModuleScoreDate))))
 												.sort(sortByModule)
-												.map(({module, score}) => (
+												.map(({ module, score }) => (
 													<div className="flex flex-col gap-2" key={module}>
 														<div className="flex justify-between items-end">
 															<span className="text-xs">

From ce35ba71f4844ed3655f395cfe76bcaa66ad2fc1 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 11 Dec 2024 18:32:29 +0000
Subject: [PATCH 03/12] Improved a bit of the speed of the application

---
 src/pages/dashboard/admin.tsx     | 103 +++++++++++++-----------------
 src/pages/dashboard/corporate.tsx |  66 ++++++-------------
 src/pages/dashboard/developer.tsx | 103 +++++++++++++-----------------
 src/utils/assignments.be.ts       |   6 ++
 src/utils/groups.be.ts            |   6 ++
 src/utils/users.be.ts             |  27 +++++++-
 6 files changed, 148 insertions(+), 163 deletions(-)

diff --git a/src/pages/dashboard/admin.tsx b/src/pages/dashboard/admin.tsx
index ecfcbfc2..187e0332 100644
--- a/src/pages/dashboard/admin.tsx
+++ b/src/pages/dashboard/admin.tsx
@@ -2,34 +2,29 @@
 import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
-import { Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Assignment } from "@/interfaces/results";
-import { Group, Stat, User } from "@/interfaces/user";
+import { Group, Stat, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { getAssignments, getEntitiesAssignments } from "@/utils/assignments.be";
+import { countEntitiesAssignments, getAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { getGroups, getGroupsByEntities } from "@/utils/groups.be";
+import { countGroups, getGroups } from "@/utils/groups.be";
 import { checkAccess } from "@/utils/permissions";
 import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
 import { getStatsByUsers } from "@/utils/stats.be";
-import { getEntitiesUsers, getUsers } from "@/utils/users.be";
+import { countUsers, getUser, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
 import { uniqBy } from "lodash";
-import moment from "moment";
 import Head from "next/head";
-import Link from "next/link";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
 import {
 	BsBank,
 	BsClipboard2Data,
-	BsClock,
 	BsEnvelopePaper,
-	BsPaperclip,
 	BsPencilSquare,
 	BsPeople,
 	BsPeopleFill,
@@ -40,11 +35,14 @@ import { ToastContainer } from "react-toastify";
 
 interface Props {
 	user: User;
-	users: User[];
+	students: User[];
+	latestStudents: User[]
+	latestTeachers: User[]
 	entities: EntityWithRoles[];
-	assignments: Assignment[];
+	usersCount: { [key in Type]: number }
+	assignmentsCount: number;
 	stats: Stat[];
-	groups: Group[];
+	groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
@@ -53,48 +51,39 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 
 	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
 
-	const users = await getUsers();
-	const entities = await getEntitiesWithRoles();
-	const assignments = await getAssignments();
-	const stats = await getStatsByUsers(users.map((u) => u.id));
-	const groups = await getGroups();
+	const students = await getUsers({ type: 'student' });
+	const usersCount = {
+		student: await countUsers({ type: "student" }),
+		teacher: await countUsers({ type: "teacher" }),
+		corporate: await countUsers({ type: "corporate" }),
+		mastercorporate: await countUsers({ type: "mastercorporate" }),
+	}
 
-	return { props: serialize({ user, users, entities, assignments, stats, groups }) };
+	const latestStudents = await getUsers({ type: 'student' }, 10, { registrationDate: -1 })
+	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
+
+	const entities = await getEntitiesWithRoles();
+	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, 'id'), { archived: { $ne: true } });
+	const groupsCount = await countGroups();
+
+	const stats = await getStatsByUsers(mapBy(students, 'id'));
+
+	return { props: serialize({ user, students, latestStudents, latestTeachers, usersCount, entities, assignmentsCount, stats, groupsCount }) };
 }, sessionOptions);
 
-export default function Dashboard({ user, users, entities, assignments, stats, groups }: Props) {
-	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
-	const teachers = useMemo(() => users.filter((u) => u.type === "teacher"), [users]);
-	const corporates = useMemo(() => users.filter((u) => u.type === "corporate"), [users]);
-	const masterCorporates = useMemo(() => users.filter((u) => u.type === "mastercorporate"), [users]);
-
+export default function Dashboard({
+	user,
+	students,
+	latestStudents,
+	latestTeachers,
+	usersCount,
+	entities,
+	assignmentsCount,
+	stats,
+	groupsCount
+}: Props) {
 	const router = useRouter();
 
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({
-				focus: students.find((u) => u.id === s.user)?.focus,
-				score: s.score,
-				module: s.module,
-			}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: { [key in Module]: number } = {
-			reading: 0,
-			listening: 0,
-			writing: 0,
-			speaking: 0,
-			level: 0,
-		};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
-
 	return (
 		<>
 			<Head>
@@ -113,35 +102,35 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						onClick={() => router.push("/users?type=student")}
 						Icon={BsPersonFill}
 						label="Students"
-						value={students.length}
+						value={usersCount.student}
 						color="purple"
 					/>
 					<IconCard
 						onClick={() => router.push("/users?type=teacher")}
 						Icon={BsPencilSquare}
 						label="Teachers"
-						value={teachers.length}
+						value={usersCount.teacher}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsBank}
 						onClick={() => router.push("/users?type=corporate")}
 						label="Corporates"
-						value={corporates.length}
+						value={usersCount.corporate}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsBank}
 						onClick={() => router.push("/users?type=mastercorporate")}
 						label="Master Corporates"
-						value={masterCorporates.length}
+						value={usersCount.mastercorporate}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsPeople}
 						onClick={() => router.push("/classrooms")}
 						label="Classrooms"
-						value={groups.length}
+						value={groupsCount}
 						color="purple"
 					/>
 					<IconCard Icon={BsPeopleFill}
@@ -167,18 +156,18 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						Icon={BsEnvelopePaper}
 						onClick={() => router.push("/assignments")}
 						label="Assignments"
-						value={assignments.filter((a) => !a.archived).length}
+						value={assignmentsCount}
 						color="purple"
 					/>
 				</section>
 
 				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
 					<UserDisplayList
-						users={students.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+						users={latestStudents}
 						title="Latest Students"
 					/>
 					<UserDisplayList
-						users={teachers.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+						users={latestTeachers}
 						title="Latest Teachers"
 					/>
 					<UserDisplayList
diff --git a/src/pages/dashboard/corporate.tsx b/src/pages/dashboard/corporate.tsx
index be404c9e..544ca49a 100644
--- a/src/pages/dashboard/corporate.tsx
+++ b/src/pages/dashboard/corporate.tsx
@@ -2,22 +2,19 @@
 import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
-import { Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
-import { Assignment } from "@/interfaces/results";
-import { Group, Stat, User } from "@/interfaces/user";
+import { Stat, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { getEntitiesAssignments } from "@/utils/assignments.be";
+import { countEntitiesAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { getGroupsByEntities } from "@/utils/groups.be";
+import { countGroupsByEntities } from "@/utils/groups.be";
 import { checkAccess } from "@/utils/permissions";
-import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
+import { calculateAverageLevel } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
 import { getStatsByUsers } from "@/utils/stats.be";
-import { filterAllowedUsers } from "@/utils/users.be";
-import { getEntitiesUsers } from "@/utils/users.be";
+import { countAllowedUsers, filterAllowedUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
 import { uniqBy } from "lodash";
 import moment from "moment";
@@ -28,7 +25,6 @@ import {
 	BsClipboard2Data,
 	BsClock,
 	BsEnvelopePaper,
-	BsPaperclip,
 	BsPencilSquare,
 	BsPeople,
 	BsPeopleFill,
@@ -41,10 +37,11 @@ import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 interface Props {
 	user: User;
 	users: User[];
+	userCounts: { [key in Type]: number }
 	entities: EntityWithRoles[];
-	assignments: Assignment[];
+	assignmentsCount: number;
 	stats: Stat[];
-	groups: Group[];
+	groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
@@ -57,14 +54,16 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const entities = await getEntitiesWithRoles(entityIDS);
 	const users = await filterAllowedUsers(user, entities)
 
-	const assignments = await getEntitiesAssignments(entityIDS);
-	const stats = await getStatsByUsers(users.map((u) => u.id));
-	const groups = await getGroupsByEntities(entityIDS);
+	const userCounts = await countAllowedUsers(user, entities)
+	const assignmentsCount = await countEntitiesAssignments(entityIDS, { archived: { $ne: true } });
+	const groupsCount = await countGroupsByEntities(entityIDS);
 
-	return { props: serialize({ user, users, entities, assignments, stats, groups }) };
+	const stats = await getStatsByUsers(users.map((u) => u.id));
+
+	return { props: serialize({ user, users, userCounts, entities, assignmentsCount, stats, groupsCount }) };
 }, sessionOptions);
 
-export default function Dashboard({ user, users, entities, assignments, stats, groups }: Props) {
+export default function Dashboard({ user, users, userCounts, entities, assignmentsCount, stats, groupsCount }: Props) {
 	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
 	const teachers = useMemo(() => users.filter((u) => u.type === "teacher"), [users]);
 
@@ -72,31 +71,6 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 
 	const router = useRouter();
 
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({
-				focus: students.find((u) => u.id === s.user)?.focus,
-				score: s.score,
-				module: s.module,
-			}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: { [key in Module]: number } = {
-			reading: 0,
-			listening: 0,
-			writing: 0,
-			speaking: 0,
-			level: 0,
-		};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
-
 	return (
 		<>
 			<Head>
@@ -121,21 +95,21 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 							onClick={() => router.push("/users?type=student")}
 							Icon={BsPersonFill}
 							label="Students"
-							value={students.length}
+							value={userCounts.student}
 							color="purple"
 						/>
 						<IconCard
 							onClick={() => router.push("/users?type=teacher")}
 							Icon={BsPencilSquare}
 							label="Teachers"
-							value={teachers.length}
+							value={userCounts.teacher}
 							color="purple"
 						/>
 						<IconCard
 							onClick={() => router.push("/classrooms")}
 							Icon={BsPeople}
 							label="Classrooms"
-							value={groups.length}
+							value={groupsCount}
 							color="purple"
 						/>
 						<IconCard Icon={BsPeopleFill}
@@ -156,7 +130,7 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						<IconCard Icon={BsPersonFillGear}
 							onClick={() => router.push("/users/performance")}
 							label="Student Performance"
-							value={students.length}
+							value={userCounts.student}
 							color="purple"
 						/>
 						<IconCard
@@ -170,7 +144,7 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 							className="col-span-2"
 							onClick={() => router.push("/assignments")}
 							label="Assignments"
-							value={assignments.filter((a) => !a.archived).length}
+							value={assignmentsCount}
 							color="purple"
 						/>
 					</section>
diff --git a/src/pages/dashboard/developer.tsx b/src/pages/dashboard/developer.tsx
index ecfcbfc2..187e0332 100644
--- a/src/pages/dashboard/developer.tsx
+++ b/src/pages/dashboard/developer.tsx
@@ -2,34 +2,29 @@
 import Layout from "@/components/High/Layout";
 import UserDisplayList from "@/components/UserDisplayList";
 import IconCard from "@/components/IconCard";
-import { Module } from "@/interfaces";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { Assignment } from "@/interfaces/results";
-import { Group, Stat, User } from "@/interfaces/user";
+import { Group, Stat, Type, User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { dateSorter, filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { getAssignments, getEntitiesAssignments } from "@/utils/assignments.be";
+import { countEntitiesAssignments, getAssignments } from "@/utils/assignments.be";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
-import { getGroups, getGroupsByEntities } from "@/utils/groups.be";
+import { countGroups, getGroups } from "@/utils/groups.be";
 import { checkAccess } from "@/utils/permissions";
 import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
 import { groupByExam } from "@/utils/stats";
 import { getStatsByUsers } from "@/utils/stats.be";
-import { getEntitiesUsers, getUsers } from "@/utils/users.be";
+import { countUsers, getUser, getUsers } from "@/utils/users.be";
 import { withIronSessionSsr } from "iron-session/next";
 import { uniqBy } from "lodash";
-import moment from "moment";
 import Head from "next/head";
-import Link from "next/link";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
 import {
 	BsBank,
 	BsClipboard2Data,
-	BsClock,
 	BsEnvelopePaper,
-	BsPaperclip,
 	BsPencilSquare,
 	BsPeople,
 	BsPeopleFill,
@@ -40,11 +35,14 @@ import { ToastContainer } from "react-toastify";
 
 interface Props {
 	user: User;
-	users: User[];
+	students: User[];
+	latestStudents: User[]
+	latestTeachers: User[]
 	entities: EntityWithRoles[];
-	assignments: Assignment[];
+	usersCount: { [key in Type]: number }
+	assignmentsCount: number;
 	stats: Stat[];
-	groups: Group[];
+	groupsCount: number;
 }
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
@@ -53,48 +51,39 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 
 	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
 
-	const users = await getUsers();
-	const entities = await getEntitiesWithRoles();
-	const assignments = await getAssignments();
-	const stats = await getStatsByUsers(users.map((u) => u.id));
-	const groups = await getGroups();
+	const students = await getUsers({ type: 'student' });
+	const usersCount = {
+		student: await countUsers({ type: "student" }),
+		teacher: await countUsers({ type: "teacher" }),
+		corporate: await countUsers({ type: "corporate" }),
+		mastercorporate: await countUsers({ type: "mastercorporate" }),
+	}
 
-	return { props: serialize({ user, users, entities, assignments, stats, groups }) };
+	const latestStudents = await getUsers({ type: 'student' }, 10, { registrationDate: -1 })
+	const latestTeachers = await getUsers({ type: 'teacher' }, 10, { registrationDate: -1 })
+
+	const entities = await getEntitiesWithRoles();
+	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, 'id'), { archived: { $ne: true } });
+	const groupsCount = await countGroups();
+
+	const stats = await getStatsByUsers(mapBy(students, 'id'));
+
+	return { props: serialize({ user, students, latestStudents, latestTeachers, usersCount, entities, assignmentsCount, stats, groupsCount }) };
 }, sessionOptions);
 
-export default function Dashboard({ user, users, entities, assignments, stats, groups }: Props) {
-	const students = useMemo(() => users.filter((u) => u.type === "student"), [users]);
-	const teachers = useMemo(() => users.filter((u) => u.type === "teacher"), [users]);
-	const corporates = useMemo(() => users.filter((u) => u.type === "corporate"), [users]);
-	const masterCorporates = useMemo(() => users.filter((u) => u.type === "mastercorporate"), [users]);
-
+export default function Dashboard({
+	user,
+	students,
+	latestStudents,
+	latestTeachers,
+	usersCount,
+	entities,
+	assignmentsCount,
+	stats,
+	groupsCount
+}: Props) {
 	const router = useRouter();
 
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({
-				focus: students.find((u) => u.id === s.user)?.focus,
-				score: s.score,
-				module: s.module,
-			}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: { [key in Module]: number } = {
-			reading: 0,
-			listening: 0,
-			writing: 0,
-			speaking: 0,
-			level: 0,
-		};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
-
 	return (
 		<>
 			<Head>
@@ -113,35 +102,35 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						onClick={() => router.push("/users?type=student")}
 						Icon={BsPersonFill}
 						label="Students"
-						value={students.length}
+						value={usersCount.student}
 						color="purple"
 					/>
 					<IconCard
 						onClick={() => router.push("/users?type=teacher")}
 						Icon={BsPencilSquare}
 						label="Teachers"
-						value={teachers.length}
+						value={usersCount.teacher}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsBank}
 						onClick={() => router.push("/users?type=corporate")}
 						label="Corporates"
-						value={corporates.length}
+						value={usersCount.corporate}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsBank}
 						onClick={() => router.push("/users?type=mastercorporate")}
 						label="Master Corporates"
-						value={masterCorporates.length}
+						value={usersCount.mastercorporate}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsPeople}
 						onClick={() => router.push("/classrooms")}
 						label="Classrooms"
-						value={groups.length}
+						value={groupsCount}
 						color="purple"
 					/>
 					<IconCard Icon={BsPeopleFill}
@@ -167,18 +156,18 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						Icon={BsEnvelopePaper}
 						onClick={() => router.push("/assignments")}
 						label="Assignments"
-						value={assignments.filter((a) => !a.archived).length}
+						value={assignmentsCount}
 						color="purple"
 					/>
 				</section>
 
 				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
 					<UserDisplayList
-						users={students.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+						users={latestStudents}
 						title="Latest Students"
 					/>
 					<UserDisplayList
-						users={teachers.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))}
+						users={latestTeachers}
 						title="Latest Teachers"
 					/>
 					<UserDisplayList
diff --git a/src/utils/assignments.be.ts b/src/utils/assignments.be.ts
index c4fbd1d7..fd8faed9 100644
--- a/src/utils/assignments.be.ts
+++ b/src/utils/assignments.be.ts
@@ -60,6 +60,12 @@ export const getEntitiesAssignments = async (ids: string[]) => {
 		.toArray();
 };
 
+export const countEntitiesAssignments = async (ids: string[], filter?: object) => {
+	return await db
+		.collection("assignments")
+		.countDocuments({ entity: { $in: ids }, ...(filter || {}) })
+};
+
 export const getAssignmentsForCorporates = async (userType: Type, idsList: string[], startDate?: Date, endDate?: Date) => {
 	const assigners = await Promise.all(
 		idsList.map(async (id) => {
diff --git a/src/utils/groups.be.ts b/src/utils/groups.be.ts
index 70973475..0c0a3536 100644
--- a/src/utils/groups.be.ts
+++ b/src/utils/groups.be.ts
@@ -173,3 +173,9 @@ export const getGroupsByEntities = async (ids: string[]): Promise<WithEntity<Gro
 			{ $match: { entity: { $in: ids } } },
 			...addEntityToGroupPipeline
 		]).toArray()
+
+export const countGroups = async () =>
+	await db.collection("groups").countDocuments({})
+
+export const countGroupsByEntities = async (ids: string[]) =>
+	await db.collection("groups").countDocuments({ entity: { $in: ids } })
diff --git a/src/utils/users.be.ts b/src/utils/users.be.ts
index 5743f418..3e4e6ac8 100644
--- a/src/utils/users.be.ts
+++ b/src/utils/users.be.ts
@@ -11,12 +11,19 @@ import { mapBy } from ".";
 
 const db = client.db(process.env.MONGODB_DB);
 
-export async function getUsers(filter?: object) {
+export async function getUsers(filter?: object, limit = 0, sort = {}) {
 	return await db
 		.collection("users")
 		.find<User>(filter || {}, { projection: { _id: 0 } })
+		.limit(limit)
+		.sort(sort)
 		.toArray();
 }
+export async function countUsers(filter?: object) {
+	return await db
+		.collection("users")
+		.countDocuments(filter || {})
+}
 
 export async function getUserWithEntity(id: string): Promise<WithEntities<User> | undefined> {
 	const user = await db.collection("users").findOne<User>({ id: id }, { projection: { _id: 0 } });
@@ -68,8 +75,8 @@ export async function getEntitiesUsers(ids: string[], filter?: object, limit?: n
 		.toArray();
 }
 
-export async function countEntitiesUsers(ids: string[]) {
-	return await db.collection("users").countDocuments({ "entities.id": { $in: ids } });
+export async function countEntitiesUsers(ids: string[], filter?: object) {
+	return await db.collection("users").countDocuments({ "entities.id": { $in: ids }, ...(filter || {}) });
 }
 
 export async function getLinkedUsers(
@@ -154,3 +161,17 @@ export const filterAllowedUsers = async (user: User, entities: EntityWithRoles[]
 
 	return [...students, ...teachers, ...corporates, ...masterCorporates]
 }
+
+export const countAllowedUsers = async (user: User, entities: EntityWithRoles[]) => {
+	const studentsAllowedEntities = findAllowedEntities(user, entities, 'view_students')
+	const teachersAllowedEntities = findAllowedEntities(user, entities, 'view_teachers')
+	const corporateAllowedEntities = findAllowedEntities(user, entities, 'view_corporates')
+	const masterCorporateAllowedEntities = findAllowedEntities(user, entities, 'view_mastercorporates')
+
+	const students = await countEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" })
+	const teachers = await countEntitiesUsers(mapBy(teachersAllowedEntities, 'id'), { type: "teacher" })
+	const corporates = await countEntitiesUsers(mapBy(corporateAllowedEntities, 'id'), { type: "corporate" })
+	const masterCorporates = await countEntitiesUsers(mapBy(masterCorporateAllowedEntities, 'id'), { type: "mastercorporate" })
+
+	return { students, teachers, corporates, masterCorporates }
+}

From 1a7d35317b479ff9f47f34acf3df299a279d6d63 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 11 Dec 2024 22:00:43 +0000
Subject: [PATCH 04/12] ENCOA-263

---
 src/components/UserCard.tsx              |   2 -
 src/hooks/useCodes.tsx                   |  12 +-
 src/pages/(admin)/BatchCodeGenerator.tsx |  68 +++++----
 src/pages/(admin)/CodeGenerator.tsx      |  56 ++++---
 src/pages/(admin)/Lists/CodeList.tsx     |  16 +-
 src/pages/(admin)/Lists/DiscountList.tsx |  27 ++--
 src/pages/(admin)/Lists/index.tsx        |   2 +-
 src/pages/api/code/index.ts              | 177 +++++++++++------------
 src/pages/api/register.ts                |  53 ++++---
 src/pages/settings.tsx                   |  15 +-
 10 files changed, 234 insertions(+), 194 deletions(-)

diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index dd90e5b1..a1e2dc7b 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -19,7 +19,6 @@ import Select from "react-select";
 import useUsers from "@/hooks/useUsers";
 import { USER_TYPE_LABELS } from "@/resources/user";
 import { CURRENCIES } from "@/resources/paypal";
-import useCodes from "@/hooks/useCodes";
 import { checkAccess, getTypesOfUser } from "@/utils/permissions";
 import { PERMISSIONS } from "@/constants/userPermissions";
 import { PermissionType } from "@/interfaces/permissions";
@@ -119,7 +118,6 @@ const UserCard = ({
 	);
 	const { data: stats } = useFilterRecordsByUser<Stat[]>(user.id);
 	const { users } = useUsers();
-	const { codes } = useCodes(user.id);
 	const { permissions } = usePermissions(loggedInUser.id);
 
 	useEffect(() => {
diff --git a/src/hooks/useCodes.tsx b/src/hooks/useCodes.tsx
index b88416a1..6c586532 100644
--- a/src/hooks/useCodes.tsx
+++ b/src/hooks/useCodes.tsx
@@ -1,8 +1,8 @@
-import {Code, Group, User} from "@/interfaces/user";
+import { Code, Group, User } from "@/interfaces/user";
 import axios from "axios";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 
-export default function useCodes(creator?: string) {
+export default function useCodes(entity?: string) {
 	const [codes, setCodes] = useState<Code[]>([]);
 	const [isLoading, setIsLoading] = useState(false);
 	const [isError, setIsError] = useState(false);
@@ -10,12 +10,12 @@ export default function useCodes(creator?: string) {
 	const getData = () => {
 		setIsLoading(true);
 		axios
-			.get<Code[]>(`/api/code${creator ? `?creator=${creator}` : ""}`)
+			.get<Code[]>(`/api/code${entity ? `?entity=${entity}` : ""}`)
 			.then((response) => setCodes(response.data))
 			.finally(() => setIsLoading(false));
 	};
 
-	useEffect(getData, [creator]);
+	useEffect(getData, [entity]);
 
-	return {codes, isLoading, isError, reload: getData};
+	return { codes, isLoading, isError, reload: getData };
 }
diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index f10dc2c1..166103c1 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -1,29 +1,31 @@
 import Button from "@/components/Low/Button";
 import Checkbox from "@/components/Low/Checkbox";
-import {PERMISSIONS} from "@/constants/userPermissions";
+import { PERMISSIONS } from "@/constants/userPermissions";
 import useUsers from "@/hooks/useUsers";
-import {Type, User} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { Type, User } from "@/interfaces/user";
+import { USER_TYPE_LABELS } from "@/resources/user";
 import axios from "axios";
 import clsx from "clsx";
-import {capitalize, uniqBy} from "lodash";
+import { capitalize, uniqBy } from "lodash";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import {toast} from "react-toastify";
+import { toast } from "react-toastify";
 import ShortUniqueId from "short-unique-id";
-import {useFilePicker} from "use-file-picker";
+import { useFilePicker } from "use-file-picker";
 import readXlsxFile from "read-excel-file";
 import Modal from "@/components/Modal";
-import {BsFileEarmarkEaselFill, BsQuestionCircleFill} from "react-icons/bs";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
-import {PermissionType} from "@/interfaces/permissions";
+import { BsFileEarmarkEaselFill, BsQuestionCircleFill } from "react-icons/bs";
+import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import { PermissionType } from "@/interfaces/permissions";
 import usePermissions from "@/hooks/usePermissions";
+import { EntityWithRoles } from "@/interfaces/entity";
+import Select from "@/components/Low/Select";
 
 const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
 
 const USER_TYPE_PERMISSIONS: {
-	[key in Type]: {perm: PermissionType | undefined; list: Type[]};
+	[key in Type]: { perm: PermissionType | undefined; list: Type[] };
 } = {
 	student: {
 		perm: "createCodeStudent",
@@ -59,11 +61,12 @@ interface Props {
 	user: User;
 	users: User[];
 	permissions: PermissionType[];
+	entities: EntityWithRoles[]
 	onFinish: () => void;
 }
 
-export default function BatchCodeGenerator({user, users, permissions, onFinish}: Props) {
-	const [infos, setInfos] = useState<{email: string; name: string; passport_id: string}[]>([]);
+export default function BatchCodeGenerator({ user, users, entities = [], permissions, onFinish }: Props) {
+	const [infos, setInfos] = useState<{ email: string; name: string; passport_id: string }[]>([]);
 	const [isLoading, setIsLoading] = useState(false);
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
 		user?.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).toDate() : null,
@@ -71,8 +74,9 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [type, setType] = useState<Type>("student");
 	const [showHelp, setShowHelp] = useState(false);
+	const [entity, setEntity] = useState((entities || [])[0]?.id || undefined)
 
-	const {openFilePicker, filesContent, clear} = useFilePicker({
+	const { openFilePicker, filesContent, clear } = useFilePicker({
 		accept: ".xlsx",
 		multiple: false,
 		readAs: "ArrayBuffer",
@@ -93,10 +97,10 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 								const [firstName, lastName, country, passport_id, email, phone] = row as string[];
 								return EMAIL_REGEX.test(email.toString().trim())
 									? {
-											email: email.toString().trim().toLowerCase(),
-											name: `${firstName ?? ""} ${lastName ?? ""}`.trim(),
-											passport_id: passport_id?.toString().trim() || undefined,
-									  }
+										email: email.toString().trim().toLowerCase(),
+										name: `${firstName ?? ""} ${lastName ?? ""}`.trim(),
+										passport_id: passport_id?.toString().trim() || undefined,
+									}
 									: undefined;
 							})
 							.filter((x) => !!x) as typeof infos,
@@ -139,7 +143,7 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 			return;
 
 		setIsLoading(true);
-		Promise.all(existingUsers.map(async (u) => await axios.post(`/api/invites`, {to: u.id, from: user.id})))
+		Promise.all(existingUsers.map(async (u) => await axios.post(`/api/invites`, { to: u.id, from: user.id })))
 			.then(() => toast.success(`Successfully invited ${existingUsers.length} registered student(s)!`))
 			.finally(() => {
 				if (newUsers.length === 0) setIsLoading(false);
@@ -155,19 +159,20 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 
 		setIsLoading(true);
 		axios
-			.post<{ok: boolean; valid?: number; reason?: string}>("/api/code", {
+			.post<{ ok: boolean; valid?: number; reason?: string }>("/api/code", {
 				type,
 				codes,
-				infos: informations,
+				infos: informations.map((info, index) => ({ ...info, code: codes[index] })),
 				expiryDate,
+				entity
 			})
-			.then(({data, status}) => {
+			.then(({ data, status }) => {
 				if (data.ok) {
 					toast.success(
 						`Successfully generated${data.valid ? ` ${data.valid}/${informations.length}` : ""} ${capitalize(
 							type,
 						)} codes and they have been notified by e-mail!`,
-						{toastId: "success"},
+						{ toastId: "success" },
 					);
 
 					onFinish();
@@ -175,12 +180,12 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 				}
 
 				if (status === 403) {
-					toast.error(data.reason, {toastId: "forbidden"});
+					toast.error(data.reason, { toastId: "forbidden" });
 				}
 			})
-			.catch(({response: {status, data}}) => {
+			.catch(({ response: { status, data } }) => {
 				if (status === 403) {
-					toast.error(data.reason, {toastId: "forbidden"});
+					toast.error(data.reason, { toastId: "forbidden" });
 					return;
 				}
 
@@ -258,6 +263,15 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 						)}
 					</>
 				)}
+				<div className={clsx("flex flex-col gap-4")}>
+					<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+					<Select
+						defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
+						options={entities.map((e) => ({ value: e.id, label: e.label }))}
+						onChange={(e) => setEntity(e?.value || undefined)}
+						isClearable={checkAccess(user, ["admin", "developer"])}
+					/>
+				</div>
 				<label className="text-mti-gray-dim text-base font-normal">Select the type of user they should be</label>
 				{user && (
 					<select
@@ -266,7 +280,7 @@ export default function BatchCodeGenerator({user, users, permissions, onFinish}:
 						className="flex min-h-[70px] w-full min-w-[350px] cursor-pointer justify-center rounded-full border bg-white p-6 text-sm font-normal focus:outline-none">
 						{Object.keys(USER_TYPE_LABELS)
 							.filter((x) => {
-								const {list, perm} = USER_TYPE_PERMISSIONS[x as Type];
+								const { list, perm } = USER_TYPE_PERMISSIONS[x as Type];
 								return checkAccess(user, getTypesOfUser(list), permissions, perm);
 							})
 							.map((type) => (
diff --git a/src/pages/(admin)/CodeGenerator.tsx b/src/pages/(admin)/CodeGenerator.tsx
index c1799783..ce65d719 100644
--- a/src/pages/(admin)/CodeGenerator.tsx
+++ b/src/pages/(admin)/CodeGenerator.tsx
@@ -1,22 +1,25 @@
 import Button from "@/components/Low/Button";
 import Checkbox from "@/components/Low/Checkbox";
-import {PERMISSIONS} from "@/constants/userPermissions";
-import {Type, User} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { PERMISSIONS } from "@/constants/userPermissions";
+import { Type, User } from "@/interfaces/user";
+import { USER_TYPE_LABELS } from "@/resources/user";
 import axios from "axios";
 import clsx from "clsx";
-import {capitalize} from "lodash";
+import { capitalize } from "lodash";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import {toast} from "react-toastify";
+import { toast } from "react-toastify";
 import ShortUniqueId from "short-unique-id";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
-import {PermissionType} from "@/interfaces/permissions";
+import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import { PermissionType } from "@/interfaces/permissions";
 import usePermissions from "@/hooks/usePermissions";
+import { EntityWithRoles } from "@/interfaces/entity";
+import Select from "@/components/Low/Select";
+import { useAllowedEntities } from "@/hooks/useEntityPermissions";
 
 const USER_TYPE_PERMISSIONS: {
-	[key in Type]: {perm: PermissionType | undefined; list: Type[]};
+	[key in Type]: { perm: PermissionType | undefined; list: Type[] };
 } = {
 	student: {
 		perm: "createCodeStudent",
@@ -51,16 +54,19 @@ const USER_TYPE_PERMISSIONS: {
 interface Props {
 	user: User;
 	permissions: PermissionType[];
+	entities: EntityWithRoles[]
 	onFinish: () => void;
 }
 
-export default function CodeGenerator({user, permissions, onFinish}: Props) {
+export default function CodeGenerator({ user, entities = [], permissions, onFinish }: Props) {
 	const [generatedCode, setGeneratedCode] = useState<string>();
+
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
 		user?.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).toDate() : null,
 	);
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [type, setType] = useState<Type>("student");
+	const [entity, setEntity] = useState((entities || [])[0]?.id || undefined)
 
 	useEffect(() => {
 		if (!isExpiryDateEnabled) setExpiryDate(null);
@@ -71,8 +77,8 @@ export default function CodeGenerator({user, permissions, onFinish}: Props) {
 		const code = uid.randomUUID(6);
 
 		axios
-			.post("/api/code", {type, codes: [code], expiryDate})
-			.then(({data, status}) => {
+			.post("/api/code", { type, codes: [code], expiryDate, entity })
+			.then(({ data, status }) => {
 				if (data.ok) {
 					toast.success(`Successfully generated a ${capitalize(type)} code!`, {
 						toastId: "success",
@@ -82,12 +88,12 @@ export default function CodeGenerator({user, permissions, onFinish}: Props) {
 				}
 
 				if (status === 403) {
-					toast.error(data.reason, {toastId: "forbidden"});
+					toast.error(data.reason, { toastId: "forbidden" });
 				}
 			})
-			.catch(({response: {status, data}}) => {
+			.catch(({ response: { status, data } }) => {
 				if (status === 403) {
-					toast.error(data.reason, {toastId: "forbidden"});
+					toast.error(data.reason, { toastId: "forbidden" });
 					return;
 				}
 
@@ -100,14 +106,25 @@ export default function CodeGenerator({user, permissions, onFinish}: Props) {
 	return (
 		<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
 			<label className="font-normal text-base text-mti-gray-dim">User Code Generator</label>
-			{user && (
+			<div className={clsx("flex flex-col gap-4")}>
+				<label className="font-normal text-base text-mti-gray-dim">Entity</label>
+				<Select
+					defaultValue={{ value: (entities || [])[0]?.id, label: (entities || [])[0]?.label }}
+					options={entities.map((e) => ({ value: e.id, label: e.label }))}
+					onChange={(e) => setEntity(e?.value || undefined)}
+					isClearable={checkAccess(user, ["admin", "developer"])}
+				/>
+			</div>
+
+			<div className={clsx("flex flex-col gap-4")}>
+				<label className="font-normal text-base text-mti-gray-dim">Type</label>
 				<select
 					defaultValue="student"
 					onChange={(e) => setType(e.target.value as typeof user.type)}
 					className="p-6 w-full min-w-[350px] min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer bg-white">
 					{Object.keys(USER_TYPE_LABELS)
 						.filter((x) => {
-							const {list, perm} = USER_TYPE_PERMISSIONS[x as Type];
+							const { list, perm } = USER_TYPE_PERMISSIONS[x as Type];
 							return checkAccess(user, getTypesOfUser(list), permissions, perm);
 						})
 						.map((type) => (
@@ -116,8 +133,9 @@ export default function CodeGenerator({user, permissions, onFinish}: Props) {
 							</option>
 						))}
 				</select>
-			)}
-			{user && checkAccess(user, ["developer", "admin", "corporate", "mastercorporate"]) && (
+			</div>
+
+			{checkAccess(user, ["developer", "admin", "corporate", "mastercorporate"]) && (
 				<>
 					<div className="-md:flex-row -md:items-center flex justify-between gap-2 md:flex-col 2xl:flex-row 2xl:items-center">
 						<label className="text-mti-gray-dim text-base font-normal">Expiry Date</label>
diff --git a/src/pages/(admin)/Lists/CodeList.tsx b/src/pages/(admin)/Lists/CodeList.tsx
index 0d2ab5b6..3d71b533 100644
--- a/src/pages/(admin)/Lists/CodeList.tsx
+++ b/src/pages/(admin)/Lists/CodeList.tsx
@@ -16,6 +16,9 @@ import ReactDatePicker from "react-datepicker";
 import clsx from "clsx";
 import { checkAccess } from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
+import { EntityWithRoles } from "@/interfaces/entity";
+import { isAdmin } from "@/utils/users";
+import { findBy } from "@/utils";
 
 const columnHelper = createColumnHelper<Code>();
 
@@ -34,16 +37,15 @@ const CreatorCell = ({ id, users }: { id: string; users: User[] }) => {
 	);
 };
 
-export default function CodeList({ user, canDeleteCodes }: { user: User, canDeleteCodes?: boolean }) {
+export default function CodeList({ user, entities, canDeleteCodes }
+	: { user: User, entities: EntityWithRoles[], canDeleteCodes?: boolean }) {
 	const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
 
 	const [filteredCorporate, setFilteredCorporate] = useState<User | undefined>(user?.type === "corporate" ? user : undefined);
 	const [filterAvailability, setFilterAvailability] = useState<"in-use" | "unused">();
 
-	const { permissions } = usePermissions(user?.id || "");
-
 	const { users } = useUsers();
-	const { codes, reload } = useCodes(user?.type === "corporate" ? user?.id : undefined);
+	const { codes, reload } = useCodes();
 
 	const [startDate, setStartDate] = useState<Date | null>(moment("01/01/2023").toDate());
 	const [endDate, setEndDate] = useState<Date | null>(moment().endOf("day").toDate());
@@ -158,13 +160,17 @@ export default function CodeList({ user, canDeleteCodes }: { user: User, canDele
 			cell: (info) => (info.getValue() ? moment(info.getValue()).format("DD/MM/YYYY") : "N/A"),
 		}),
 		columnHelper.accessor("email", {
-			header: "Invited E-mail",
+			header: "E-mail",
 			cell: (info) => info.getValue() || "N/A",
 		}),
 		columnHelper.accessor("creator", {
 			header: "Creator",
 			cell: (info) => <CreatorCell id={info.getValue()} users={users} />,
 		}),
+		columnHelper.accessor("entity", {
+			header: "Entity",
+			cell: (info) => findBy(entities, 'id', info.getValue())?.label || "N/A",
+		}),
 		columnHelper.accessor("userId", {
 			header: "Availability",
 			cell: (info) =>
diff --git a/src/pages/(admin)/Lists/DiscountList.tsx b/src/pages/(admin)/Lists/DiscountList.tsx
index f0478e7f..b3db37f1 100644
--- a/src/pages/(admin)/Lists/DiscountList.tsx
+++ b/src/pages/(admin)/Lists/DiscountList.tsx
@@ -3,31 +3,30 @@ import Checkbox from "@/components/Low/Checkbox";
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
 import Modal from "@/components/Modal";
-import useCodes from "@/hooks/useCodes";
 import useDiscounts from "@/hooks/useDiscounts";
 import useUser from "@/hooks/useUser";
 import useUsers from "@/hooks/useUsers";
-import {Discount} from "@/interfaces/paypal";
-import {Code, User} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
-import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
+import { Discount } from "@/interfaces/paypal";
+import { Code, User } from "@/interfaces/user";
+import { USER_TYPE_LABELS } from "@/resources/user";
+import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
 import axios from "axios";
 import clsx from "clsx";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import ReactDatePicker from "react-datepicker";
-import {BsPencil, BsTrash} from "react-icons/bs";
-import {toast} from "react-toastify";
+import { BsPencil, BsTrash } from "react-icons/bs";
+import { toast } from "react-toastify";
 
 const columnHelper = createColumnHelper<Discount>();
 
-const DiscountCreator = ({discount, onClose}: {discount?: Discount; onClose: () => void}) => {
+const DiscountCreator = ({ discount, onClose }: { discount?: Discount; onClose: () => void }) => {
 	const [percentage, setPercentage] = useState(discount?.percentage);
 	const [domain, setDomain] = useState(discount?.domain);
 	const [validUntil, setValidUntil] = useState(discount?.validUntil);
 
 	const submit = async () => {
-		const body = {percentage, domain, validUntil: validUntil?.toISOString() || undefined};
+		const body = { percentage, domain, validUntil: validUntil?.toISOString() || undefined };
 
 		if (discount) {
 			return axios
@@ -112,7 +111,7 @@ const DiscountCreator = ({discount, onClose}: {discount?: Discount; onClose: ()
 	);
 };
 
-export default function DiscountList({user}: {user: User}) {
+export default function DiscountList({ user }: { user: User }) {
 	const [selectedDiscounts, setSelectedDiscounts] = useState<string[]>([]);
 
 	const [isCreating, setIsCreating] = useState(false);
@@ -120,8 +119,8 @@ export default function DiscountList({user}: {user: User}) {
 
 	const [filteredDiscounts, setFilteredDiscounts] = useState<Discount[]>([]);
 
-	const {users} = useUsers();
-	const {discounts, reload} = useDiscounts();
+	const { users } = useUsers();
+	const { discounts, reload } = useDiscounts();
 
 	useEffect(() => {
 		setFilteredDiscounts(discounts);
@@ -220,7 +219,7 @@ export default function DiscountList({user}: {user: User}) {
 		{
 			header: "",
 			id: "actions",
-			cell: ({row}: {row: {original: Discount}}) => {
+			cell: ({ row }: { row: { original: Discount } }) => {
 				return (
 					<div className="flex gap-4">
 						<div
diff --git a/src/pages/(admin)/Lists/index.tsx b/src/pages/(admin)/Lists/index.tsx
index 9a3de65a..38bbb075 100644
--- a/src/pages/(admin)/Lists/index.tsx
+++ b/src/pages/(admin)/Lists/index.tsx
@@ -106,7 +106,7 @@ export default function Lists({ user, entities = [], permissions }: Props) {
 				)}
 				{checkAccess(user, ["developer", "admin", "corporate", "mastercorporate"]) && entitiesViewCodes.length > 0 && (
 					<TabPanel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide">
-						<CodeList user={user} canDeleteCodes={entitiesDeleteCodes.length > 0} />
+						<CodeList user={user} entities={entitiesViewCodes} canDeleteCodes={entitiesDeleteCodes.length > 0} />
 					</TabPanel>
 				)}
 				{checkAccess(user, ["developer", "admin"]) && (
diff --git a/src/pages/api/code/index.ts b/src/pages/api/code/index.ts
index f3d7410f..d2eaf8e8 100644
--- a/src/pages/api/code/index.ts
+++ b/src/pages/api/code/index.ts
@@ -6,6 +6,12 @@ import { sessionOptions } from "@/lib/session";
 import { Code, Group, Type } from "@/interfaces/user";
 import { PERMISSIONS } from "@/constants/userPermissions";
 import { prepareMailer, prepareMailOptions } from "@/email";
+import { isAdmin } from "@/utils/users";
+import { requestUser } from "@/utils/api";
+import { doesEntityAllow } from "@/utils/permissions";
+import { getEntity, getEntityWithRoles } from "@/utils/entities.be";
+import { findBy } from "@/utils";
+import { EntityWithRoles } from "@/interfaces/entity";
 
 const db = client.db(process.env.MONGODB_DB);
 
@@ -25,117 +31,98 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 		return;
 	}
 
-	const { creator } = req.query as { creator?: string };
-	const snapshot = await db.collection("codes").find(creator ? { creator: creator } : {}).toArray();
+	const { entity } = req.query as { entity?: string };
+	const snapshot = await db.collection("codes").find(entity ? { entity } : {}).toArray();
 
 	res.status(200).json(snapshot);
 }
 
-async function post(req: NextApiRequest, res: NextApiResponse) {
-	if (!req.session.user) {
-		res.status(401).json({ ok: false, reason: "You must be logged in to generate a code!" });
-		return;
+const generateAndSendCode = async (
+	code: string,
+	type: Type,
+	expiryDate: null | Date,
+	entity?: string,
+	info?: {
+		email: string; name: string; passport_id?: string
+	}) => {
+	if (!info) {
+		await db.collection("codes").insertOne({
+			code, type, expiryDate, entity
+		})
+		return true
 	}
 
-	const { type, codes, infos, expiryDate } = req.body as {
+	const previousCode = await db.collection("codes").findOne<Code>({ email: info.email, entity })
+
+	const transport = prepareMailer();
+	const mailOptions = prepareMailOptions(
+		{
+			type,
+			code: previousCode ? previousCode.code : code,
+			environment: process.env.ENVIRONMENT,
+		},
+		[info.email.toLowerCase().trim()],
+		"EnCoach Registration",
+		"main",
+	);
+
+	try {
+		await transport.sendMail(mailOptions);
+		if (!previousCode) {
+			await db.collection("codes").insertOne({
+				code, type, expiryDate, entity, name: info.name.trim(), email: info.email.trim().toLowerCase(),
+				...(info.passport_id ? { passport_id: info.passport_id.trim() } : {})
+			})
+		}
+
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+const countAvailableCodes = async (entity: EntityWithRoles) => {
+	const usedUp = await db.collection("codes").countDocuments({ entity: entity.id })
+	const total = entity.licenses
+
+	return total - usedUp
+}
+
+async function post(req: NextApiRequest, res: NextApiResponse) {
+	const user = await requestUser(req, res)
+	if (!user) return res.status(401).json({ ok: false, reason: "You must be logged in to generate a code!" });
+
+	const { type, codes, infos, expiryDate, entity } = req.body as {
 		type: Type;
 		codes: string[];
-		infos?: { email: string; name: string; passport_id?: string }[];
+		infos?: { email: string; name: string; passport_id?: string, code: string }[];
 		expiryDate: null | Date;
+		entity?: string
 	};
-	const permission = PERMISSIONS.generateCode[type];
 
-	if (!permission.includes(req.session.user.type)) {
-		res.status(403).json({
-			ok: false,
-			reason: "Your account type does not have permissions to generate a code for that type of user!",
-		});
-		return;
-	}
+	if (!entity && !isAdmin(user))
+		return res.status(403).json({ ok: false, reason: "You must be an admin to generate a code without an entity!" });
 
-	const userCodes = await db.collection("codes").find<Code>({ creator: req.session.user.id }).toArray()
-	const creatorGroupsSnapshot = await db.collection("groups").find<Group>({ admin: req.session.user.id }).toArray()
+	const entityObj = entity ? await getEntityWithRoles(entity) : undefined
+	const isAllowed = entityObj ? doesEntityAllow(user, entityObj, 'create_code') : true
+	if (!isAllowed) return res.status(403).json({ ok: false, reason: "You do not have permissions to generate a code!" });
 
-	const creatorGroups = creatorGroupsSnapshot.filter((x) => x.name === "Students" || x.name === "Teachers" || x.name === "Corporate");
-	const usersInGroups = creatorGroups.flatMap((x) => x.participants);
-
-
-	if (req.session.user.type === "corporate") {
-		const totalCodes = userCodes.filter((x) => !x.userId || !usersInGroups.includes(x.userId)).length + usersInGroups.length + codes.length;
-		const allowedCodes = 0;
-
-		if (totalCodes > allowedCodes) {
-			res.status(403).json({
+	if (entityObj) {
+		const availableCodes = await countAvailableCodes(entityObj)
+		if (availableCodes < codes.length)
+			return res.status(400).json({
 				ok: false,
-				reason: `You have or would have exceeded your amount of allowed codes, you currently are allowed to generate ${allowedCodes - userCodes.length
-					} codes.`,
-			});
-			return;
-		}
+				reason: `You only have ${availableCodes} codes available, while trying to create ${codes.length} codes`
+			})
+	}
+	const valid = []
+	for (const code of codes) {
+		const info = findBy(infos || [], 'code', code)
+		const isValid = await generateAndSendCode(code, type, expiryDate, entity, info)
+		valid.push(isValid)
 	}
 
-	const codePromises = codes.map(async (code, index) => {
-		const codeRef = await db.collection("codes").findOne<Code>({ id: code });
-		let codeInformation = {
-			type,
-			code,
-			creator: req.session.user!.id,
-			creationDate: new Date().toISOString(),
-			expiryDate,
-		};
-
-		if (infos && infos.length > index) {
-			const { email, name, passport_id } = infos[index];
-			const previousCode = userCodes.find((x) => x.email === email) as Code;
-
-			const transport = prepareMailer();
-			const mailOptions = prepareMailOptions(
-				{
-					type,
-					code: previousCode ? previousCode.code : code,
-					environment: process.env.ENVIRONMENT,
-				},
-				[email.toLowerCase().trim()],
-				"EnCoach Registration",
-				"main",
-			);
-
-			try {
-				await transport.sendMail(mailOptions);
-
-				if (!previousCode && codeRef) {
-					await db.collection("codes").updateOne(
-						{ id: codeRef.id },
-						{
-							$set: {
-								id: codeRef.id,
-								...codeInformation,
-								email: email.trim().toLowerCase(),
-								name: name.trim(),
-								...(passport_id ? { passport_id: passport_id.trim() } : {}),
-							}
-						},
-						{ upsert: true }
-					);
-				}
-
-				return true;
-			} catch (e) {
-				return false;
-			}
-		} else {
-			// upsert: true -> if it doesnt exist insert
-			await db.collection("codes").updateOne(
-				{ id: code },
-				{ $set: { id: code, ...codeInformation } },
-				{ upsert: true }
-			);
-		}
-	});
-
-	Promise.all(codePromises).then((results) => {
-		res.status(200).json({ ok: true, valid: results.filter((x) => x).length });
-	});
+	return res.status(200).json({ ok: true, valid: valid.length });
 }
 
 async function del(req: NextApiRequest, res: NextApiResponse) {
diff --git a/src/pages/api/register.ts b/src/pages/api/register.ts
index e0f0b591..b5dc4d1f 100644
--- a/src/pages/api/register.ts
+++ b/src/pages/api/register.ts
@@ -1,13 +1,15 @@
-import {NextApiRequest, NextApiResponse} from "next";
-import {createUserWithEmailAndPassword, getAuth} from "firebase/auth";
-import {app} from "@/firebase";
-import {sessionOptions} from "@/lib/session";
-import {withIronSessionApiRoute} from "iron-session/next";
-import {Code, CorporateInformation, DemographicInformation, Group, Type} from "@/interfaces/user";
-import {addUserToGroupOnCreation} from "@/utils/registration";
+import { NextApiRequest, NextApiResponse } from "next";
+import { createUserWithEmailAndPassword, getAuth } from "firebase/auth";
+import { app } from "@/firebase";
+import { sessionOptions } from "@/lib/session";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { Code, CorporateInformation, DemographicInformation, Group, Type } from "@/interfaces/user";
+import { addUserToGroupOnCreation } from "@/utils/registration";
 import moment from "moment";
-import {v4} from "uuid";
+import { v4 } from "uuid";
 import client from "@/lib/mongodb";
+import { addUserToEntity, getEntityWithRoles } from "@/utils/entities.be";
+import { findBy } from "@/utils";
 
 const auth = getAuth(app);
 const db = client.db(process.env.MONGODB_DB);
@@ -29,7 +31,7 @@ const DEFAULT_LEVELS = {
 };
 
 async function register(req: NextApiRequest, res: NextApiResponse) {
-	const {type} = req.body as {
+	const { type } = req.body as {
 		type: "individual" | "corporate";
 	};
 
@@ -38,19 +40,18 @@ async function register(req: NextApiRequest, res: NextApiResponse) {
 }
 
 async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
-	const {email, passport_id, password, code} = req.body as {
+	const { email, passport_id, password, code } = req.body as {
 		email: string;
 		passport_id?: string;
 		password: string;
 		code?: string;
 	};
 
-	const codeDoc = await db.collection("codes").findOne<Code>({code});
+	const codeDoc = await db.collection("codes").findOne<Code>({ code });
+
+	if (code && code.length > 0 && !codeDoc)
+		return res.status(400).json({ error: "Invalid Code!" });
 
-	if (code && code.length > 0 && !!codeDoc) {
-		res.status(400).json({error: "Invalid Code!"});
-		return;
-	}
 
 	createUserWithEmailAndPassword(auth, email.toLowerCase(), password)
 		.then(async (userCredentials) => {
@@ -69,7 +70,7 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 				focus: "academic",
 				type: email.endsWith("@ecrop.dev") ? "developer" : codeDoc ? codeDoc.type : "student",
 				subscriptionExpirationDate: codeDoc ? codeDoc.expiryDate : moment().subtract(1, "days").toISOString(),
-				...(passport_id ? {demographicInformation: {passport_id}} : {}),
+				...(passport_id ? { demographicInformation: { passport_id } } : {}),
 				registrationDate: new Date().toISOString(),
 				status: code ? "active" : "paymentDue",
 				// apparently there's an issue with the verification email system
@@ -80,23 +81,29 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 			await db.collection("users").insertOne(user);
 
 			if (!!codeDoc) {
-				await db.collection("codes").updateOne({code: codeDoc.code}, {$set: {userId}});
-				if (codeDoc.creator) await addUserToGroupOnCreation(userId, codeDoc.type, codeDoc.creator);
+				await db.collection("codes").updateOne({ code: codeDoc.code }, { $set: { userId } });
+				if (codeDoc.entity) {
+					const inviteEntity = await getEntityWithRoles(codeDoc.entity)
+					if (inviteEntity) {
+						const defaultRole = findBy(inviteEntity.roles, 'isDefault', true)!
+						await addUserToEntity(userId, codeDoc.entity, defaultRole.id)
+					}
+				}
 			}
 
 			req.session.user = user;
 			await req.session.save();
 
-			res.status(200).json({user});
+			res.status(200).json({ user });
 		})
 		.catch((error) => {
 			console.log(error);
-			res.status(401).json({error});
+			res.status(401).json({ error });
 		});
 }
 
 async function registerCorporate(req: NextApiRequest, res: NextApiResponse) {
-	const {email, password} = req.body as {
+	const { email, password } = req.body as {
 		email: string;
 		password: string;
 		corporateInformation: CorporateInformation;
@@ -155,10 +162,10 @@ async function registerCorporate(req: NextApiRequest, res: NextApiResponse) {
 			req.session.user = user;
 			await req.session.save();
 
-			res.status(200).json({user});
+			res.status(200).json({ user });
 		})
 		.catch((error) => {
 			console.log(error);
-			res.status(401).json({error});
+			res.status(401).json({ error });
 		});
 }
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index 5dd67d47..e3688205 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -94,10 +94,21 @@ export default function Admin({ user, entities, permissions, allUsers, entitiesG
 					/>
 				</Modal>
 				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
-					<BatchCodeGenerator user={user} users={allUsers} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+					<BatchCodeGenerator
+						entities={entitiesAllowCreateCodes}
+						user={user}
+						users={allUsers}
+						permissions={permissions}
+						onFinish={() => setModalOpen(undefined)}
+					/>
 				</Modal>
 				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
-					<CodeGenerator user={user} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+					<CodeGenerator
+						entities={entitiesAllowCreateCode}
+						user={user}
+						permissions={permissions}
+						onFinish={() => setModalOpen(undefined)}
+					/>
 				</Modal>
 				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
 					<UserCreator

From 578d29066f920a2c3d608e6deb06e565122d3aee Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 09:42:21 +0000
Subject: [PATCH 05/12] ENCOA-271

---
 src/components/High/Table.tsx        |   2 +-
 src/hooks/useEntitiesCodes.tsx       |  25 ++++
 src/pages/(admin)/Lists/CodeList.tsx | 179 +++++----------------------
 src/pages/api/code/entities.ts       |  36 ++++++
 src/pages/api/code/index.ts          |  10 +-
 src/utils/users.ts                   |   2 +-
 6 files changed, 97 insertions(+), 157 deletions(-)
 create mode 100644 src/hooks/useEntitiesCodes.tsx
 create mode 100644 src/pages/api/code/entities.ts

diff --git a/src/components/High/Table.tsx b/src/components/High/Table.tsx
index 64e166ef..479e614c 100644
--- a/src/components/High/Table.tsx
+++ b/src/components/High/Table.tsx
@@ -1,7 +1,7 @@
 import { useListSearch } from "@/hooks/useListSearch"
 import { ColumnDef, flexRender, getCoreRowModel, getPaginationRowModel, getSortedRowModel, PaginationState, useReactTable } from "@tanstack/react-table"
 import clsx from "clsx"
-import { useState } from "react"
+import { useEffect, useState } from "react"
 import { BsArrowDown, BsArrowUp } from "react-icons/bs"
 import Button from "../Low/Button"
 
diff --git a/src/hooks/useEntitiesCodes.tsx b/src/hooks/useEntitiesCodes.tsx
new file mode 100644
index 00000000..e286b6a7
--- /dev/null
+++ b/src/hooks/useEntitiesCodes.tsx
@@ -0,0 +1,25 @@
+import { Code, Group, User } from "@/interfaces/user";
+import axios from "axios";
+import { useEffect, useState } from "react";
+
+export default function useEntitiesCodes(entities?: string[]) {
+	const [codes, setCodes] = useState<Code[]>([]);
+	const [isLoading, setIsLoading] = useState(false);
+	const [isError, setIsError] = useState(false);
+
+	const getData = () => {
+		setIsLoading(true);
+		const params = new URLSearchParams()
+		if (entities)
+			entities.forEach(e => params.append("entities", e))
+
+		axios
+			.get<Code[]>(`/api/code/entities${entities ? `?${params.toString()}` : ""}`)
+			.then((response) => setCodes(response.data))
+			.finally(() => setIsLoading(false));
+	};
+
+	useEffect(getData, [entities]);
+
+	return { codes, isLoading, isError, reload: getData };
+}
diff --git a/src/pages/(admin)/Lists/CodeList.tsx b/src/pages/(admin)/Lists/CodeList.tsx
index 3d71b533..383f3a29 100644
--- a/src/pages/(admin)/Lists/CodeList.tsx
+++ b/src/pages/(admin)/Lists/CodeList.tsx
@@ -1,83 +1,47 @@
 import Button from "@/components/Low/Button";
 import Checkbox from "@/components/Low/Checkbox";
-import Select from "@/components/Low/Select";
-import useCodes from "@/hooks/useCodes";
-import useUser from "@/hooks/useUser";
 import useUsers from "@/hooks/useUsers";
 import { Code, User } from "@/interfaces/user";
 import { USER_TYPE_LABELS } from "@/resources/user";
-import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
+import { createColumnHelper } from "@tanstack/react-table";
 import axios from "axios";
 import moment from "moment";
-import { useEffect, useState, useMemo } from "react";
+import { useState, useMemo } from "react";
 import { BsTrash } from "react-icons/bs";
 import { toast } from "react-toastify";
-import ReactDatePicker from "react-datepicker";
-import clsx from "clsx";
-import { checkAccess } from "@/utils/permissions";
-import usePermissions from "@/hooks/usePermissions";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { isAdmin } from "@/utils/users";
-import { findBy } from "@/utils";
+import { findBy, mapBy } from "@/utils";
+import useEntitiesCodes from "@/hooks/useEntitiesCodes";
+import Table from "@/components/High/Table";
 
-const columnHelper = createColumnHelper<Code>();
-
-const CreatorCell = ({ id, users }: { id: string; users: User[] }) => {
-	const [creatorUser, setCreatorUser] = useState<User>();
-
-	useEffect(() => {
-		setCreatorUser(users.find((x) => x.id === id));
-	}, [id, users]);
-
-	return (
-		<>
-			{(creatorUser?.name || "N/A") || "N/A"}{" "}
-			{creatorUser && `(${USER_TYPE_LABELS[creatorUser?.type]})`}
-		</>
-	);
-};
+type TableData = Code & { entity?: EntityWithRoles, creator?: User }
+const columnHelper = createColumnHelper<TableData>();
 
 export default function CodeList({ user, entities, canDeleteCodes }
 	: { user: User, entities: EntityWithRoles[], canDeleteCodes?: boolean }) {
 	const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
 
-	const [filteredCorporate, setFilteredCorporate] = useState<User | undefined>(user?.type === "corporate" ? user : undefined);
-	const [filterAvailability, setFilterAvailability] = useState<"in-use" | "unused">();
+	const entityIDs = useMemo(() => mapBy(entities, 'id'), [entities])
 
 	const { users } = useUsers();
-	const { codes, reload } = useCodes();
+	const { codes, reload } = useEntitiesCodes(isAdmin(user) ? undefined : entityIDs)
 
-	const [startDate, setStartDate] = useState<Date | null>(moment("01/01/2023").toDate());
-	const [endDate, setEndDate] = useState<Date | null>(moment().endOf("day").toDate());
-	const filteredCodes = useMemo(() => {
-		return codes.filter((x) => {
-			// TODO: if the expiry date is missing, it does not make sense to filter by date
-			// so we need to find a way to handle this edge case
-			if (startDate && endDate && x.expiryDate) {
-				const date = moment(x.expiryDate);
-				if (date.isBefore(startDate) || date.isAfter(endDate)) {
-					return false;
-				}
-			}
-			if (filteredCorporate && x.creator !== filteredCorporate.id) return false;
-			if (filterAvailability) {
-				if (filterAvailability === "in-use" && !x.userId) return false;
-				if (filterAvailability === "unused" && x.userId) return false;
-			}
-
-			return true;
-		});
-	}, [codes, startDate, endDate, filteredCorporate, filterAvailability]);
+	const data: TableData[] = useMemo(() => codes.map((code) => ({
+		...code,
+		entity: findBy(entities, 'id', code.entity),
+		creator: findBy(users, 'id', code.creator)
+	})) as TableData[], [codes, entities, users])
 
 	const toggleCode = (id: string) => {
 		setSelectedCodes((prev) => (prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]));
 	};
 
-	const toggleAllCodes = (checked: boolean) => {
-		if (checked) return setSelectedCodes(filteredCodes.filter((x) => !x.userId).map((x) => x.code));
+	// const toggleAllCodes = (checked: boolean) => {
+	// 	if (checked) return setSelectedCodes(visibleRows.filter((x) => !x.userId).map((x) => x.code));
 
-		return setSelectedCodes([]);
-	};
+	// 	return setSelectedCodes([]);
+	// };
 
 	const deleteCodes = async (codes: string[]) => {
 		if (!canDeleteCodes) return
@@ -134,16 +98,8 @@ export default function CodeList({ user, entities, canDeleteCodes }
 	const defaultColumns = [
 		columnHelper.accessor("code", {
 			id: "codeCheckbox",
-			header: () => (
-				<Checkbox
-					disabled={filteredCodes.filter((x) => !x.userId).length === 0}
-					isChecked={
-						selectedCodes.length === filteredCodes.filter((x) => !x.userId).length && filteredCodes.filter((x) => !x.userId).length > 0
-					}
-					onChange={(checked) => toggleAllCodes(checked)}>
-					{""}
-				</Checkbox>
-			),
+			enableSorting: false,
+			header: () => (""),
 			cell: (info) =>
 				!info.row.original.userId ? (
 					<Checkbox isChecked={selectedCodes.includes(info.getValue())} onChange={() => toggleCode(info.getValue())}>
@@ -165,11 +121,11 @@ export default function CodeList({ user, entities, canDeleteCodes }
 		}),
 		columnHelper.accessor("creator", {
 			header: "Creator",
-			cell: (info) => <CreatorCell id={info.getValue()} users={users} />,
+			cell: (info) => info.getValue() ? `${info.getValue().name} (${USER_TYPE_LABELS[info.getValue().type]})` : "N/A",
 		}),
 		columnHelper.accessor("entity", {
 			header: "Entity",
-			cell: (info) => findBy(entities, 'id', info.getValue())?.label || "N/A",
+			cell: (info) => info.getValue()?.label || "N/A",
 		}),
 		columnHelper.accessor("userId", {
 			header: "Availability",
@@ -201,71 +157,11 @@ export default function CodeList({ user, entities, canDeleteCodes }
 		},
 	];
 
-	const table = useReactTable({
-		data: filteredCodes,
-		columns: defaultColumns,
-		getCoreRowModel: getCoreRowModel(),
-	});
-
 	return (
 		<>
 			<div className="flex items-center justify-between pb-4 pt-1">
-				<div className="flex items-center gap-4">
-					<Select
-						className="!w-96 !py-1"
-						disabled={user?.type === "corporate"}
-						isClearable
-						placeholder="Corporate"
-						value={
-							filteredCorporate
-								? {
-									label: `${filteredCorporate.name} (${USER_TYPE_LABELS[filteredCorporate?.type]})`,
-									value: filteredCorporate.id,
-								}
-								: null
-						}
-						options={users
-							.filter((x) => ["admin", "developer", "corporate"].includes(x.type))
-							.map((x) => ({
-								label: `${x.name} (${USER_TYPE_LABELS[x.type]})`,
-								value: x.id,
-								user: x,
-							}))}
-						onChange={(value) => setFilteredCorporate(value ? users.find((x) => x.id === value?.value) : undefined)}
-					/>
-					<Select
-						className="!w-96 !py-1"
-						placeholder="Availability"
-						isClearable
-						options={[
-							{ label: "In Use", value: "in-use" },
-							{ label: "Unused", value: "unused" },
-						]}
-						onChange={(value) => setFilterAvailability(value ? (value.value as typeof filterAvailability) : undefined)}
-					/>
-					<ReactDatePicker
-						dateFormat="dd/MM/yyyy"
-						className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
-						selected={startDate}
-						startDate={startDate}
-						endDate={endDate}
-						selectsRange
-						showMonthDropdown
-						filterDate={(date: Date) => moment(date).isSameOrBefore(moment(new Date()))}
-						onChange={([initialDate, finalDate]: [Date, Date]) => {
-							setStartDate(initialDate ?? moment("01/01/2023").toDate());
-							if (finalDate) {
-								// basicly selecting a final day works as if I'm selecting the first
-								// minute of that day. this way it covers the whole day
-								setEndDate(moment(finalDate).endOf("day").toDate());
-								return;
-							}
-							setEndDate(null);
-						}}
-					/>
-				</div>
 				{canDeleteCodes && (
-					<div className="flex gap-4 items-center">
+					<div className="flex gap-4 items-center w-full justify-end">
 						<span>{selectedCodes.length} code(s) selected</span>
 						<Button
 							disabled={selectedCodes.length === 0}
@@ -278,30 +174,11 @@ export default function CodeList({ user, entities, canDeleteCodes }
 					</div>
 				)}
 			</div>
-			<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
-				<thead>
-					{table.getHeaderGroups().map((headerGroup) => (
-						<tr key={headerGroup.id}>
-							{headerGroup.headers.map((header) => (
-								<th className="p-4 text-left" key={header.id}>
-									{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
-								</th>
-							))}
-						</tr>
-					))}
-				</thead>
-				<tbody className="px-2">
-					{table.getRowModel().rows.map((row) => (
-						<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
-							{row.getVisibleCells().map((cell) => (
-								<td className="px-4 py-2" key={cell.id}>
-									{flexRender(cell.column.columnDef.cell, cell.getContext())}
-								</td>
-							))}
-						</tr>
-					))}
-				</tbody>
-			</table>
+			<Table<TableData>
+				data={data}
+				columns={defaultColumns}
+				searchFields={[["code"], ["email"], ["entity", "label"], ["creator", "name"], ['creator', 'type']]}
+			/>
 		</>
 	);
 }
diff --git a/src/pages/api/code/entities.ts b/src/pages/api/code/entities.ts
new file mode 100644
index 00000000..b1a26ba0
--- /dev/null
+++ b/src/pages/api/code/entities.ts
@@ -0,0 +1,36 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from "next";
+import client from "@/lib/mongodb";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { Code, Group, Type } from "@/interfaces/user";
+import { PERMISSIONS } from "@/constants/userPermissions";
+import { prepareMailer, prepareMailOptions } from "@/email";
+import { isAdmin } from "@/utils/users";
+import { requestUser } from "@/utils/api";
+import { doesEntityAllow } from "@/utils/permissions";
+import { getEntity, getEntityWithRoles } from "@/utils/entities.be";
+import { findBy } from "@/utils";
+import { EntityWithRoles } from "@/interfaces/entity";
+
+const db = client.db(process.env.MONGODB_DB);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+	if (req.method === "GET") return get(req, res);
+
+	return res.status(404).json({ ok: false });
+}
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+	const user = await requestUser(req, res)
+	if (!user)
+		return res.status(401).json({ ok: false, reason: "You must be logged in!" })
+
+	const { entities } = req.query as { entities?: string[] };
+	if (entities)
+		return res.status(200).json(await db.collection("codes").find<Code>({ entity: { $in: entities } }).toArray());
+
+	return res.status(200).json(await db.collection("codes").find<Code>({}).toArray());
+}
diff --git a/src/pages/api/code/index.ts b/src/pages/api/code/index.ts
index d2eaf8e8..dee64299 100644
--- a/src/pages/api/code/index.ts
+++ b/src/pages/api/code/index.ts
@@ -40,6 +40,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 const generateAndSendCode = async (
 	code: string,
 	type: Type,
+	creator: string,
 	expiryDate: null | Date,
 	entity?: string,
 	info?: {
@@ -47,7 +48,7 @@ const generateAndSendCode = async (
 	}) => {
 	if (!info) {
 		await db.collection("codes").insertOne({
-			code, type, expiryDate, entity
+			code, type, creator, expiryDate, entity, creationDate: new Date().toISOString()
 		})
 		return true
 	}
@@ -70,8 +71,9 @@ const generateAndSendCode = async (
 		await transport.sendMail(mailOptions);
 		if (!previousCode) {
 			await db.collection("codes").insertOne({
-				code, type, expiryDate, entity, name: info.name.trim(), email: info.email.trim().toLowerCase(),
-				...(info.passport_id ? { passport_id: info.passport_id.trim() } : {})
+				code, type, creator, expiryDate, entity, name: info.name.trim(), email: info.email.trim().toLowerCase(),
+				...(info.passport_id ? { passport_id: info.passport_id.trim() } : {}),
+				creationDate: new Date().toISOString()
 			})
 		}
 
@@ -118,7 +120,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 	const valid = []
 	for (const code of codes) {
 		const info = findBy(infos || [], 'code', code)
-		const isValid = await generateAndSendCode(code, type, expiryDate, entity, info)
+		const isValid = await generateAndSendCode(code, type, user.id, expiryDate, entity, info)
 		valid.push(isValid)
 	}
 
diff --git a/src/utils/users.ts b/src/utils/users.ts
index 5472afa0..75ec3e7d 100644
--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -48,4 +48,4 @@ export const getUserName = (user?: User) => {
 	return user.name;
 };
 
-export const isAdmin = (user: User) => ["admin", "developer"].includes(user.type)
+export const isAdmin = (user: User) => ["admin", "developer"].includes(user?.type)

From 3e74827c47ee3eb3baa5e007e47b39a0a0547af9 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 12:28:57 +0000
Subject: [PATCH 06/12] ENCOA-266

---
 src/pages/dashboard/corporate.tsx        | 15 +++++----
 src/pages/dashboard/mastercorporate.tsx  | 25 +++++---------
 src/pages/dashboard/teacher.tsx          | 34 +++++--------------
 src/pages/entities/[id]/roles/[role].tsx |  3 +-
 src/pages/users/performance.tsx          | 42 +++++++++++++-----------
 src/resources/entityPermissions.ts       |  6 ++--
 6 files changed, 56 insertions(+), 69 deletions(-)

diff --git a/src/pages/dashboard/corporate.tsx b/src/pages/dashboard/corporate.tsx
index 544ca49a..4ef1e2ff 100644
--- a/src/pages/dashboard/corporate.tsx
+++ b/src/pages/dashboard/corporate.tsx
@@ -68,6 +68,7 @@ export default function Dashboard({ user, users, userCounts, entities, assignmen
 	const teachers = useMemo(() => users.filter((u) => u.type === "teacher"), [users]);
 
 	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
+	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
 
 	const router = useRouter();
 
@@ -127,12 +128,14 @@ export default function Dashboard({ user, users, userCounts, entities, assignmen
 								color="purple"
 							/>
 						)}
-						<IconCard Icon={BsPersonFillGear}
-							onClick={() => router.push("/users/performance")}
-							label="Student Performance"
-							value={userCounts.student}
-							color="purple"
-						/>
+						{allowedStudentPerformance.length > 0 && (
+							<IconCard Icon={BsPersonFillGear}
+								onClick={() => router.push("/users/performance")}
+								label="Student Performance"
+								value={students.length}
+								color="purple"
+							/>
+						)}
 						<IconCard
 							Icon={BsClock}
 							label="Expiration Date"
diff --git a/src/pages/dashboard/mastercorporate.tsx b/src/pages/dashboard/mastercorporate.tsx
index 1e7eaf5a..6e887bfd 100644
--- a/src/pages/dashboard/mastercorporate.tsx
+++ b/src/pages/dashboard/mastercorporate.tsx
@@ -76,16 +76,7 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 	const router = useRouter();
 
 	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
-
-	const UserDisplay = (displayUser: User) => (
-		<div className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>{displayUser.name}</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
+	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
 
 	return (
 		<>
@@ -131,12 +122,14 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 						color="purple"
 					/>
 					<IconCard Icon={BsClipboard2Data} label="Exams Performed" value={uniqBy(stats, "exam").length} color="purple" />
-					<IconCard Icon={BsPersonFillGear}
-						onClick={() => router.push("/users/performance")}
-						label="Student Performance"
-						value={students.length}
-						color="purple"
-					/>
+					{allowedStudentPerformance.length > 0 && (
+						<IconCard Icon={BsPersonFillGear}
+							onClick={() => router.push("/users/performance")}
+							label="Student Performance"
+							value={students.length}
+							color="purple"
+						/>
+					)}
 					{allowedEntityStatistics.length > 0 && (
 						<IconCard Icon={BsPersonFillGear}
 							onClick={() => router.push("/statistical")}
diff --git a/src/pages/dashboard/teacher.tsx b/src/pages/dashboard/teacher.tsx
index 14b52e48..5843ac7d 100644
--- a/src/pages/dashboard/teacher.tsx
+++ b/src/pages/dashboard/teacher.tsx
@@ -60,31 +60,7 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 	const router = useRouter();
 
 	const allowedEntityStatistics = useAllowedEntities(user, entities, 'view_entity_statistics')
-
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({
-				focus: students.find((u) => u.id === s.user)?.focus,
-				score: s.score,
-				module: s.module,
-			}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: { [key in Module]: number } = {
-			reading: 0,
-			listening: 0,
-			writing: 0,
-			speaking: 0,
-			level: 0,
-		};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
+	const allowedStudentPerformance = useAllowedEntities(user, entities, 'view_student_performance')
 
 	return (
 		<>
@@ -121,6 +97,14 @@ export default function Dashboard({ user, users, entities, assignments, stats, g
 							color="purple"
 						/>
 						<IconCard Icon={BsClipboard2Data} label="Exams Performed" value={uniqBy(stats, "exam").length} color="purple" />
+						{allowedStudentPerformance.length > 0 && (
+							<IconCard Icon={BsPersonFillGear}
+								onClick={() => router.push("/users/performance")}
+								label="Student Performance"
+								value={students.length}
+								color="purple"
+							/>
+						)}
 						{allowedEntityStatistics.length > 0 && (
 							<IconCard Icon={BsPersonFillGear}
 								onClick={() => router.push("/statistical")}
diff --git a/src/pages/entities/[id]/roles/[role].tsx b/src/pages/entities/[id]/roles/[role].tsx
index 3b0d2f86..ec8f445c 100644
--- a/src/pages/entities/[id]/roles/[role].tsx
+++ b/src/pages/entities/[id]/roles/[role].tsx
@@ -93,7 +93,8 @@ const ENTITY_MANAGEMENT: PermissionLayout[] = [
 	{ label: "Assign Role to User", key: "assign_to_role" },
 	{ label: "Delete Entity Role", key: "delete_entity_role" },
 	{ label: "Download Statistics Report", key: "download_statistics_report" },
-	{ label: "Edit Grading System", key: "edit_grading_system" }
+	{ label: "Edit Grading System", key: "edit_grading_system" },
+	{ label: "View Student Performance", key: "view_student_performance" }
 ]
 
 const ASSIGNMENT_MANAGEMENT: PermissionLayout[] = [
diff --git a/src/pages/users/performance.tsx b/src/pages/users/performance.tsx
index 0ccd1773..4653c959 100644
--- a/src/pages/users/performance.tsx
+++ b/src/pages/users/performance.tsx
@@ -1,17 +1,17 @@
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useGroups from "@/hooks/useGroups";
-import useUsers, {userHashStudent} from "@/hooks/useUsers";
-import {Group, Stat, StudentUser, User} from "@/interfaces/user";
-import {getUserCompanyName} from "@/resources/user";
+import useUsers, { userHashStudent } from "@/hooks/useUsers";
+import { Group, Stat, StudentUser, User } from "@/interfaces/user";
+import { getUserCompanyName } from "@/resources/user";
 import clsx from "clsx";
-import {useRouter} from "next/router";
-import {BsArrowLeft, BsArrowRepeat, BsChevronLeft} from "react-icons/bs";
+import { useRouter } from "next/router";
+import { BsArrowLeft, BsArrowRepeat, BsChevronLeft } from "react-icons/bs";
 import { mapBy, serialize } from "@/utils";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
 import { sessionOptions } from "@/lib/session";
-import { checkAccess } from "@/utils/permissions";
-import { getEntities } from "@/utils/entities.be";
+import { checkAccess, findAllowedEntities } from "@/utils/permissions";
+import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
 import { Entity } from "@/interfaces/entity";
 import { getParticipantGroups, getParticipantsGroups } from "@/utils/groups.be";
 import StudentPerformanceList from "../(admin)/Lists/StudentPerformanceList";
@@ -21,21 +21,25 @@ import Layout from "@/components/High/Layout";
 import { requestUser } from "@/utils/api";
 import { redirect } from "@/utils";
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res, query}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
 	const user = await requestUser(req, res)
 	if (!user) return redirect("/login")
 
 	const entityIDs = mapBy(user.entities, 'id')
 
-	const entities = await getEntities(checkAccess(user, ["admin", 'developer']) ? undefined : entityIDs)
+	const entities = await getEntitiesWithRoles(checkAccess(user, ["admin", 'developer']) ? undefined : entityIDs)
+	const allowedEntities = findAllowedEntities(user, entities, "view_student_performance")
+
+	if (allowedEntities.length === 0) return redirect("/")
+
 	const students = await (checkAccess(user, ["admin", 'developer'])
-		? getUsers({type: 'student'})
-		: getEntitiesUsers(entityIDs, {type: 'student'})
+		? getUsers({ type: 'student' })
+		: getEntitiesUsers(mapBy(allowedEntities, 'id'), { type: 'student' })
 	)
 	const groups = await getParticipantsGroups(mapBy(students, 'id'))
 
 	return {
-		props: serialize({user, students, entities, groups}),
+		props: serialize({ user, students, entities, groups }),
 	};
 }, sessionOptions);
 
@@ -46,8 +50,8 @@ interface Props {
 	groups: Group[]
 }
 
-const StudentPerformance = ({user, students, entities, groups}: Props) => {
-	const {data: stats} = useFilterRecordsByUser<Stat[]>();
+const StudentPerformance = ({ user, students, entities, groups }: Props) => {
+	const { data: stats } = useFilterRecordsByUser<Stat[]>();
 
 	const router = useRouter();
 
@@ -58,7 +62,7 @@ const StudentPerformance = ({user, students, entities, groups}: Props) => {
 	}));
 
 	return (
-	<>
+		<>
 			<Head>
 				<title>EnCoach</title>
 				<meta
@@ -70,7 +74,7 @@ const StudentPerformance = ({user, students, entities, groups}: Props) => {
 			</Head>
 			<ToastContainer />
 
-				<Layout user={user}>
+			<Layout user={user}>
 				<div className="flex items-center gap-2">
 					<button
 						onClick={() => {
@@ -79,9 +83,9 @@ const StudentPerformance = ({user, students, entities, groups}: Props) => {
 						className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
 						<BsChevronLeft />
 					</button>
-					<h2 className="font-bold text-2xl">Student Performance ({ students.length })</h2>
+					<h2 className="font-bold text-2xl">Student Performance ({students.length})</h2>
 				</div>
-			<StudentPerformanceList items={performanceStudents} stats={stats} />
+				<StudentPerformanceList items={performanceStudents} stats={stats} />
 			</Layout>
 		</>
 	);
diff --git a/src/resources/entityPermissions.ts b/src/resources/entityPermissions.ts
index 27b94e7e..ddcfbf5a 100644
--- a/src/resources/entityPermissions.ts
+++ b/src/resources/entityPermissions.ts
@@ -58,7 +58,8 @@ export type RolePermission =
 	"delete_code" |
 	"view_statistics" |
 	"download_statistics_report" |
-	"edit_grading_system"
+	"edit_grading_system" |
+	"view_student_performance"
 
 export const DEFAULT_PERMISSIONS: RolePermission[] = [
 	"view_students",
@@ -130,5 +131,6 @@ export const ADMIN_PERMISSIONS: RolePermission[] = [
 	"delete_code",
 	"view_statistics",
 	"download_statistics_report",
-	"edit_grading_system"
+	"edit_grading_system",
+	"view_student_performance"
 ]

From 240e36f15aea39d570ce18f16554b670b2b89ebd Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 15:06:00 +0000
Subject: [PATCH 07/12] ENCOA-279

---
 src/pages/action.tsx                    | 24 ++++----
 src/pages/api/register.ts               |  5 +-
 src/pages/dashboard/admin.tsx           |  2 +-
 src/pages/dashboard/corporate.tsx       |  2 +-
 src/pages/dashboard/developer.tsx       |  2 +-
 src/pages/dashboard/index.tsx           | 10 ++--
 src/pages/dashboard/mastercorporate.tsx |  2 +-
 src/pages/dashboard/student.tsx         | 74 +++++++++++++------------
 src/pages/dashboard/teacher.tsx         |  2 +-
 src/pages/index.tsx                     | 10 ++--
 src/pages/login.tsx                     | 11 ++--
 11 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/src/pages/action.tsx b/src/pages/action.tsx
index c6cf8cbb..8e74bc14 100644
--- a/src/pages/action.tsx
+++ b/src/pages/action.tsx
@@ -1,15 +1,15 @@
 /* eslint-disable @next/next/no-img-element */
-import {toast, ToastContainer} from "react-toastify";
+import { toast, ToastContainer } from "react-toastify";
 import axios from "axios";
-import {FormEvent, useEffect, useState} from "react";
+import { FormEvent, useEffect, useState } from "react";
 import Head from "next/head";
 import useUser from "@/hooks/useUser";
-import {Divider} from "primereact/divider";
+import { Divider } from "primereact/divider";
 import Button from "@/components/Low/Button";
-import {BsArrowRepeat} from "react-icons/bs";
+import { BsArrowRepeat } from "react-icons/bs";
 import Link from "next/link";
 import Input from "@/components/Low/Input";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
 
 export function getServerSideProps({
 	query,
@@ -35,12 +35,12 @@ export function getServerSideProps({
 		props: {
 			code: query.oobCode,
 			mode: query.mode,
-			...(query.continueUrl ? {continueUrl: query.continueUrl} : {}),
+			...(query.continueUrl ? { continueUrl: query.continueUrl } : {}),
 		},
 	};
 }
 
-export default function Reset({code, mode, continueUrl}: {code: string; mode: string; continueUrl?: string}) {
+export default function Reset({ code, mode, continueUrl }: { code: string; mode: string; continueUrl?: string }) {
 	const [password, setPassword] = useState("");
 	const [isLoading, setIsLoading] = useState(false);
 
@@ -54,7 +54,7 @@ export default function Reset({code, mode, continueUrl}: {code: string; mode: st
 	useEffect(() => {
 		if (mode === "signIn") {
 			axios
-				.post<{ok: boolean}>("/api/reset/verify", {
+				.post<{ ok: boolean }>("/api/reset/verify", {
 					email: continueUrl?.replace("https://platform.encoach.com/", "").replace("https://staging.encoach.com/", ""),
 				})
 				.then((response) => {
@@ -64,7 +64,7 @@ export default function Reset({code, mode, continueUrl}: {code: string; mode: st
 						});
 						setTimeout(() => {
 							router.push("/");
-						}, 1000);
+						}, 500);
 						return;
 					}
 
@@ -86,7 +86,7 @@ export default function Reset({code, mode, continueUrl}: {code: string; mode: st
 
 		setIsLoading(true);
 		axios
-			.post<{ok: boolean}>("/api/reset/confirm", {code, password})
+			.post<{ ok: boolean }>("/api/reset/confirm", { code, password })
 			.then((response) => {
 				if (response.data.ok) {
 					toast.success("Your password has been reset!", {
@@ -98,10 +98,10 @@ export default function Reset({code, mode, continueUrl}: {code: string; mode: st
 					return;
 				}
 
-				toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", {toastId: "reset-error"});
+				toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", { toastId: "reset-error" });
 			})
 			.catch(() => {
-				toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", {toastId: "reset-error"});
+				toast.error("Something went wrong! Please make sure to click the link in your e-mail again!", { toastId: "reset-error" });
 			})
 			.finally(() => setIsLoading(false));
 	};
diff --git a/src/pages/api/register.ts b/src/pages/api/register.ts
index b5dc4d1f..6e9238e0 100644
--- a/src/pages/api/register.ts
+++ b/src/pages/api/register.ts
@@ -73,9 +73,8 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 				...(passport_id ? { demographicInformation: { passport_id } } : {}),
 				registrationDate: new Date().toISOString(),
 				status: code ? "active" : "paymentDue",
-				// apparently there's an issue with the verification email system
-				// therefore we will skip this requirement for now
-				isVerified: true,
+				entities: [],
+				isVerified: !!codeDoc,
 			};
 
 			await db.collection("users").insertOne(user);
diff --git a/src/pages/dashboard/admin.tsx b/src/pages/dashboard/admin.tsx
index 187e0332..2e53d579 100644
--- a/src/pages/dashboard/admin.tsx
+++ b/src/pages/dashboard/admin.tsx
@@ -47,7 +47,7 @@ interface Props {
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
 
diff --git a/src/pages/dashboard/corporate.tsx b/src/pages/dashboard/corporate.tsx
index 4ef1e2ff..7b786bc6 100644
--- a/src/pages/dashboard/corporate.tsx
+++ b/src/pages/dashboard/corporate.tsx
@@ -46,7 +46,7 @@ interface Props {
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer", "corporate"])) return redirect("/")
 
diff --git a/src/pages/dashboard/developer.tsx b/src/pages/dashboard/developer.tsx
index 187e0332..2e53d579 100644
--- a/src/pages/dashboard/developer.tsx
+++ b/src/pages/dashboard/developer.tsx
@@ -47,7 +47,7 @@ interface Props {
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer"])) return redirect("/")
 
diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx
index abefdaad..d73c8f29 100644
--- a/src/pages/dashboard/index.tsx
+++ b/src/pages/dashboard/index.tsx
@@ -1,12 +1,12 @@
-import {User} from "@/interfaces/user";
-import {sessionOptions} from "@/lib/session";
+import { User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
 import { redirect } from "@/utils";
 import { requestUser } from "@/utils/api";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	return redirect(`/dashboard/${user.type}`)
 }, sessionOptions);
diff --git a/src/pages/dashboard/mastercorporate.tsx b/src/pages/dashboard/mastercorporate.tsx
index 6e887bfd..8e7d5378 100644
--- a/src/pages/dashboard/mastercorporate.tsx
+++ b/src/pages/dashboard/mastercorporate.tsx
@@ -52,7 +52,7 @@ interface Props {
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer", "mastercorporate"]))
 		return redirect("/")
diff --git a/src/pages/dashboard/student.tsx b/src/pages/dashboard/student.tsx
index dc46e5ee..2a1f000c 100644
--- a/src/pages/dashboard/student.tsx
+++ b/src/pages/dashboard/student.tsx
@@ -5,38 +5,38 @@ import ProgressBar from "@/components/Low/ProgressBar";
 import InviteWithUserCard from "@/components/Medium/InviteWithUserCard";
 import ModuleBadge from "@/components/ModuleBadge";
 import ProfileSummary from "@/components/ProfileSummary";
-import {Session} from "@/hooks/useSessions";
-import {Grading} from "@/interfaces";
-import {EntityWithRoles} from "@/interfaces/entity";
-import {Exam} from "@/interfaces/exam";
+import { Session } from "@/hooks/useSessions";
+import { Grading } from "@/interfaces";
+import { EntityWithRoles } from "@/interfaces/entity";
+import { Exam } from "@/interfaces/exam";
 import { InviteWithEntity } from "@/interfaces/invite";
-import {Assignment} from "@/interfaces/results";
-import {Stat, User} from "@/interfaces/user";
-import {sessionOptions} from "@/lib/session";
+import { Assignment } from "@/interfaces/results";
+import { Stat, User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
 import useExamStore from "@/stores/exam";
-import {findBy, mapBy, redirect, serialize} from "@/utils";
+import { findBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import {activeAssignmentFilter} from "@/utils/assignments";
-import {getAssignmentsByAssignee} from "@/utils/assignments.be";
-import {getEntitiesWithRoles, getEntityWithRoles} from "@/utils/entities.be";
-import {getExamsByIds} from "@/utils/exams.be";
-import {getGradingSystemByEntity} from "@/utils/grading.be";
-import {convertInvitersToEntity, getInvitesByInvitee} from "@/utils/invites.be";
-import {countExamModules, countFullExams, MODULE_ARRAY, sortByModule, sortByModuleName} from "@/utils/moduleUtils";
-import {checkAccess} from "@/utils/permissions";
-import {getGradingLabel} from "@/utils/score";
-import {getSessionsByUser} from "@/utils/sessions.be";
-import {averageScore} from "@/utils/stats";
-import {getStatsByUser} from "@/utils/stats.be";
+import { activeAssignmentFilter } from "@/utils/assignments";
+import { getAssignmentsByAssignee } from "@/utils/assignments.be";
+import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
+import { getExamsByIds } from "@/utils/exams.be";
+import { getGradingSystemByEntity } from "@/utils/grading.be";
+import { convertInvitersToEntity, getInvitesByInvitee } from "@/utils/invites.be";
+import { countExamModules, countFullExams, MODULE_ARRAY, sortByModule, sortByModuleName } from "@/utils/moduleUtils";
+import { checkAccess } from "@/utils/permissions";
+import { getGradingLabel } from "@/utils/score";
+import { getSessionsByUser } from "@/utils/sessions.be";
+import { averageScore } from "@/utils/stats";
+import { getStatsByUser } from "@/utils/stats.be";
 import clsx from "clsx";
-import {withIronSessionSsr} from "iron-session/next";
-import {capitalize, uniqBy} from "lodash";
+import { withIronSessionSsr } from "iron-session/next";
+import { capitalize, uniqBy } from "lodash";
 import moment from "moment";
 import Head from "next/head";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
 import { useMemo } from "react";
-import {BsBook, BsClipboard, BsFileEarmarkText, BsHeadphones, BsMegaphone, BsPen, BsPencil, BsStar} from "react-icons/bs";
-import {ToastContainer} from "react-toastify";
+import { BsBook, BsClipboard, BsFileEarmarkText, BsHeadphones, BsMegaphone, BsPen, BsPencil, BsStar } from "react-icons/bs";
+import { ToastContainer } from "react-toastify";
 
 interface Props {
 	user: User;
@@ -49,9 +49,9 @@ interface Props {
 	grading: Grading;
 }
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer", "student"]))
 		return redirect("/")
@@ -59,7 +59,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const entityIDS = mapBy(user.entities, "id") || [];
 
 	const entities = await getEntitiesWithRoles(entityIDS);
-	const assignments = await getAssignmentsByAssignee(user.id, {archived: {$ne: true}});
+	const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
 	const stats = await getStatsByUser(user.id);
 	const sessions = await getSessionsByUser(user.id, 10);
 	const invites = await getInvitesByInvitee(user.id);
@@ -69,16 +69,16 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 
 	const examIDs = uniqBy(
 		assignments.flatMap((a) =>
-			a.exams.filter((e) => e.assignee === user.id).map((e) => ({module: e.module, id: e.id, key: `${e.module}_${e.id}`})),
+			a.exams.filter((e) => e.assignee === user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
 		),
 		"key",
 	);
 	const exams = await getExamsByIds(examIDs);
 
-	return {props: serialize({user, entities, assignments, stats, exams, sessions, invites: formattedInvites, grading})};
+	return { props: serialize({ user, entities, assignments, stats, exams, sessions, invites: formattedInvites, grading }) };
 }, sessionOptions);
 
-export default function Dashboard({user, entities, assignments, stats, invites, grading, sessions, exams}: Props) {
+export default function Dashboard({ user, entities, assignments, stats, invites, grading, sessions, exams }: Props) {
 	const router = useRouter();
 
 	const dispatch = useExamStore((state) => state.dispatch);
@@ -90,11 +90,13 @@ export default function Dashboard({user, entities, assignments, stats, invites,
 		})
 
 		if (assignmentExams.every((x) => !!x)) {
-			dispatch({type: "INIT_EXAM", payload: {
-				exams: assignmentExams.sort(sortByModule),
-				modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
-				assignment 
-			}})
+			dispatch({
+				type: "INIT_EXAM", payload: {
+					exams: assignmentExams.sort(sortByModule),
+					modules: mapBy(assignmentExams.sort(sortByModule), 'module'),
+					assignment
+				}
+			})
 
 			router.push("/exam");
 		}
diff --git a/src/pages/dashboard/teacher.tsx b/src/pages/dashboard/teacher.tsx
index 5843ac7d..0d3a880c 100644
--- a/src/pages/dashboard/teacher.tsx
+++ b/src/pages/dashboard/teacher.tsx
@@ -39,7 +39,7 @@ interface Props {
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	if (!checkAccess(user, ["admin", "developer", "teacher"]))
 		return redirect("/")
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index abefdaad..d73c8f29 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,12 +1,12 @@
-import {User} from "@/interfaces/user";
-import {sessionOptions} from "@/lib/session";
+import { User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
 import { redirect } from "@/utils";
 import { requestUser } from "@/utils/api";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res)
-	if (!user) return redirect("/login")
+	if (!user || !user.isVerified) return redirect("/login")
 
 	return redirect(`/dashboard/${user.type}`)
 }, sessionOptions);
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index 09fee825..8cc49f98 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -23,7 +23,7 @@ const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:
 export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
 	const destination = !query.destination ? "/" : Buffer.from(query.destination as string, 'base64').toString()
 	const user = await requestUser(req, res)
-	if (user) return redirect(destination)
+	if (user && user.isVerified) return redirect(destination)
 
 	return {
 		props: { user: null, destination },
@@ -39,13 +39,10 @@ export default function Login({ destination = "/" }: { destination?: string }) {
 	const router = useRouter();
 	const isOfficialExamLogin = useMemo(() => destination.startsWith("/official-exam"), [destination])
 
-	const { user, mutateUser } = useUser({
-		redirectTo: destination,
-		redirectIfFound: true,
-	});
+	const { user, mutateUser } = useUser();
 
 	useEffect(() => {
-		if (user) router.push(destination);
+		if (user && user.isVerified) router.push(destination);
 	}, [router, user, destination]);
 
 	const forgotPassword = () => {
@@ -173,7 +170,7 @@ export default function Login({ destination = "/" }: { destination?: string }) {
 							</span>
 						</>
 					)}
-					{/* {user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />} */}
+					{user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />}
 				</section>
 			</main>
 		</>

From 858e29eb932a26f3ea2bcef5c03df4051ad14d0d Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 15:09:56 +0000
Subject: [PATCH 08/12] ENCOA-261

---
 src/components/Medium/StatGridItem.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Medium/StatGridItem.tsx b/src/components/Medium/StatGridItem.tsx
index bf7bddef..aa025517 100644
--- a/src/components/Medium/StatGridItem.tsx
+++ b/src/components/Medium/StatGridItem.tsx
@@ -260,9 +260,13 @@ const StatsGridItem: React.FC<StatsGridItemProps> = ({
 
 			<div className="w-full flex flex-col gap-1">
 				<div className={clsx("grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2", examNumber !== undefined && "pr-10")}>
-					{!!assignment &&
-						(assignment.released || assignment.released === undefined) &&
-						aggregatedLevels.map(({ module, level }) => <ModuleBadge key={module} module={module} level={level} />)}
+					{aggregatedLevels.map(({ module, level }) =>
+						<ModuleBadge
+							key={module}
+							module={module}
+							level={(!!assignment && (assignment.released || assignment.released === undefined)) || !assignment ? level : undefined}
+						/>
+					)}
 				</div>
 
 				{assignment && (

From 3b6836c15a3c0fdaf125572d7c54a51699f304d0 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 15:19:44 +0000
Subject: [PATCH 09/12] Groups stuff

---
 src/pages/classrooms/[id].tsx  | 72 +++++++++++++++++-----------------
 src/pages/classrooms/index.tsx |  2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/pages/classrooms/[id].tsx b/src/pages/classrooms/[id].tsx
index a12b3286..38babb7a 100644
--- a/src/pages/classrooms/[id].tsx
+++ b/src/pages/classrooms/[id].tsx
@@ -2,40 +2,40 @@
 import Layout from "@/components/High/Layout";
 import Tooltip from "@/components/Low/Tooltip";
 import { useEntityPermission } from "@/hooks/useEntityPermissions";
-import {useListSearch} from "@/hooks/useListSearch";
+import { useListSearch } from "@/hooks/useListSearch";
 import usePagination from "@/hooks/usePagination";
 import { EntityWithRoles } from "@/interfaces/entity";
-import {GroupWithUsers, User} from "@/interfaces/user";
-import {sessionOptions} from "@/lib/session";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { GroupWithUsers, User } from "@/interfaces/user";
+import { sessionOptions } from "@/lib/session";
+import { USER_TYPE_LABELS } from "@/resources/user";
 import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
-import { getEntitiesWithRoles, getEntityWithRoles } from "@/utils/entities.be";
-import {convertToUsers, getGroup} from "@/utils/groups.be";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
-import {checkAccess, doesEntityAllow, findAllowedEntities, getTypesOfUser} from "@/utils/permissions";
-import {getUserName} from "@/utils/users";
-import {getEntityUsers, getLinkedUsers, getSpecificUsers} from "@/utils/users.be";
+import { getEntityWithRoles } from "@/utils/entities.be";
+import { convertToUsers, getGroup } from "@/utils/groups.be";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { doesEntityAllow } from "@/utils/permissions";
+import { getUserName, isAdmin } from "@/utils/users";
+import { getEntityUsers, getSpecificUsers } from "@/utils/users.be";
 import axios from "axios";
 import clsx from "clsx";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
 import { capitalize } from "lodash";
 import moment from "moment";
 import Head from "next/head";
 import Link from "next/link";
-import {useRouter} from "next/router";
-import {Divider} from "primereact/divider";
-import {useEffect, useMemo, useState} from "react";
-import {BsBuilding, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsFillPersonVcardFill, BsPlus, BsStopwatchFill, BsTag, BsTrash, BsX} from "react-icons/bs";
-import {toast, ToastContainer} from "react-toastify";
+import { useRouter } from "next/router";
+import { Divider } from "primereact/divider";
+import { useEffect, useMemo, useState } from "react";
+import { BsBuilding, BsChevronLeft, BsClockFill, BsEnvelopeFill, BsFillPersonVcardFill, BsPlus, BsStopwatchFill, BsTag, BsTrash, BsX } from "react-icons/bs";
+import { toast, ToastContainer } from "react-toastify";
 
-export const getServerSideProps = withIronSessionSsr(async ({req, res, params}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }) => {
 	const user = await requestUser(req, res)
 	if (!user) return redirect("/login")
 
 	if (shouldRedirectHome(user)) return redirect("/")
 
-	const {id} = params as {id: string};
+	const { id } = params as { id: string };
 
 	const group = await getGroup(id);
 	if (!group || !group.entity) return redirect("/classrooms")
@@ -51,7 +51,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res, params})
 	const groupWithUser = convertToUsers(group, users);
 
 	return {
-		props: serialize({user, group: groupWithUser, users: linkedUsers, entity}),
+		props: serialize({ user, group: groupWithUser, users: linkedUsers.filter(x => isAdmin(user) ? true : !isAdmin(x)), entity }),
 	};
 }, sessionOptions);
 
@@ -62,7 +62,7 @@ interface Props {
 	entity: EntityWithRoles
 }
 
-export default function Home({user, group, users, entity}: Props) {
+export default function Home({ user, group, users, entity }: Props) {
 	const [isAdding, setIsAdding] = useState(false);
 	const [isLoading, setIsLoading] = useState(false);
 	const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
@@ -77,11 +77,11 @@ export default function Home({user, group, users, entity}: Props) {
 		[users, group.participants, group.admin.id, user.id],
 	);
 
-	const {rows, renderSearch} = useListSearch<User>(
+	const { rows, renderSearch } = useListSearch<User>(
 		[["name"], ["corporateInformation", "companyInformation", "name"]],
 		isAdding ? nonParticipantUsers : group.participants,
 	);
-	const {items, renderMinimal} = usePagination<User>(rows, 20);
+	const { items, renderMinimal } = usePagination<User>(rows, 20);
 
 	const router = useRouter();
 
@@ -96,7 +96,7 @@ export default function Home({user, group, users, entity}: Props) {
 		setIsLoading(true);
 
 		axios
-			.patch(`/api/groups/${group.id}`, {participants: group.participants.map((x) => x.id).filter((x) => !selectedUsers.includes(x))})
+			.patch(`/api/groups/${group.id}`, { participants: group.participants.map((x) => x.id).filter((x) => !selectedUsers.includes(x)) })
 			.then(() => {
 				toast.success("The group has been updated successfully!");
 				router.replace(router.asPath);
@@ -117,7 +117,7 @@ export default function Home({user, group, users, entity}: Props) {
 		setIsLoading(true);
 
 		axios
-			.patch(`/api/groups/${group.id}`, {participants: [...group.participants.map((x) => x.id), ...selectedUsers]})
+			.patch(`/api/groups/${group.id}`, { participants: [...group.participants.map((x) => x.id), ...selectedUsers] })
 			.then(() => {
 				toast.success("The group has been updated successfully!");
 				router.replace(router.asPath);
@@ -137,7 +137,7 @@ export default function Home({user, group, users, entity}: Props) {
 
 		setIsLoading(true);
 		axios
-			.patch(`/api/groups/${group.id}`, {name})
+			.patch(`/api/groups/${group.id}`, { name })
 			.then(() => {
 				toast.success("The classroom has been updated successfully!");
 				router.replace(router.asPath);
@@ -187,14 +187,14 @@ export default function Home({user, group, users, entity}: Props) {
 					<section className="flex flex-col gap-0">
 						<div className="flex items-center justify-between">
 							<div className="flex flex-col gap-3">
-									<div className="flex items-center gap-2">
-										<Link
-											href="/classrooms"
-											className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
-											<BsChevronLeft />
-										</Link>
-										<h2 className="font-bold text-2xl">{group.name}</h2>
-									</div>
+								<div className="flex items-center gap-2">
+									<Link
+										href="/classrooms"
+										className="text-mti-purple hover:text-mti-purple-dark transition ease-in-out duration-300 text-xl">
+										<BsChevronLeft />
+									</Link>
+									<h2 className="font-bold text-2xl">{group.name}</h2>
+								</div>
 
 								{!isAdding && (
 									<div className="flex items-center gap-2">
@@ -216,9 +216,9 @@ export default function Home({user, group, users, entity}: Props) {
 								)}
 							</div>
 							<div className="flex flex-col gap-2">
-							<span className="flex items-center gap-2">
-								<BsBuilding className="text-xl" /> {entity.label}
-							</span>
+								<span className="flex items-center gap-2">
+									<BsBuilding className="text-xl" /> {entity.label}
+								</span>
 								<span className="flex items-center gap-2">
 									<BsFillPersonVcardFill className="text-xl" /> {getUserName(group.admin)}
 								</span>
diff --git a/src/pages/classrooms/index.tsx b/src/pages/classrooms/index.tsx
index 3ffb6a18..482524bf 100644
--- a/src/pages/classrooms/index.tsx
+++ b/src/pages/classrooms/index.tsx
@@ -35,7 +35,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const groups = await getGroupsForEntities(mapBy(allowedEntities, 'id'));
 
 	const users = await getSpecificUsers(uniq(groups.flatMap((g) => [...g.participants, g.admin])));
-	const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users));
+	const groupsWithUsers: GroupWithUsers[] = groups.map((g) => convertToUsers(g, users.filter(x => isAdmin(user) ? true : !isAdmin(x))));
 
 	return {
 		props: serialize({ user, groups: groupsWithUsers, entities: allowedEntities }),

From 6bb817f9af190c07d6882bdafaf9c9c14e4f6149 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 15:31:24 +0000
Subject: [PATCH 10/12] Stuff with the new corporate

---
 src/pages/dashboard/corporate.tsx |  9 +++++----
 src/utils/users.be.ts             | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/dashboard/corporate.tsx b/src/pages/dashboard/corporate.tsx
index 7b786bc6..3aa1abc1 100644
--- a/src/pages/dashboard/corporate.tsx
+++ b/src/pages/dashboard/corporate.tsx
@@ -33,6 +33,7 @@ import {
 } from "react-icons/bs";
 import { ToastContainer } from "react-toastify";
 import { useAllowedEntities } from "@/hooks/useEntityPermissions";
+import { isAdmin } from "@/utils/users";
 
 interface Props {
 	user: User;
@@ -51,12 +52,12 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	if (!checkAccess(user, ["admin", "developer", "corporate"])) return redirect("/")
 
 	const entityIDS = mapBy(user.entities, "id") || [];
-	const entities = await getEntitiesWithRoles(entityIDS);
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
 	const users = await filterAllowedUsers(user, entities)
 
 	const userCounts = await countAllowedUsers(user, entities)
-	const assignmentsCount = await countEntitiesAssignments(entityIDS, { archived: { $ne: true } });
-	const groupsCount = await countGroupsByEntities(entityIDS);
+	const assignmentsCount = await countEntitiesAssignments(mapBy(entities, "id"), { archived: { $ne: true } });
+	const groupsCount = await countGroupsByEntities(mapBy(entities, "id"));
 
 	const stats = await getStatsByUsers(users.map((u) => u.id));
 
@@ -132,7 +133,7 @@ export default function Dashboard({ user, users, userCounts, entities, assignmen
 							<IconCard Icon={BsPersonFillGear}
 								onClick={() => router.push("/users/performance")}
 								label="Student Performance"
-								value={students.length}
+								value={userCounts.student}
 								color="purple"
 							/>
 						)}
diff --git a/src/utils/users.be.ts b/src/utils/users.be.ts
index 3e4e6ac8..92b3b249 100644
--- a/src/utils/users.be.ts
+++ b/src/utils/users.be.ts
@@ -168,10 +168,10 @@ export const countAllowedUsers = async (user: User, entities: EntityWithRoles[])
 	const corporateAllowedEntities = findAllowedEntities(user, entities, 'view_corporates')
 	const masterCorporateAllowedEntities = findAllowedEntities(user, entities, 'view_mastercorporates')
 
-	const students = await countEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" })
-	const teachers = await countEntitiesUsers(mapBy(teachersAllowedEntities, 'id'), { type: "teacher" })
-	const corporates = await countEntitiesUsers(mapBy(corporateAllowedEntities, 'id'), { type: "corporate" })
-	const masterCorporates = await countEntitiesUsers(mapBy(masterCorporateAllowedEntities, 'id'), { type: "mastercorporate" })
+	const student = await countEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" })
+	const teacher = await countEntitiesUsers(mapBy(teachersAllowedEntities, 'id'), { type: "teacher" })
+	const corporate = await countEntitiesUsers(mapBy(corporateAllowedEntities, 'id'), { type: "corporate" })
+	const masterCorporate = await countEntitiesUsers(mapBy(masterCorporateAllowedEntities, 'id'), { type: "mastercorporate" })
 
-	return { students, teachers, corporates, masterCorporates }
+	return { student, teacher, corporate, masterCorporate }
 }

From 61d1bbbe13aec3b53c230753f14dcaf12b5fcea1 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 12 Dec 2024 16:14:54 +0000
Subject: [PATCH 11/12] ENCOA-268

---
 src/components/PracticeModal.tsx | 26 ++++++++++++++++++++++++++
 src/exams/Listening.tsx          | 18 ++++++++++--------
 src/exams/Reading.tsx            | 13 +++++++++++--
 src/exams/Speaking.tsx           |  3 +++
 src/exams/Writing.tsx            |  7 +++++--
 src/hooks/useSessions.tsx        |  8 ++++----
 src/pages/(exam)/ExamPage.tsx    |  5 +++--
 src/pages/api/sessions/index.ts  | 25 ++++++++++++++-----------
 8 files changed, 76 insertions(+), 29 deletions(-)
 create mode 100644 src/components/PracticeModal.tsx

diff --git a/src/components/PracticeModal.tsx b/src/components/PracticeModal.tsx
new file mode 100644
index 00000000..82ebc779
--- /dev/null
+++ b/src/components/PracticeModal.tsx
@@ -0,0 +1,26 @@
+import { useState } from "react";
+import Button from "./Low/Button";
+import Modal from "./Modal";
+
+interface Props {
+	open?: boolean
+}
+
+export default function PracticeModal({ open }: Props) {
+	const [isOpen, setIsOpen] = useState<boolean>(open || false)
+
+	return (
+		<Modal title="Practice Questions" isOpen={isOpen} onClose={() => setIsOpen(false)}>
+			<div className="py-4 flex flex-col gap-4 items-center">
+				<span className="w-full">
+					To acquaint yourself with the question types in this section, please respond to the practice questions provided.
+					<br />
+					<b>Do note that these questions are for practice purposes only and are not graded.</b>
+					<br />
+					You may choose to skip them if you prefer.
+				</span>
+				<Button onClick={() => setIsOpen(false)} className="w-full max-w-[200px]">Understood</Button>
+			</div>
+		</Modal>
+	)
+}
diff --git a/src/exams/Listening.tsx b/src/exams/Listening.tsx
index 86721643..a7b4a277 100644
--- a/src/exams/Listening.tsx
+++ b/src/exams/Listening.tsx
@@ -14,6 +14,7 @@ import RenderAudioInstructionsPlayer from "./components/RenderAudioInstructionsP
 import RenderAudioPlayer from "./components/RenderAudioPlayer";
 import SectionNavbar from "./Navigation/SectionNavbar";
 import ProgressButtons from "./components/ProgressButtons";
+import PracticeModal from "@/components/PracticeModal";
 
 
 const Listening: React.FC<ExamProps<ListeningExam>> = ({ exam, showSolutions = false, preview = false }) => {
@@ -83,8 +84,11 @@ const Listening: React.FC<ExamProps<ListeningExam>> = ({ exam, showSolutions = f
 			userSolutions: userSolutions.find((x) => x.exercise === exercise.id)?.solutions || [],
 		}))
 
+		const hasPractice = exercises.some(e => e.isPractice)
+
 		return (
 			<div className="flex flex-col gap-4">
+				<PracticeModal open={hasPractice} />
 				{formattedExercises.map(e => showSolutions
 					? renderSolution(e)
 					: (!startNow && !showPartDivider && !isBetweenParts && !showSolutions) && renderExercise(e, exam.id, registerSolution, preview))}
@@ -93,8 +97,6 @@ const Listening: React.FC<ExamProps<ListeningExam>> = ({ exam, showSolutions = f
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [partIndex, startNow, showPartDivider, isBetweenParts, showSolutions]);
 
-
-
 	const confirmFinishModule = (keepGoing?: boolean) => {
 		if (!keepGoing) {
 			setShowBlankModal(false);
@@ -129,12 +131,12 @@ const Listening: React.FC<ExamProps<ListeningExam>> = ({ exam, showSolutions = f
 			timesListened={timesListened}
 			setShowTextModal={setShowTextModal}
 			setTimesListened={setTimesListened}
-			// eslint-disable-next-line react-hooks/exhaustive-deps
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 		/>, [partIndex, assignment, timesListened, setShowTextModal, setTimesListened])
 
-	const memoizedInstructions = useMemo(()=> 
+	const memoizedInstructions = useMemo(() =>
 		<RenderAudioInstructionsPlayer />
-	, [])
+		, [])
 
 	return (
 		<>
@@ -180,9 +182,9 @@ const Listening: React.FC<ExamProps<ListeningExam>> = ({ exam, showSolutions = f
 
 							{/* Exercise renderer */}
 							<>
-							{(!startNow && !showPartDivider) && progressButtons}
-							{renderPartExercises}
-							{(!startNow && !showPartDivider && !isBetweenParts) && progressButtons}
+								{(!startNow && !showPartDivider) && progressButtons}
+								{renderPartExercises}
+								{(!startNow && !showPartDivider && !isBetweenParts) && progressButtons}
 							</>
 						</div>
 
diff --git a/src/exams/Reading.tsx b/src/exams/Reading.tsx
index e9d7f094..95f1b28c 100644
--- a/src/exams/Reading.tsx
+++ b/src/exams/Reading.tsx
@@ -10,13 +10,14 @@ import { countExercises } from "@/utils/moduleUtils";
 import PartDivider from "./Navigation/SectionDivider";
 import ReadingPassage from "./components/ReadingPassage";
 //import ReadingPassageModal from "./components/ReadingPassageModal";
-import {calculateExerciseIndex} from "./utils/calculateExerciseIndex";
+import { calculateExerciseIndex } from "./utils/calculateExerciseIndex";
 import useExamNavigation from "./Navigation/useExamNavigation";
 import { ExamProps } from "./types";
 import useExamStore, { usePersistentExamStore } from "@/stores/exam";
 import useExamTimer from "@/hooks/useExamTimer";
 import SectionNavbar from "./Navigation/SectionNavbar";
 import ProgressButtons from "./components/ProgressButtons";
+import PracticeModal from "@/components/PracticeModal";
 
 const Reading: React.FC<ExamProps<ReadingExam>> = ({ exam, showSolutions = false, preview = false }) => {
 	const updateTimers = useExamTimer(exam.module, preview || showSolutions);
@@ -50,6 +51,13 @@ const Reading: React.FC<ExamProps<ReadingExam>> = ({ exam, showSolutions = false
 		startNow
 	} = useExamNavigation({ exam, module: "reading", showBlankModal, setShowBlankModal, showSolutions, preview, disableBetweenParts: showSolutions });
 
+	const hasPractice = useMemo(() => {
+		if (partIndex > -1 && partIndex < exam.parts.length) {
+			return exam.parts[partIndex].exercises.some(e => e.isPractice)
+		}
+		return false
+	}, [partIndex, exam.parts])
+
 	useEffect(() => {
 		if (finalizeModule || timeIsUp) {
 			updateTimers();
@@ -130,7 +138,7 @@ const Reading: React.FC<ExamProps<ReadingExam>> = ({ exam, showSolutions = false
 	const progressButtons = useMemo(() =>
 		// Do not remove the ()=> in handle next
 		<ProgressButtons handlePrevious={previousExercise} handleNext={() => nextExercise()} />
-	, [nextExercise, previousExercise]);
+		, [nextExercise, previousExercise]);
 
 	return (
 		<>
@@ -146,6 +154,7 @@ const Reading: React.FC<ExamProps<ReadingExam>> = ({ exam, showSolutions = false
 					/>
 				</div> : (
 					<>
+						<PracticeModal key={partIndex} open={hasPractice} />
 						<div className="flex flex-col h-full w-full gap-8">
 							<BlankQuestionsModal isOpen={showBlankModal} onClose={confirmFinishModule} />
 							{/*<ReadingPassageModal text={exam.parts[partIndex].text} isOpen={showTextModal} onClose={() => setShowTextModal(false)} />*/}
diff --git a/src/exams/Speaking.tsx b/src/exams/Speaking.tsx
index 4205ee87..4801a931 100644
--- a/src/exams/Speaking.tsx
+++ b/src/exams/Speaking.tsx
@@ -13,6 +13,7 @@ import useExamNavigation from "./Navigation/useExamNavigation";
 import ProgressButtons from "./components/ProgressButtons";
 import { calculateExerciseIndexSpeaking } from "./utils/calculateExerciseIndex";
 import SectionNavbar from "./Navigation/SectionNavbar";
+import PracticeModal from "@/components/PracticeModal";
 
 
 const Speaking: React.FC<ExamProps<SpeakingExam>> = ({ exam, showSolutions = false, preview = false }) => {
@@ -33,6 +34,7 @@ const Speaking: React.FC<ExamProps<SpeakingExam>> = ({ exam, showSolutions = fal
 	const { finalizeModule, timeIsUp } = flags;
 
 	const timer = useRef(exam.minTimer - timeSpentCurrentModule / 60);
+	const hasPractice = useMemo(() => exam.exercises.some(e => e.isPractice), [exam.exercises])
 
 	const {
 		nextExercise, previousExercise,
@@ -110,6 +112,7 @@ const Speaking: React.FC<ExamProps<SpeakingExam>> = ({ exam, showSolutions = fal
 					onNext={handlePartDividerClick}
 				/> : (
 					<>
+						<PracticeModal open={hasPractice} />
 						{exam.exercises.length > 1 && <SectionNavbar
 							module="speaking"
 							sectionLabel="Part"
diff --git a/src/exams/Writing.tsx b/src/exams/Writing.tsx
index 75bba4cd..39894502 100644
--- a/src/exams/Writing.tsx
+++ b/src/exams/Writing.tsx
@@ -11,6 +11,7 @@ import useExamTimer from "@/hooks/useExamTimer";
 import useExamNavigation from "./Navigation/useExamNavigation";
 import SectionNavbar from "./Navigation/SectionNavbar";
 import ProgressButtons from "./components/ProgressButtons";
+import PracticeModal from "@/components/PracticeModal";
 
 const Writing: React.FC<ExamProps<WritingExam>> = ({ exam, showSolutions = false, preview = false }) => {
 	const updateTimers = useExamTimer(exam.module, preview || showSolutions);
@@ -27,6 +28,7 @@ const Writing: React.FC<ExamProps<WritingExam>> = ({ exam, showSolutions = false
 	} = !preview ? examState : persistentExamState;
 
 	const timer = useRef(exam.minTimer - timeSpentCurrentModule / 60);
+	const hasPractice = useMemo(() => exam.exercises.some(e => e.isPractice), [exam.exercises])
 
 	const { finalizeModule, timeIsUp } = flags;
 	const { nextDisabled } = navigation;
@@ -80,8 +82,8 @@ const Writing: React.FC<ExamProps<WritingExam>> = ({ exam, showSolutions = false
 
 	const progressButtons = useMemo(() =>
 		// Do not remove the ()=> in handle next
-		<ProgressButtons handlePrevious={previousExercise} handleNext={() => nextExercise()} nextDisabled={nextDisabled}/>
-	, [nextExercise, previousExercise, nextDisabled]);
+		<ProgressButtons handlePrevious={previousExercise} handleNext={() => nextExercise()} nextDisabled={nextDisabled} />
+		, [nextExercise, previousExercise, nextDisabled]);
 
 
 	return (
@@ -96,6 +98,7 @@ const Writing: React.FC<ExamProps<WritingExam>> = ({ exam, showSolutions = false
 					onNext={handlePartDividerClick}
 				/> : (
 					<div className="flex flex-col h-full w-full gap-8 items-center">
+						<PracticeModal open={hasPractice} />
 						{exam.exercises.length > 1 && <SectionNavbar
 							module="writing"
 							sectionLabel="Part"
diff --git a/src/hooks/useSessions.tsx b/src/hooks/useSessions.tsx
index 756f08bb..2718786c 100644
--- a/src/hooks/useSessions.tsx
+++ b/src/hooks/useSessions.tsx
@@ -1,8 +1,8 @@
-import {ExamState} from "@/stores/exam/types";
+import { ExamState } from "@/stores/exam/types";
 import axios from "axios";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 
-export type Session = ExamState & {user: string; id: string; date: string};
+export type Session = ExamState & { user: string; id: string; date: string };
 
 export default function useSessions(user?: string) {
 	const [sessions, setSessions] = useState<Session[]>([]);
@@ -19,5 +19,5 @@ export default function useSessions(user?: string) {
 
 	useEffect(getData, [user]);
 
-	return {sessions, isLoading, isError, reload: getData};
+	return { sessions, isLoading, isError, reload: getData };
 }
diff --git a/src/pages/(exam)/ExamPage.tsx b/src/pages/(exam)/ExamPage.tsx
index 5cb5829f..922e7c1b 100644
--- a/src/pages/(exam)/ExamPage.tsx
+++ b/src/pages/(exam)/ExamPage.tsx
@@ -22,6 +22,7 @@ import ShortUniqueId from "short-unique-id";
 import { ExamProps } from "@/exams/types";
 import useExamStore from "@/stores/exam";
 import useEvaluationPolling from "@/hooks/useEvaluationPolling";
+import PracticeModal from "@/components/PracticeModal";
 
 interface Props {
 	page: "exams" | "exercises";
@@ -128,7 +129,7 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
 							if (exercise.type === "writing")
 								await evaluateWritingAnswer(user.id, sessionId, exercise, index + 1, userSolutions.find((x) => x.exercise === exercise.id)!);
 
-							if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking"){
+							if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking") {
 								await evaluateSpeakingAnswer(
 									user.id,
 									sessionId,
@@ -144,7 +145,7 @@ export default function ExamPage({ page, user, destination = "/", hideSidebar =
 		}
 	}, [exam, showSolutions, userSolutions, sessionId, user?.id, flags]);
 
-	useEvaluationPolling({pendingExercises, setPendingExercises});
+	useEvaluationPolling({ pendingExercises, setPendingExercises });
 
 	useEffect(() => {
 		if (flags.finalizeExam && moduleIndex !== -1) {
diff --git a/src/pages/api/sessions/index.ts b/src/pages/api/sessions/index.ts
index 267ae57b..a352ea78 100644
--- a/src/pages/api/sessions/index.ts
+++ b/src/pages/api/sessions/index.ts
@@ -1,9 +1,9 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type {NextApiRequest, NextApiResponse} from "next";
+import type { NextApiRequest, NextApiResponse } from "next";
 import client from "@/lib/mongodb";
-import {withIronSessionApiRoute} from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
-import {Session} from "@/hooks/useSessions";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { Session } from "@/hooks/useSessions";
 import moment from "moment";
 
 const db = client.db(process.env.MONGODB_DB);
@@ -17,14 +17,17 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
 async function get(req: NextApiRequest, res: NextApiResponse) {
 	if (!req.session.user) {
-		res.status(401).json({ok: false});
+		res.status(401).json({ ok: false });
 		return;
 	}
 
-	const {user} = req.query as {user?: string};
+	const { user } = req.query as { user?: string };
 
-	const q = user ? {user: user} : {};
-	const sessions = await db.collection("sessions").find<Session>(q).limit(10).toArray();
+	const q = user ? { user: user } : {};
+	const sessions = await db.collection("sessions").find<Session>({
+		...q,
+	}).limit(12).toArray();
+	console.log(sessions)
 
 	res.status(200).json(
 		sessions.filter((x) => {
@@ -37,12 +40,12 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 
 async function post(req: NextApiRequest, res: NextApiResponse) {
 	if (!req.session.user) {
-		res.status(401).json({ok: false});
+		res.status(401).json({ ok: false });
 		return;
 	}
 	const session = req.body;
 
-	await db.collection("sessions").updateOne({id: session.id}, {$set: session}, {upsert: true});
+	await db.collection("sessions").updateOne({ id: session.id }, { $set: session }, { upsert: true });
 
-	res.status(200).json({ok: true});
+	res.status(200).json({ ok: true });
 }

From f3057c675f69ac505fd8c0ccf18dfc7e8784aefc Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Fri, 13 Dec 2024 15:13:27 +0000
Subject: [PATCH 12/12] ENCOA-275

---
 src/components/Low/Select.tsx                | 28 ++++++++----
 src/pages/(admin)/CorporateGradingSystem.tsx | 41 +++++++++++++++++
 src/pages/api/grading/multiple.ts            | 48 ++++++++++++++++++++
 src/pages/dashboard/developer.tsx            |  2 +-
 4 files changed, 109 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/api/grading/multiple.ts

diff --git a/src/components/Low/Select.tsx b/src/components/Low/Select.tsx
index bdc9c68a..c666cbe8 100644
--- a/src/components/Low/Select.tsx
+++ b/src/components/Low/Select.tsx
@@ -1,6 +1,6 @@
 import clsx from "clsx";
-import {ComponentProps, useEffect, useState} from "react";
-import ReactSelect, {GroupBase, StylesConfig} from "react-select";
+import { ComponentProps, useEffect, useState } from "react";
+import ReactSelect, { GroupBase, StylesConfig } from "react-select";
 import Option from "@/interfaces/option";
 
 interface Props {
@@ -9,14 +9,23 @@ interface Props {
 	options: Option[];
 	disabled?: boolean;
 	placeholder?: string;
-	onChange: (value: Option | null) => void;
 	isClearable?: boolean;
 	styles?: StylesConfig<Option, boolean, GroupBase<Option>>;
 	className?: string;
 	label?: string;
 }
 
-export default function Select({value, defaultValue, options, placeholder, disabled, onChange, styles, isClearable, label, className}: Props) {
+interface MultiProps {
+	isMulti: true
+	onChange: (value: Option[] | null) => void
+}
+
+interface SingleProps {
+	isMulti?: false
+	onChange: (value: Option | null) => void
+}
+
+export default function Select({ value, isMulti, defaultValue, options, placeholder, disabled, onChange, styles, isClearable, label, className }: Props & (MultiProps | SingleProps)) {
 	const [target, setTarget] = useState<HTMLElement>();
 
 	useEffect(() => {
@@ -27,14 +36,15 @@ export default function Select({value, defaultValue, options, placeholder, disab
 		<div className="w-full flex flex-col gap-3">
 			{label && <label className="font-normal text-base text-mti-gray-dim">{label}</label>}
 			<ReactSelect
+				isMulti={isMulti}
 				className={
 					styles
 						? undefined
 						: clsx(
-								"placeholder:text-mti-gray-cool border-mti-gray-platinum w-full rounded-full border bg-white px-4 py-4 text-sm font-normal focus:outline-none",
-								disabled && "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
-								className,
-						  )
+							"placeholder:text-mti-gray-cool border-mti-gray-platinum w-full rounded-full border bg-white px-4 py-4 text-sm font-normal focus:outline-none",
+							disabled && "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
+							className,
+						)
 				}
 				options={options}
 				value={value}
@@ -44,7 +54,7 @@ export default function Select({value, defaultValue, options, placeholder, disab
 				defaultValue={defaultValue}
 				styles={
 					styles || {
-						menuPortal: (base) => ({...base, zIndex: 9999}),
+						menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 						control: (styles) => ({
 							...styles,
 							paddingLeft: "4px",
diff --git a/src/pages/(admin)/CorporateGradingSystem.tsx b/src/pages/(admin)/CorporateGradingSystem.tsx
index a3afe0bb..28c006b6 100644
--- a/src/pages/(admin)/CorporateGradingSystem.tsx
+++ b/src/pages/(admin)/CorporateGradingSystem.tsx
@@ -1,13 +1,16 @@
 import Button from "@/components/Low/Button";
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
+import Separator from "@/components/Low/Separator";
 import { Grading, Step } from "@/interfaces";
 import { Entity } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
 import { CEFR_STEPS, GENERAL_STEPS, IELTS_STEPS, TOFEL_STEPS } from "@/resources/grading";
+import { mapBy } from "@/utils";
 import { checkAccess } from "@/utils/permissions";
 import axios from "axios";
 import clsx from "clsx";
+import { Divider } from "primereact/divider";
 import { useEffect, useState } from "react";
 import { BsPlusCircle, BsTrash } from "react-icons/bs";
 import { toast } from "react-toastify";
@@ -36,6 +39,7 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
 	const [entity, setEntity] = useState(entitiesGrading[0]?.entity || undefined)
 	const [isLoading, setIsLoading] = useState(false);
 	const [steps, setSteps] = useState<Step[]>([]);
+	const [otherEntities, setOtherEntities] = useState<string[]>([])
 
 	useEffect(() => {
 		if (entity) {
@@ -63,6 +67,27 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
 			.finally(() => setIsLoading(false));
 	};
 
+	const applyToOtherEntities = () => {
+		if (!steps.every((x) => x.min < x.max)) return toast.error("One of your steps has a minimum threshold inferior to its superior threshold.");
+		if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
+		if (
+			steps.reduce((acc, curr) => {
+				return acc - (curr.max - curr.min + 1);
+			}, 100) > 0
+		)
+			return toast.error("There seems to be an open interval in your steps.");
+
+		if (otherEntities.length === 0) return toast.error("Select at least one entity")
+
+		setIsLoading(true);
+		axios
+			.post("/api/grading/multiple", { user: user.id, entities: otherEntities, steps })
+			.then(() => toast.success("Your grading system has been saved!"))
+			.then(mutate)
+			.catch(() => toast.error("Something went wrong, please try again later"))
+			.finally(() => setIsLoading(false));
+	};
+
 	return (
 		<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
 			<label className="font-normal text-base text-mti-gray-dim">Grading System</label>
@@ -76,6 +101,22 @@ export default function CorporateGradingSystem({ user, entitiesGrading = [], ent
 				/>
 			</div>
 
+			{entities.length > 1 && (
+				<>
+					<Separator />
+					<label className="font-normal text-base text-mti-gray-dim">Apply this grading system to other entities</label>
+					<Select
+						options={entities.map((e) => ({ value: e.id, label: e.label }))}
+						onChange={(e) => !e ? setOtherEntities([]) : setOtherEntities(e.map(o => o.value!))}
+						isMulti
+					/>
+					<Button onClick={applyToOtherEntities} isLoading={isLoading} disabled={isLoading || otherEntities.length === 0} variant="outline">
+						Apply to {otherEntities.length} other entities
+					</Button>
+					<Separator />
+				</>
+			)}
+
 			<label className="font-normal text-base text-mti-gray-dim">Preset Systems</label>
 			<div className="grid grid-cols-4 gap-4">
 				<Button variant="outline" onClick={() => setSteps(CEFR_STEPS)}>
diff --git a/src/pages/api/grading/multiple.ts b/src/pages/api/grading/multiple.ts
new file mode 100644
index 00000000..f53af6e9
--- /dev/null
+++ b/src/pages/api/grading/multiple.ts
@@ -0,0 +1,48 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from "next";
+import { app } from "@/firebase";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { CorporateUser, Group } from "@/interfaces/user";
+import { Discount, Package } from "@/interfaces/paypal";
+import { v4 } from "uuid";
+import { checkAccess } from "@/utils/permissions";
+import { CEFR_STEPS } from "@/resources/grading";
+import { getCorporateUser } from "@/resources/user";
+import { getUserCorporate } from "@/utils/groups.be";
+import { Grading, Step } from "@/interfaces";
+import { getGroupsForUser } from "@/utils/groups.be";
+import { uniq } from "lodash";
+import { getSpecificUsers, getUser } from "@/utils/users.be";
+import client from "@/lib/mongodb";
+import { getGradingSystemByEntity } from "@/utils/grading.be";
+
+const db = client.db(process.env.MONGODB_DB);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+	if (req.method === "POST") await post(req, res);
+}
+
+async function post(req: NextApiRequest, res: NextApiResponse) {
+	if (!req.session.user) {
+		res.status(401).json({ ok: false });
+		return;
+	}
+
+	if (!checkAccess(req.session.user, ["admin", "developer", "mastercorporate", "corporate"]))
+		return res.status(403).json({
+			ok: false,
+			reason: "You do not have permission to create a new grading system",
+		});
+
+	const body = req.body as {
+		entities: string[]
+		steps: Step[];
+	};
+
+	await db.collection("grading").updateMany({ entity: { $in: body.entities } }, { $set: { steps: body.steps } }, { upsert: true });
+
+	res.status(200).json({ ok: true });
+}
diff --git a/src/pages/dashboard/developer.tsx b/src/pages/dashboard/developer.tsx
index 2e53d579..9d908f4c 100644
--- a/src/pages/dashboard/developer.tsx
+++ b/src/pages/dashboard/developer.tsx
@@ -149,7 +149,7 @@ export default function Dashboard({
 					<IconCard Icon={BsPersonFillGear}
 						onClick={() => router.push("/users/performance")}
 						label="Student Performance"
-						value={students.length}
+						value={usersCount.student}
 						color="purple"
 					/>
 					<IconCard