Cafe sign up handling (#1144)

Fix various bugs with the cafe page, namely:

- Stopping users from signing up to passed
- Stopping users from abandoning shifts the day before
- Fix timezone and local time isssues (you can now sign up on Mondays)
- Fix day names
- Hide sign up fields for non logged in members

Author: Tomas-Ka

src/routes/(app)/committees/cafe/+page.server.ts

@@ -110,6 +110,13 @@ export const actions: Actions = {
 
     const { date, worker, timeSlot } = form.data;
 
+    const parsedDate = dayjs(date, "YYYY-MM-DD", true);
+    if (!parsedDate.isValid()) {
+      return fail(400, { form });
+    }
+    const startOfDay = parsedDate.startOf("day").toDate();
+    const nextDay = parsedDate.add(1, "day").startOf("day").toDate();
+
     const member = worker || user.studentId;
     if (!member) {
       return fail(400, { form });
@@ -124,7 +131,7 @@ export const actions: Actions = {
       }
     }
     const dayShifts = await prisma.cafeShift.findMany({
-      where: { date: date },
+      where: { date: { gte: startOfDay, lt: nextDay } },
       include: { worker: { select: { studentId: true } } },
     });
 
@@ -138,6 +145,12 @@ export const actions: Actions = {
           type: "error",
         });
       }
