fix: show correct week

Author: debater-coder

apps/client/src/routes/Main/Home/DaySelect.tsx

@@ -11,6 +11,7 @@ import DatePicker from "../../../components/DatePicker";
 import { useRef } from "react";
 import { DateTime } from "luxon";
 import { useDtt } from "../../../services/sbhsApi/useDtt";
+import { useDay } from "../../../services/sbhsApi/useDay";
 
 export default function DaySelect({
   selected,
@@ -20,7 +21,9 @@ export default function DaySelect({
   setSelected: (date: Date) => void;
 }) {
   const initRef = useRef<HTMLButtonElement>(null);
+  const date = selected ? DateTime.fromJSDate(selected).toISODate() : undefined;
   const { data: dtt } = useDtt();
+  const { data: day } = useDay(date, date);
 
   return (
     <Popover closeOnBlur={false} initialFocusRef={initRef}>
@@ -51,7 +54,9 @@ export default function DaySelect({
                       year: "numeric",
                       month: "numeric",
                       day: "numeric",
-                    })} Wk 7`
+                    })} Wk ${
+                      date ? `${day?.[date]?.week}${day?.[date]?.weekType}` : ""
+                    }`
                   : "Select date"}
               </Button>
             </PopoverTrigger>

apps/client/src/services/sbhsApi/schemas.ts

@@ -290,3 +290,13 @@ export const sbhsKey =
   (endpoint: SbhsApiEndpoint) =>
   <T extends Record<string, string>>(options?: T) =>
     [`/sbhs/${endpoint}`, options] as const;
+
+export const daySchema = z.record(
+  z.object({
+    date: z.coerce.string(),
+    term: z.coerce.string(),
+    week: z.coerce.string(),
+    weekType: z.coerce.string(),
+    dayNumber: z.coerce.string(),
+  })
+);

apps/client/src/services/sbhsApi/useDay.tsx

@@ -0,0 +1,37 @@
+import { useQuery } from "@tanstack/react-query";
+import { authActions } from "../../stores/auth";
+import { daySchema, sbhsKey } from "./schemas";
+
+const queryFn = async (from?: string, to?: string) => {
+  return daySchema.parse(
+    await authActions.fetchAuthenticated(
+      "calendar/days.json",
+      from && to
+        ? {
+            from,
+            to,
+          }
+        : undefined
+    )
+  );
+};
+
+const getQueryKey = sbhsKey("calendar/days.json");
+
+export const useDay = (from?: string, to?: string) => {
+  return useQuery({
+    queryKey: getQueryKey(
+      from && to
+        ? {
+            from,
+            to,
+          }
+        : undefined
+    ),
+    queryFn: () => queryFn(from, to),
+    enabled: !!from && !!to,
+  });
+};
+
+useDay.getQueryKey = getQueryKey;
+useDay.queryFn = queryFn;