fix: 🐛 correct data fetching types

icssc · May 28, 2024 · df0dd59 · df0dd59
1 parent 30226ac
commit df0dd59
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
@@ -257,3 +257,8 @@ export type MeetingInsertSchema = typeof meetings.$inferInsert;
 export type MeetingSelectSchema = typeof meetings.$inferSelect;
 export type MeetingDateInsertSchema = typeof meetingDates.$inferInsert;
 export type MeetingDateSelectSchema = typeof meetingDates.$inferSelect;
+
+export type AvailabilityMeetingDateJoinSchema = {
+  availabilities: typeof availabilities.$inferSelect;
+  meeting_dates: typeof meetingDates.$inferSelect;
+};
diff --git a/src/lib/stores/availabilityStores.ts b/src/lib/stores/availabilityStores.ts
@@ -105,6 +105,6 @@ export const isEditingAvailability = writable<boolean>(false);
 export const isStateUnsaved = writable<boolean>(false);
 
 export const guestSession = writable<GuestSession>({
-  guestName: "",
+  guestName: "awaw",
   meetingId: "",
 });
diff --git a/src/lib/utils/availability.ts b/src/lib/utils/availability.ts
@@ -2,7 +2,7 @@ import type { PageData } from "../../routes/availability/[slug]/$types";
 
 import { ZotDate } from "./ZotDate";
 
-import type { AvailabilityInsertSchema } from "$lib/db/schema";
+import type { AvailabilityMeetingDateJoinSchema } from "$lib/db/schema";
 import type { GuestSession } from "$lib/types/availability";
 
 export async function getGuestAvailability(guestSession: GuestSession) {
@@ -14,14 +14,14 @@ export async function getGuestAvailability(guestSession: GuestSession) {
     },
   });
 
-  const guestData: AvailabilityInsertSchema[] = await response.json();
+  const guestData: AvailabilityMeetingDateJoinSchema[] = await response.json();
 
   return guestData?.map(
     (availability) =>
       new ZotDate(
-        new Date(availability.day),
+        new Date(availability.meeting_dates.date),
         false,
-        Array.from(availability.availability_string).map((char) => char === "1"),
+        Array.from(availability.availabilities.availability_string).map((char) => char === "1"),
       ),
   );
 }
@@ -31,9 +31,9 @@ export const getUserAvailability = (data: PageData) => {
     return data.availability?.map(
       (availability) =>
         new ZotDate(
-          new Date(availability.day),
+          new Date(availability.meeting_dates.date),
           false,
-          Array.from(availability.availability_string).map((char) => char === "1"),
+          Array.from(availability.availabilities.availability_string).map((char) => char === "1"),
         ),
     );
   }

diff --git a/src/routes/availability/[slug]/+page.server.ts b/src/routes/availability/[slug]/+page.server.ts
@@ -13,6 +13,7 @@ import {
   meetingDates,
   membersInMeeting,
   type AvailabilityInsertSchema,
+  type AvailabilityMeetingDateJoinSchema,
   type MeetingDateSelectSchema,
 } from "$lib/db/schema";
 import type { ZotDate } from "$lib/utils/ZotDate";
@@ -31,7 +32,10 @@ export const load: PageServerLoad = (async ({ locals, params }) => {
   };
 }) satisfies PageServerLoad;
 
-const getAvailability = async (user: User, meetingId: string | undefined) => {
+const getAvailability = async (
+  user: User,
+  meetingId: string | undefined,
+): Promise<AvailabilityMeetingDateJoinSchema[]> => {
   const availability = await db
     .select()
     .from(availabilities)
@@ -40,7 +44,7 @@ const getAvailability = async (user: User, meetingId: string | undefined) => {
       and(eq(availabilities.member_id, user.id), eq(meetingDates.meeting_id, meetingId ?? "")),
     );
 
-  return availability.map((item) => item.meeting_dates).sort((a, b) => (a.date < b.date ? -1 : 1));
+  return availability.sort((a, b) => (a.meeting_dates.date > b.meeting_dates.date ? 1 : -1));
 };
 
 export const actions: Actions = {