From 1ca384700a4b865eb8cdc4d95805a19f8bfcda9f Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Wed, 26 Feb 2025 21:04:08 +0100
Subject: [PATCH] Racepicks: Refactor current racepick acquisition + use new
 fetchers

---
 src/routes/racepicks/+page.svelte | 18 +++++-------------
 src/routes/racepicks/+page.ts     |  6 ++++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/routes/racepicks/+page.svelte b/src/routes/racepicks/+page.svelte
index 4373c29..65db54a 100644
--- a/src/routes/racepicks/+page.svelte
+++ b/src/routes/racepicks/+page.svelte
@@ -25,15 +25,6 @@
 
   let { data }: { data: PageData } = $props();
 
-  const racepick: Promise<RacePick | undefined> = $derived.by(
-    async () =>
-      (await data.racepicks).filter(
-        (racepick: RacePick) =>
-          racepick.expand.user.username === data.user?.username &&
-          racepick.race === data.currentrace?.id,
-      )[0] ?? undefined,
-  );
-
   const modalStore: ModalStore = getModalStore();
   const racepick_handler = async (event: Event) => {
     const modalSettings: ModalSettings = {
@@ -41,7 +32,7 @@
       component: "racePickCard",
       meta: {
         data,
-        racepick: await racepick,
+        racepick: data.racepick,
       },
     };
 
@@ -131,12 +122,12 @@
 
           <!-- Only show the userguess if signed in -->
           {#if data.user}
-            {#await Promise.all([data.drivers, racepick]) then [drivers, pick]}
+            {#await data.drivers then drivers}
               <div class="mt-2 flex gap-2">
                 <div class="card w-full min-w-40 p-2 pb-0 shadow">
                   <h1 class="mb-2 text-nowrap font-bold">Your P{data.currentrace.pxx} Pick:</h1>
                   <LazyImage
-                    src={get_by_value(drivers, "id", pick?.pxx ?? "")?.headshot_url ??
+                    src={get_by_value(drivers, "id", data.racepick?.pxx ?? "")?.headshot_url ??
                       get_driver_headshot_template(data.graphics)}
                     imgwidth={DRIVER_HEADSHOT_WIDTH}
                     imgheight={DRIVER_HEADSHOT_HEIGHT}
@@ -149,7 +140,7 @@
                 <div class="card w-full min-w-40 p-2 pb-0 shadow">
                   <h1 class="mb-2 text-nowrap font-bold">Your DNF Pick:</h1>
                   <LazyImage
-                    src={get_by_value(drivers, "id", pick?.dnf ?? "")?.headshot_url ??
+                    src={get_by_value(drivers, "id", data.racepick?.dnf ?? "")?.headshot_url ??
                       get_driver_headshot_template(data.graphics)}
                     imgwidth={DRIVER_HEADSHOT_WIDTH}
                     imgheight={DRIVER_HEADSHOT_HEIGHT}
@@ -207,6 +198,7 @@
 {/if}
 
 <!-- The fookin table -->
+<!-- TODO: Hide this thing if no picks... -->
 <div class="flex">
   <div>
     <!-- Points color coding legend -->
diff --git a/src/routes/racepicks/+page.ts b/src/routes/racepicks/+page.ts
index 00b945f..9123f06 100644
--- a/src/routes/racepicks/+page.ts
+++ b/src/routes/racepicks/+page.ts
@@ -2,10 +2,11 @@ import {
   fetch_currentpickedusers,
   fetch_currentrace,
   fetch_drivers,
-  fetch_racepicks,
+  fetch_visibleracepicks,
   fetch_raceresults,
   fetch_races,
   fetch_substitutions,
+  fetch_currentracepick,
 } from "$lib/fetch";
 import type { PageLoad } from "../$types";
 
@@ -13,7 +14,7 @@ export const load: PageLoad = async ({ fetch, depends }) => {
   depends("data:racepicks", "data:users", "data:raceresults", "data:drivers", "data:races");
 
   return {
-    racepicks: fetch_racepicks(fetch),
+    racepicks: fetch_visibleracepicks(fetch),
     currentpickedusers: fetch_currentpickedusers(fetch),
     raceresults: fetch_raceresults(fetch),
     drivers: fetch_drivers(fetch),
@@ -21,5 +22,6 @@ export const load: PageLoad = async ({ fetch, depends }) => {
     substitutions: fetch_substitutions(fetch),
 
     currentrace: await fetch_currentrace(fetch),
+    racepick: await fetch_currentracepick(fetch),
   };
 };