+      if (!isSetByAdmin && parsedDate.isBefore(dayjs(), "day")) {
+        return message(form, {
+          message: m.cafe_error_sign_on_after(),
+          type: "error",
+        });
+      }
       // Check if the user already has a shift
       const tempShift = dayShifts.filter(
         (shift) =>
@@ -153,7 +166,7 @@ export const actions: Actions = {
       try {
         await prisma.cafeShift.create({
           data: {
-            date: date,
+            date: startOfDay,
             worker: {
               connect: {
                 studentId: member,
@@ -179,14 +192,25 @@ export const actions: Actions = {
     } else {
       // There is already a shift.
       if (cafeShift.worker.studentId === member) {
-        await prisma.cafeShift.delete({ where: { id: cafeShift.id } });
-        return message(form, {
-          message:
-            member === user.studentId
-              ? m.cafe_quit_shift()
-              : m.cafe_quit_shift_for_other({ name: member }),
-          type: "success",
-        });
+        const shiftDate = dayjs(cafeShift.date);
+        if (isSetByAdmin || shiftDate > dayjs().add(1, "day")) {
+          await prisma.cafeShift.delete({ where: { id: cafeShift.id } });
+          return message(form, {
+            message:
+              member === user.studentId
+                ? m.cafe_quit_shift()
+                : m.cafe_quit_shift_for_other({ name: member }),
+            type: "success",
+          });
+        } else {
+          return message(form, {
+            message:
+              shiftDate > dayjs().subtract(1, "day")
+                ? m.cafe_error_sign_off_close()
+                : m.cafe_error_sign_off_after(),
+            type: "error",
+          });
+        }
       } else {
         // There is already a shift in this location, but it is not attributed to the user we are trying to edit.
         if (isSetByAdmin) {

src/routes/(app)/committees/cafe/CafeBookingCalendar.svelte

@@ -3,7 +3,6 @@
   import dayjs from "dayjs";
   import weekYear from "dayjs/plugin/weekYear";
   import weekOfYear from "dayjs/plugin/weekOfYear";
-  import localeData from "dayjs/plugin/localeData";
   import { enhance } from "$app/forms";
   import Pagination from "$lib/components/Pagination.svelte";
   import { isAuthorized } from "$lib/utils/authorization";
@@ -14,13 +13,34 @@
   import { tick } from "svelte";
   import type { ShiftWithWorker, Ciabatta } from "./types";
   import { TimeSlot } from "./types";
+  import "dayjs/locale/en-gb";
+  import { languageTag } from "$paraglide/runtime";
+  import { page } from "$app/state";
 
   dayjs.extend(weekOfYear);
   dayjs.extend(weekYear);
-  dayjs.extend(localeData);
 
   const getWeekdayName = (weekday: number): string => {
-    return dayjs.weekdays(false)[weekday + 1] ?? "";
+    let locale: string;
+    switch (languageTag()) {
+      case "sv": {
+        locale = "sv-SE";
+        break;
+      }
+      case "en": {
+        locale = "en-GB";
+        break;
+      }
+      default: {
+        locale = "sv-SE";
+        break;
+      }
+    }
+    if (weekday < 0 || weekday > 6) return "";
+
+    // Reference Monday: Jan 5, 1970 was a Monday
+    const referenceMonday = new Date(Date.UTC(1970, 0, 5 + weekday));
+    return referenceMonday.toLocaleDateString(locale, { weekday: "long" });
   };
 
   let {
@@ -40,6 +60,9 @@
     timeSlot: TimeSlot,
     user: AuthUser,
   ) {
+    if (!page.data.user?.memberId) {
+      return false;
+    }
     let worker = shifts.find(
       (s) => dayjs(s.date).isSame(day, "day") && s.timeSlot === timeSlot,
     )?.worker;
@@ -224,7 +247,7 @@
             ({ update }) =>
               update({ reset: false })}
         >
-          <input type="hidden" name="date" value={day} />
+          <input type="hidden" name="date" value={day.format("YYYY-MM-DD")} />
           <input type="hidden" name="timeSlot" value={timeSlot} />
           {#if canEditWorkers && editing}
             <MemberSearchInput

src/routes/(app)/committees/cafe/types.ts

@@ -1,5 +1,6 @@
 import { Prisma } from "@prisma/client";
 import { TimeSlot as PrismaTimeSlot } from "@prisma/client";
+import dayjs from "dayjs";
 import { z } from "zod";
 export type { CiabattaOfTheWeek as Ciabatta } from "@prisma/client";
 
@@ -12,7 +13,12 @@ export const TimeSlot = {
 export type TimeSlot = (typeof TimeSlot)[keyof typeof TimeSlot];
 
 export const scheduleForm = z.object({
-  date: z.date(),
+  date: z
+    .string()
+    .regex(/^\d{4}-\d{2}-\d{2}$/)
+    .refine((val) => dayjs(val, "YYYY-MM-DD", true).isValid(), {
+      message: "Invalid date, expected format YYYY-MM-DD",
+    }),
   worker: z.string().optional(),
   timeSlot: z.nativeEnum(TimeSlot),
 });

src/translations/en.json

@@ -911,11 +911,14 @@
   "cafe_quit_shift": "Abandoned the shift.",
   "cafe_quit_shift_for_other": "Removed {name} from the shift.",
   "cafe_changed_ciabatta": "Successfully changed ciabatta.",
-  "cafe_error_already_have_shift": "Can't sign up, you already have a shift that day. If you need to sign up to more shifts, contact the Vice Head of the Cafe",
+  "cafe_error_already_have_shift": "Can't sign up, you already have a shift that day. If you need to sign up to more shifts, contact the Vice Head of the Cafe.",
   "cafe_error_only_daymanagers": "Only day managers can sign up there.",
   "cafe_error_no_edit_worker_perms": "You don't have permissions to sign up for other people.",
   "cafe_error_worker_not_exist": "Worker {name} does not exist.",
   "cafe_error_no_ciabatta_edit_perms": "You are not permitted to edit ciabattas.",
   "cafe_error_no_week_viewing_perms": "You are not permitted to view this week",
+  "cafe_error_sign_off_close": "Not permitted to abandon a shift so close in time. If you need to, contact the Vice Head of the Cafe.",
+  "cafe_error_sign_off_after": "Not permitted to abandon an already completed shift.",
+  "cafe_error_sign_on_after": "You can't sign up for a shift that's already happened.",
   "cafe_closed": "Closed"
 }

src/translations/sv.json

@@ -914,5 +914,8 @@
   "cafe_error_worker_not_exist": "Jobbare {name} existerar inte.",
   "cafe_error_no_ciabatta_edit_perms": "Du har inte tillåtelse att redigera ciabattas.",
   "cafe_error_no_week_viewing_perms": "Du har inte tillåtelse att se denna veckan.",
+  "cafe_error_sign_off_close": "Du har inte tillåtelse att avanmäla dig så tätt inpå. Om du måste, kontaka Vice Cafémästare.",
+  "cafe_error_sign_off_after": "Du har inte tillåtelse att avanmäla dig från avklarade skift.",
+  "cafe_error_sign_on_after": "Du kan inte anmäla dig till ett pass som redan hänt.",
   "cafe_closed": "Stängt"
 }