Merge pull request #33 from tuckergordon/lottery

Lottery

web/src/lib/components/LotteryTable.ts

@@ -0,0 +1,45 @@
+import type { Standing, Standings } from '$lib/models/Standings.model';
+
+// original team: current team
+const TRADED_FIRSTS = {
+  devspiel: 'tgordon18',
+  benstone099: 'nachocamacho',
+  tgordon18: 'BrianEvans',
+  julianpdx: 'ConQD',
+  Crams_Clams: 'nachocamacho',
+  DanBrownOnTrail: 'jseibert',
+} as { [key: string]: string };
+
+// TODO: figure out a way to render a svelte component instead of this
+// weird JSX-like approach
+export function LotteryTable(standings: Standings, tradedPicks = TRADED_FIRSTS, nPicks = 6) {
+  const lottoStandings = standings.slice(-nPicks).sort((a, b) => a.maxPf - b.maxPf);
+
+  const row = (team: Standing, i: number) =>
+    (i === 6 ? `<tr><td></td></tr>` : '') +
+    `<tr>
+      <td>
+        ${i + 1}
+      </td>
+      <td>
+        ${team.userName in tradedPicks ? `${tradedPicks[team.userName]} (via ${team.userName})` : team.userName}
+      </td>
+      <td>
+        ${team.maxPf}
+      </td>
+    </tr>`;
+  return `
+    <table>
+      <thead>
+        <tr>
+          <th></th>
+          <th>Name</th>
+          <th>Max PF</th>
+        </tr>
+      </thead>
+      <tbody>
+        ${lottoStandings.map(row).join('')}
+      </tbody>
+    </table>
+  `;
+}

web/src/lib/components/StandingsTable.ts

@@ -0,0 +1,35 @@
+import type { Standing, Standings } from '$lib/models/Standings.model';
+
+// TODO: figure out a way to render a svelte component instead of this
+// weird JSX-like approach
+export function StandingsTable(standings: Standings) {
+  const row = (team: Standing, i: number) =>
+    (i === 6 ? `<tr><td></td></tr>` : '') +
+    `<tr>
+      <td>
+        ${i + 1}
+      </td>
+      <td>
+        ${team.teamName}
+      </td>
+      <td>
+        ${team.wins}-${team.losses}
+      </td>
+    </tr>`;
+  return `
+    <table>
+      <thead>
+        <tr>
+          <th></th>
+          <th>Name</th>
+          <th>Record</th>
+          <!-- <th>PF</th>
+          <th>PA</th> -->
+        </tr>
+      </thead>
+      <tbody>
+        ${standings.map(row).join('')}
+      </tbody>
+    </table>
+  `;
+}

web/src/lib/db/supabase/standings.ts

@@ -0,0 +1,55 @@
+import type { Standing } from '$lib/models/Standings.model';
+import { supabase } from './supabase-client';
+
+// TODO: type the return value
+export async function getStandings(leagueId: bigint, startWeek: number = 1, endWeek: number = 17) {
+  const { data, error } = await supabase
+    .from('schedule')
+    .select(
+      `
+      win_h2h:win_h2h.sum(), 
+      win_median: win_median.sum(),
+      points_for: points_for.sum(),
+      points_against: points_against.sum(),
+      max_points_for: max_points_for.sum(),
+      teams(
+        name, 
+        user_id, 
+        users(
+          name
+        )
+      )
+      `,
+    )
+    .eq('league_id', leagueId)
+    .gte('week', startWeek)
+    .lte('week', endWeek);
+
+  if (error) {
+    console.error('Error fetching standings:', error);
+    return null;
+  }
+
+  const totalWeeks = endWeek - startWeek + 1;
+
+  return data
+    .map((standing) => {
+      const wins = standing.win_h2h + standing.win_median;
+      const losses = totalWeeks * 2 - wins;
+
+      return {
+        // @ts-expect-error - teams is not typed correctly yet
+        teamName: standing.teams.name,
+        // @ts-expect-error - teams is not typed correctly yet
+        userId: standing.teams.user_id,
+        // @ts-expect-error - teams is not typed correctly yet
+        userName: standing.teams.users.name,
+        wins,
+        losses,
+        pf: standing.points_for,
+        pa: standing.points_against,
+        maxPf: standing.max_points_for,
+      } as Standing;
+    })
+    .sort((a, b) => b.wins - a.wins);
+}

web/src/lib/models/Standings.model.ts

