Merge pull request #72 from ItKlubBozoLagan/dev

Add email domain in contest participants page
ItKlubBozoLagan · Nov 11, 2024 · 5a5ab70 · 5a5ab70
2 parents cadab69 + da0c70e
commit 5a5ab70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apps/backend/src/routes/contest/ContestHandler.ts b/apps/backend/src/routes/contest/ContestHandler.ts
@@ -460,12 +460,13 @@ ContestHandler.get("/:contest_id/leaderboard", async (req, res) => {
         res,
         StatusCodes.OK,
         contestMembers
-            .map((it) => ({
+            .map((it, _, __, user = users.find((user) => user.id === it.user_id)!) => ({
                 ...it,
-                ...R.pick(users.find((user) => user.id === it.user_id)!, ["full_name"]),
+                ...R.pick(user, ["full_name"]),
                 ...R.pick(organisationMembers.find((member) => member.user_id === it.user_id)!, [
                     "elo",
                 ]),
+                email_domain: user.email.split("@").at(-1),
             }))
             .map((it) => ({ ...it, score: it.score ?? {} }))
     );

diff --git a/apps/frontend/src/pages/management/contest/participants/ContestParticipantsPage.tsx b/apps/frontend/src/pages/management/contest/participants/ContestParticipantsPage.tsx
@@ -97,7 +97,7 @@ const MemberBox: FC<MemberBoxProperties> = ({ member, admin }) => {
                         {t("account.breadcrumbs.creator")}
                     </Breadcrumb>
                 )}
-                <DomainBreadcrumb email={member.email} />
+                <DomainBreadcrumb email={member.email_domain} />
                 <RankBreadcrumb specificElo={member.elo} />
                 {member.full_name}
             </div>

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