@shopbite-de/storefront 1.4.1 → 1.5.1

package/test/nuxt/useDeliveryTime.test.ts

@@ -3,14 +3,110 @@ import { mockNuxtImport } from "@nuxt/test-utils/runtime";
 import { ref } from "vue";
 import { useDeliveryTime } from "~/composables/useDeliveryTime";
 
-const { mockDeliveryTime } = vi.hoisted(() => ({
-  mockDeliveryTime: { value: 45 }, // Use object to keep reference
-}));
+const { mockDeliveryTime, mockBusinessHours, mockHolidays } = vi.hoisted(
+  () => ({
+    mockDeliveryTime: { value: 45 },
+    mockBusinessHours: {
+      value: [
+        { dayOfWeek: 1, openingTime: "11:30", closingTime: "14:30" },
+        { dayOfWeek: 1, openingTime: "17:30", closingTime: "23:00" },
+        { dayOfWeek: 3, openingTime: "11:30", closingTime: "14:30" },
+        { dayOfWeek: 3, openingTime: "17:30", closingTime: "23:00" },
+        { dayOfWeek: 4, openingTime: "11:30", closingTime: "14:30" },
+        { dayOfWeek: 4, openingTime: "17:30", closingTime: "23:00" },
+        { dayOfWeek: 5, openingTime: "11:30", closingTime: "14:30" },
+        { dayOfWeek: 5, openingTime: "17:30", closingTime: "23:00" },
+        { dayOfWeek: 6, openingTime: "17:30", closingTime: "23:30" },
+        { dayOfWeek: 0, openingTime: "11:30", closingTime: "14:30" },
+        { dayOfWeek: 0, openingTime: "17:30", closingTime: "23:00" },
+      ],
+    },
+    mockHolidays: { value: [] },
+  }),
+);
 
 mockNuxtImport("useShopBiteConfig", () => () => ({
   deliveryTime: mockDeliveryTime,
 }));
 
+mockNuxtImport("useBusinessHours", () => () => ({
+  businessHours: mockBusinessHours,
+  getServiceIntervals: (date: Date) => {
+    const dayOfWeek = date.getDay();
+    return mockBusinessHours.value
+      .filter((bh) => bh.dayOfWeek === dayOfWeek)
+      .map((bh) => {
+        const [startH, startM] = bh.openingTime.split(":").map(Number);
+        const [endH, endM] = bh.closingTime.split(":").map(Number);
+        const start = new Date(date);
+        start.setHours(startH, startM, 0, 0);
+        const end = new Date(date);
+        end.setHours(endH, endM, 0, 0);
+        return { start, end };
+      });
+  },
+  getEarliestSelectableTime: (
+    currentTime: Date,
+    currentDeliveryTime: number | null,
+  ) => {
+    const earliest = new Date(currentTime);
+    earliest.setMinutes(earliest.getMinutes() + (currentDeliveryTime ?? 30));
+    earliest.setSeconds(0, 0);
+    return earliest;
+  },
+  findActiveInterval: (
+    currentTime: Date,
+    currentDeliveryTime: number | null,
+  ) => {
+    const intervals = [
+      { dayOfWeek: 1, openingTime: "11:30", closingTime: "14:30" },
+      { dayOfWeek: 1, openingTime: "17:30", closingTime: "23:00" },
+      { dayOfWeek: 3, openingTime: "11:30", closingTime: "14:30" },
+      { dayOfWeek: 3, openingTime: "17:30", closingTime: "23:00" },
+      { dayOfWeek: 4, openingTime: "11:30", closingTime: "14:30" },
+      { dayOfWeek: 4, openingTime: "17:30", closingTime: "23:00" },
+      { dayOfWeek: 5, openingTime: "11:30", closingTime: "14:30" },
+      { dayOfWeek: 5, openingTime: "17:30", closingTime: "23:00" },
+      { dayOfWeek: 6, openingTime: "17:30", closingTime: "23:30" },
+      { dayOfWeek: 0, openingTime: "11:30", closingTime: "14:30" },
+      { dayOfWeek: 0, openingTime: "17:30", closingTime: "23:00" },
+    ]
+      .filter((bh) => bh.dayOfWeek === currentTime.getDay())
+      .map((bh) => {
+        const [startH, startM] = bh.openingTime.split(":").map(Number);
+        const [endH, endM] = bh.closingTime.split(":").map(Number);
+        const start = new Date(currentTime);
+        start.setHours(startH, startM, 0, 0);
+        const end = new Date(currentTime);
+        end.setHours(endH, endM, 0, 0);
+        return { start, end };
+      });
+
+    const earliest = new Date(currentTime);
+    earliest.setMinutes(earliest.getMinutes() + (currentDeliveryTime ?? 30));
+    earliest.setSeconds(0, 0);
+
+    if (intervals.length === 0) return null;
+    const current = intervals.find(
+      (i) => earliest >= i.start && earliest <= i.end,
+    );
+    if (current) return current;
+    return intervals.find((i) => i.start > earliest) ?? null;
+  },
+}));
+
+mockNuxtImport("useHolidays", () => () => ({
+  isClosedHoliday: (date: Date) => {
+    if (!mockHolidays.value) return undefined;
+    const formattedDate = date.toISOString().split("T")[0];
+    return mockHolidays.value.some((h: any) => {
+      const start = h.start.split("T")[0];
+      const end = h.end.split("T")[0];
+      return formattedDate >= start && formattedDate <= end;
+    });
+  },
+}));
+
 describe("useDeliveryTime", () => {
   const now = ref(new Date("2023-10-27T12:00:00")); // A Friday
 
@@ -65,4 +161,11 @@ describe("useDeliveryTime", () => {
       );
     }
   });
