Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

Make past leaderboard actually build static files + add logic to not use redis for past overall leaderboard (#1637)

Amanuel Odichod3e5a543f6a8
diff --git a/apps/aot/src/app/events/2023/leaderboard/[day]/layout.tsx b/apps/aot/src/app/events/2023/leaderboard/[day]/layout.tsx
index b96782ab..56a3a1b1 100644
--- a/apps/aot/src/app/events/2023/leaderboard/[day]/layout.tsx
+++ b/apps/aot/src/app/events/2023/leaderboard/[day]/layout.tsx
@@ -1,7 +1,14 @@
import { isValidAdventDay } from '~/utils/time-utils';
import { notFound } from 'next/navigation';
import AdventDaysRow from '../../../[year]/leaderboard/_components/advent-days-row';
-import { YEAR } from '../../date_constants';
+import { YEAR, DAY } from '../../date_constants';
+
+export const dynamic = 'force-static';
+export const dynamicParams = false;
+
+export async function generateStaticParams() {
+ return Array.from({ length: DAY }).map((_, index) => ({ day: (index + 1).toString() }));
+}
export default function DailyLeaderboardLayout({
params,
diff --git a/apps/aot/src/app/events/2023/leaderboard/[day]/page.tsx b/apps/aot/src/app/events/2023/leaderboard/[day]/page.tsx
index a8129387..6b57c183 100644
--- a/apps/aot/src/app/events/2023/leaderboard/[day]/page.tsx
+++ b/apps/aot/src/app/events/2023/leaderboard/[day]/page.tsx
@@ -1,9 +1,5 @@
import DailyLeaderboard from '../../../[year]/leaderboard/_components/daily-leaderboard';
-import { YEAR, DAY } from '../../date_constants';
-
-export async function generateStaticParams() {
- return Array.from({ length: DAY }).map((_, index) => ({ day: (index + 1).toString() }));
-}
+import { YEAR } from '../../date_constants';
export default function Page({ params: { day } }: { params: { day: string } }) {
return <DailyLeaderboard adventYear={YEAR.toString()} adventDay={day} />;
diff --git a/apps/aot/src/app/events/2023/leaderboard/layout.tsx b/apps/aot/src/app/events/2023/leaderboard/layout.tsx
index f2319e20..dcd91fbb 100644
--- a/apps/aot/src/app/events/2023/leaderboard/layout.tsx
+++ b/apps/aot/src/app/events/2023/leaderboard/layout.tsx
@@ -4,6 +4,8 @@ import { getAllFlags } from '~/utils/feature-flag';
import { ComingSoon } from '../../../coming-soon';
import { YEAR } from '../date_constants';
+export const dynamic = 'force-static';
+
export default async function LeaderboardLayout({ children }: { children: React.ReactNode }) {
const { enableAotPlatform } = await getAllFlags();
diff --git a/apps/aot/src/app/events/2023/leaderboard/page.tsx b/apps/aot/src/app/events/2023/leaderboard/page.tsx
index ed3f2ce8..1de72e15 100644
--- a/apps/aot/src/app/events/2023/leaderboard/page.tsx
+++ b/apps/aot/src/app/events/2023/leaderboard/page.tsx
@@ -20,7 +20,7 @@ export default async function LeaderboardPage() {
return (
<>
<AdventDaysRow year={YEAR} />
- <OverallLeaderboard year={YEAR} />
+ <OverallLeaderboard isPast year={YEAR} />
</>
);
}
diff --git a/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx b/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
index 31c49238..f08f21df 100644
--- a/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
+++ b/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
@@ -73,6 +73,7 @@ export const dailyLeaderboardColumns = [
*/
const formatDate = (date: Date) => {
return new Intl.DateTimeFormat('en-US', {
+ timeZone: 'America/New_York',
month: 'short',
day: '2-digit',
hour: '2-digit',
diff --git a/apps/aot/src/app/events/[year]/leaderboard/_components/daily-leaderboard.tsx b/apps/aot/src/app/events/[year]/leaderboard/_components/daily-leaderboard.tsx
index 303ee40c..1a53dd40 100644
--- a/apps/aot/src/app/events/[year]/leaderboard/_components/daily-leaderboard.tsx
+++ b/apps/aot/src/app/events/[year]/leaderboard/_components/daily-leaderboard.tsx
@@ -14,6 +14,9 @@ const getFirst100SubmissionsRanked = async (adventYear: string, adventDay: strin
where: {
challengeId,
isSuccessful: true,
+ user: {
+ status: 'ACTIVE',
+ },
},
distinct: ['userId'],
orderBy: {
diff --git a/apps/aot/src/app/events/[year]/leaderboard/_components/overall-leaderboard.tsx b/apps/aot/src/app/events/[year]/leaderboard/_components/overall-leaderboard.tsx
index 3e6be7b2..2deb0e8b 100644
--- a/apps/aot/src/app/events/[year]/leaderboard/_components/overall-leaderboard.tsx
+++ b/apps/aot/src/app/events/[year]/leaderboard/_components/overall-leaderboard.tsx
@@ -8,11 +8,13 @@ import { getAotChallengeIdsSoFar } from '../getAotChallengeIds';
export const dynamic = 'force-dynamic';
-async function getOverallLeaderboard(year: number) {
- const cachedRanking = await redisClient.get('aot-overall-leaderboard');
+async function getOverallLeaderboard(year: number, isPast: boolean) {
+ if (!isPast) {
+ const cachedRanking = await redisClient.get('aot-overall-leaderboard');
- if (cachedRanking) {
- return JSON.parse(cachedRanking) as OverallLeaderboardEntry[];
+ if (cachedRanking) {
+ return JSON.parse(cachedRanking) as OverallLeaderboardEntry[];
+ }
}
const challengeIdsSoFar = await getAotChallengeIdsSoFar(year);
@@ -41,6 +43,7 @@ async function getOverallLeaderboard(year: number) {
) AS RankedSubmissions
WHERE \`rank\` <= ${LEADERBOARD_RANKING_LIMIT}
) r ON u.id = r.userId
+ WHERE u.status = 'ACTIVE'
GROUP BY r.userId, u.name, u.image
ORDER BY totalPoints DESC
LIMIT ${LEADERBOARD_RANKING_LIMIT};`;
@@ -59,7 +62,7 @@ async function getOverallLeaderboard(year: number) {
]);
// Once we have top 100 for today, we can cache until midnight (next challenge release)
- if (Number(numberOfSubmissionsToday) >= LEADERBOARD_RANKING_LIMIT) {
+ if (!isPast && Number(numberOfSubmissionsToday) >= LEADERBOARD_RANKING_LIMIT) {
await redisClient.set(
'aot-overall-leaderboard',
JSON.stringify(ranking, (_, value) => (typeof value === 'bigint' ? value.toString() : value)),
@@ -70,8 +73,14 @@ async function getOverallLeaderboard(year: number) {
return ranking;
}
-export default async function OverallLeaderboard({ year }: { year: number }) {
- const top100Ranking = await getOverallLeaderboard(year);
+export default async function OverallLeaderboard({
+ year,
+ isPast = false,
+}: {
+ year: number;
+ isPast?: boolean;
+}) {
+ const top100Ranking = await getOverallLeaderboard(year, isPast);
return (
<div className="p-4">
diff --git a/apps/aot/src/components/navigation/index.tsx b/apps/aot/src/components/navigation/index.tsx
index 587228c9..4d246416 100644
--- a/apps/aot/src/components/navigation/index.tsx
+++ b/apps/aot/src/components/navigation/index.tsx
@@ -26,7 +26,6 @@ export async function Navigation() {
{featureFlags.enableAotPlatform ? (
<>
<NavLink title="About" href="/about" />
- <NavLink title="Leaderboard" href="/events/2024/leaderboard" />
<NavLink title="Events" href="/events" />
</>
) : null}