Merge pull request #73 from ItKlubBozoLagan/dev

Add edu email domain in contest participants page
ItKlubBozoLagan · Nov 11, 2024 · 661a64d · 661a64d
2 parents 5a5ab70 + 97c613d
commit 661a64d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/apps/backend/src/routes/organisation/OrganisationMemberHandler.ts b/apps/backend/src/routes/organisation/OrganisationMemberHandler.ts
@@ -34,14 +34,25 @@ OrganisationMemberHandler.get("/", async (req, res) => {
         id: eqIn(...organisationMembers.map((organisationMember) => organisationMember.user_id)),
     });
 
+    const eduUsers = await Database.selectFrom("edu_users", "*", {
+        id: eqIn(...organisationMembers.map((organisationMember) => organisationMember.user_id)),
+    });
+
     return respond(
         res,
         StatusCodes.OK,
         organisationMembers.map(
-            (it, _, __, user = users.find((user) => user.id === it.user_id)!) => ({
+            (
+                it,
+                _,
+                __,
+                user = users.find((user) => user.id === it.user_id)!,
+                eduUser = eduUsers.find((user) => user.id === it.user_id)
+            ) => ({
                 ...it,
                 ...R.pick(user, ["full_name"]),
                 email_domain: user.email.split("@").at(-1),
+                edu_mail_domain: eduUser?.email.split("@").at(-1),
             })
         )
     );

diff --git a/apps/frontend/src/pages/management/contest/participants/ContestParticipantsPage.tsx b/apps/frontend/src/pages/management/contest/participants/ContestParticipantsPage.tsx
@@ -98,6 +98,11 @@ const MemberBox: FC<MemberBoxProperties> = ({ member, admin }) => {
                     </Breadcrumb>
                 )}
                 <DomainBreadcrumb email={member.email_domain} />
+                {member.edu_mail_domain &&
+                    member.email_domain.trim().toLowerCase() !==
+                        member.edu_mail_domain.trim().toLowerCase() && (
+                        <DomainBreadcrumb email={member.edu_mail_domain} />
+                    )}
                 <RankBreadcrumb specificElo={member.elo} />
                 {member.full_name}
             </div>

diff --git a/packages/models/src/ContestMember.ts b/packages/models/src/ContestMember.ts
@@ -19,5 +19,6 @@ export type ContestMember = ContestMemberV2;
 export type ContestMemberWithInfo = ContestMember & {
     full_name: string;
     email_domain: string;
+    edu_mail_domain?: string;
     elo: number;
 };