+
+  it("should return loading message when holidays are not loaded", () => {
+    mockHolidays.value = null;
+    const { helperText } = useDeliveryTime(now);
+    expect(helperText.value).toBe("Lade Informationen...");
+    mockHolidays.value = []; // Reset for other tests
+  });
 });

package/app/utils/businessHours.ts

@@ -1,114 +0,0 @@
-export type ServiceInterval = { start: Date; end: Date };
-
-export function isTuesday(date: Date): boolean {
-  return date.getDay() === 2;
-}
-
-export function isSaturday(date: Date): boolean {
-  return date.getDay() === 6;
-}
-
-export function getServiceIntervals(date: Date): Array<ServiceInterval> {
-  if (isTuesday(date)) return [];
-
-  const lunchStart = setTime(date, 11, 30);
-  const lunchEnd = setTime(date, 14, 30);
-  const dinnerStart = setTime(date, 17, 30);
-  const dinnerEnd = isSaturday(date)
-    ? setTime(date, 23, 30)
-    : setTime(date, 23, 0);
-
-  if (isSaturday(date)) {
-    // Saturday: only dinner, no lunch
-    return [{ start: dinnerStart, end: dinnerEnd }];
-  }
-
-  return [
-    { start: lunchStart, end: lunchEnd },
-    { start: dinnerStart, end: dinnerEnd },
-  ];
-}
-
-export function getEarliestSelectableTime(
-  currentTime: Date,
-  currentDeliveryTime: number | null,
-): Date {
-  const earliest = new Date(currentTime);
-  earliest.setMinutes(earliest.getMinutes() + (currentDeliveryTime ?? 30));
-  earliest.setSeconds(0, 0);
-  return earliest;
-}
-
-export function getNextOpeningTime(now: Ref<Date>): string | null {
-  const currentDate = now.value;
-
-  // Try up to 60 days ahead to find next opening (covers long holiday periods)
-  for (let i = 0; i < 60; i++) {
-    const checkDate = new Date(currentDate);
-    checkDate.setDate(checkDate.getDate() + i);
-    checkDate.setHours(12, 0, 0, 0); // Set to midday to avoid timezone issues
-
-    // Skip holidays
-    if (isClosedHoliday(checkDate)) continue;
-
-    const intervals = getServiceIntervals(checkDate);
-    if (intervals.length === 0) continue;
-
-    // For today, check if there's still an opening coming
-    if (i === 0) {
-      for (const interval of intervals) {
-        if (interval.start.getTime() > currentDate.getTime()) {
-          const hours = interval.start.getHours().toString().padStart(2, "0");
-          const minutes = interval.start
-            .getMinutes()
-            .toString()
-            .padStart(2, "0");
-          return `${hours}:${minutes} Uhr`;
-        }
-      }
-      continue; // Today's openings have passed, check next days
-    }
-
-    const nextOpen = intervals[0].start;
-    const day = nextOpen.getDate().toString().padStart(2, "0");
-    const month = (nextOpen.getMonth() + 1).toString().padStart(2, "0");
-    const dayName = [
-      "Sonntag",
-      "Montag",
-      "Dienstag",
-      "Mittwoch",
-      "Donnerstag",
-      "Freitag",
-      "Samstag",
-    ][nextOpen.getDay()];
-    const hours = nextOpen.getHours().toString().padStart(2, "0");
-    const minutes = nextOpen.getMinutes().toString().padStart(2, "0");
-
-    if (i === 1) {
-      return `morgen um ${hours}:${minutes} Uhr`;
-    }
-    return `${dayName}, ${day}.${month}. um ${hours}:${minutes} Uhr`;
-  }
-
-  return null;
-}
-
-export function findActiveInterval(
-  currentTime: Date,
-  currentDeliveryTime: number | null,
-): ServiceInterval | null {
-  const intervals = getServiceIntervals(currentTime);
-  const earliest = getEarliestSelectableTime(
-    currentTime,
-    currentDeliveryTime ?? 30,
-  );
-
-  if (intervals.length === 0) return null;
-
-  const current = intervals.find(
-    (interval) => earliest >= interval.start && earliest <= interval.end,
-  );
-  if (current) return current;
-
-  return intervals.find((interval) => interval.start > earliest) ?? null;
-}

package/app/utils/holidays.ts

@@ -1,24 +0,0 @@
-export function isClosedHoliday(date?: Date): boolean {
-  // Use provided date or current date
-  const checkDate = date ?? new Date();
-  // Format date as YYYY-MM-DD for comparison
-  const formattedDate = formatDateYYYYMMDD(checkDate);
-
-  // List of holidays (YYYY-MM-DD format)
-  const holidays = ["2025-12-31", "2026-01-01"];
-
-  return holidays.includes(formattedDate);
-}
-
-/**
- * Formats a date as YYYY-MM-DD
- * @param date The date to format
- * @returns The formatted date string
- */
-function formatDateYYYYMMDD(date: Date): string {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const day = String(date.getDate()).padStart(2, "0");
-
-  return `${year}-${month}-${day}`;
-}

package/app/utils/storeHours.ts

@@ -1,8 +0,0 @@
-// utils/storeHours.ts
-export function isStoreOpen(date: Date = new Date()): boolean {
-  if (isClosedHoliday(date)) return false;
-
-  const intervals = getServiceIntervals(date);
-  if (intervals.length === 0) return false;
-  return intervals.some(({ start, end }) => date >= start && date <= end);
-}