@@ -2,6 +2,8 @@ export type Standings = Standing[];
 
 export interface Standing {
   teamName: string;
+  userId: string;
+  userName: string;
   wins: number;
   losses: number;
   pf: number;

web/src/routes/[leagueId]/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from '$app/stores';
-  import Standings from '$lib/components/Standings.svelte';
+  import { StandingsTable } from '$lib/components/StandingsTable.js';
 
   let { data } = $props();
   const { leagueMetadata, posts, standings } = data;
@@ -20,7 +20,8 @@
   <section class="justify-between md:flex">
     <div>
       <h2>Standings</h2>
-      <Standings {standings} />
+      <!-- eslint-disable-next-line svelte/no-at-html-tags -->
+      {@html StandingsTable(standings)}
     </div>
 
     <ul class="posts mt-0">

web/src/routes/api/leagues/[leagueId]/posts/[year]/[slug]/+server.ts

@@ -1,5 +1,6 @@
+import { LotteryTable } from '$lib/components/LotteryTable.js';
+import { StandingsTable } from '$lib/components/StandingsTable.js';
 import { getPost } from '$lib/db/contentful/posts';
-import type { Standing, Standings } from '$lib/models/Standings.model';
 import { documentToHtmlString, type RenderNode } from '@contentful/rich-text-html-renderer';
 import { BLOCKS } from '@contentful/rich-text-types';
 import { json } from '@sveltejs/kit';
@@ -12,40 +13,6 @@ function extractWeekNumber(slug: string): number | null {
   return null;
 }
 
-// TODO: figure out a way to render a svelte component instead of this
-// weird JSX-like approach
-function getStandingsHtml(standings: Standings) {
-  const row = (team: Standing, i: number) =>
-    (i === 6 ? `<tr><td></td></tr>` : '') +
-    `<tr>
-      <td>
-        ${i + 1}
-      </td>
-      <td>
-        ${team.teamName}
-      </td>
-      <td>
-        ${team.wins}-${team.losses}
-      </td>
-    </tr>`;
-  return `
-    <table>
-      <thead>
-        <tr>
-          <th></th>
-          <th>Name</th>
-          <th>Record</th>
-          <!-- <th>PF</th>
-          <th>PA</th> -->
-        </tr>
-      </thead>
-      <tbody>
-        ${standings.map(row).join('')}
-      </tbody>
-    </table>
-  `;
-}
-
 export async function GET({ params, fetch }) {
   // Technically could pull this out of the post, but then we wouldn't be able
   // to query supabase until contentful responded
@@ -82,7 +49,9 @@ export async function GET({ params, fetch }) {
     [BLOCKS.EMBEDDED_ENTRY]: (node) => {
       switch (node.data.target.fields.type) {
         case 'standings':
-          return getStandingsHtml(standings);
+          return StandingsTable(standings);
+        case 'lottery':
+          return LotteryTable(standings);
         default:
           return '';
       }

web/src/routes/api/leagues/[leagueId]/standings/+server.ts

@@ -1,49 +1,6 @@
-import { supabase } from '$lib/db/supabase/supabase-client';
+import { getStandings } from '$lib/db/supabase/standings';
 import { error, json } from '@sveltejs/kit';
 
-// TODO: type the return value
-async function getStandings(leagueId: bigint, startWeek: number = 1, endWeek: number = 17) {
-  const { data, error } = await supabase
-    .from('schedule')
-    .select(
-      `
-      win_h2h:win_h2h.sum(), 
-      win_median: win_median.sum(),
-      points_for: points_for.sum(),
-      points_against: points_against.sum(),
-      max_points_for: max_points_for.sum(),
-      teams!inner(name)
-      `,
-    )
-    .eq('league_id', leagueId)
-    .gte('week', startWeek)
-    .lte('week', endWeek);
-
-  if (error) {
-    console.error('Error fetching standings:', error);
-    return null;
-  }
-
-  const totalWeeks = endWeek - startWeek + 1;
-
-  return data
-    .map((standing) => {
-      const wins = standing.win_h2h + standing.win_median;
-      const losses = totalWeeks * 2 - wins;
-
-      return {
-        // @ts-expect-error - teams is not typed correctly yet
-        teamName: standing.teams.name,
-        wins,
-        losses,
-        pf: standing.points_for,
-        pa: standing.points_against,
-        maxPf: standing.max_points_for,
-      };
-    })
-    .sort((a, b) => b.wins - a.wins);
-}
-
 export async function GET({ params, url }) {
   const leagueId = BigInt(params.leagueId);
   const startWeek = parseInt(url.searchParams.get('startWk') ?? '1');