@flowselections/floriday-afhandeling-module 1.0.8 → 1.0.10

package/dist-lib/lib/carriers.functions.js

@@ -1,5 +1,6 @@
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
+import { DEFAULT_PICKUP_MOMENT } from "./planning";
 function clean(obj) {
     const out = {};
     for (const [k, v] of Object.entries(obj)) {
@@ -10,21 +11,44 @@ function clean(obj) {
     }
     return out;
 }
+function normalizeMoments(raw) {
+    if (!Array.isArray(raw) || raw.length === 0)
+        return [DEFAULT_PICKUP_MOMENT];
+    return raw.map((m) => {
+        const r = (m ?? {});
+        return {
+            signup_days: Number(r.signup_days ?? DEFAULT_PICKUP_MOMENT.signup_days),
+            signup_time: String(r.signup_time ?? DEFAULT_PICKUP_MOMENT.signup_time),
+            pickup_days: Number(r.pickup_days ?? DEFAULT_PICKUP_MOMENT.pickup_days),
+            pickup_time: String(r.pickup_time ?? DEFAULT_PICKUP_MOMENT.pickup_time),
+            delivery_days: Number(r.delivery_days ?? DEFAULT_PICKUP_MOMENT.delivery_days),
+            delivery_time: String(r.delivery_time ?? DEFAULT_PICKUP_MOMENT.delivery_time),
+        };
+    });
+}
 export const listCarriers = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
     .handler(async ({ context }) => {
     const { data, error } = await context.supabase
         .from("carriers")
         .select("*, carrier_shipping_rates(id)")
+        .order("sort_order", { ascending: true })
         .order("name", { ascending: true });
     if (error)
         throw new Error(error.message);
     const carriers = (data ?? []).map((row) => {
         const r = row;
         const rates = (r.carrier_shipping_rates ?? []);
-        const { carrier_shipping_rates: _drop, ...rest } = r;
+        const { carrier_shipping_rates: _drop, pickup_moments, service_countries, service_provinces, service_cities, ...rest } = r;
         void _drop;
-        return { ...rest, rate_count: rates.length };
+        return {
+            ...rest,
+            pickup_moments: normalizeMoments(pickup_moments),
+            service_countries: service_countries ?? [],
+            service_provinces: service_provinces ?? [],
+            service_cities: service_cities ?? [],
+            rate_count: rates.length,
+        };
     });
     return { carriers };
 });
@@ -45,9 +69,15 @@ export const getCarrier = createServerFn({ method: "GET" })
         .eq("carrier_id", data.id);
     if (ratesError)
         throw new Error(ratesError.message);
+    const c = carrier;
+    const { pickup_moments, service_countries, service_provinces, service_cities, ...rest } = c;
     return {
         carrier: {
-            ...carrier,
+            ...rest,
+            pickup_moments: normalizeMoments(pickup_moments),
+            service_countries: service_countries ?? [],
+            service_provinces: service_provinces ?? [],
+            service_cities: service_cities ?? [],
             rates: (rates ?? []).map((r) => ({
                 id: r.id,
                 country_code: r.country_code,
@@ -64,19 +94,30 @@ export const upsertCarrier = createServerFn({ method: "POST" })
     if (!carrier.name || carrier.name.trim().length === 0) {
         throw new Error("Bedrijfsnaam is verplicht");
     }
+    const moments = normalizeMoments(carrier.pickup_moments);
     const payload = clean({
         name: carrier.name.trim(),
         contact_person: carrier.contact_person ?? null,
         email: carrier.email ?? null,
         phone: carrier.phone ?? null,
         address: carrier.address ?? null,
-        delivery_days: carrier.delivery_days ?? null,
-        signup_time_1: carrier.signup_time_1 ?? null,
-        signup_time_2: carrier.signup_time_2 ?? null,
         notes: carrier.notes ?? null,
+        is_default: carrier.is_default ?? false,
+        pickup_moments: moments,
+        service_countries: Array.isArray(carrier.service_countries) ? carrier.service_countries : [],
+        service_provinces: Array.isArray(carrier.service_provinces) ? carrier.service_provinces : [],
+        service_cities: Array.isArray(carrier.service_cities) ? carrier.service_cities : [],
     });
     let carrierId;
     if (carrier.id) {
+        // Als deze als default wordt gemarkeerd, eerst andere defaults van deze user uitzetten
+        if (carrier.is_default) {
+            await context.supabase
+                .from("carriers")
+                .update({ is_default: false })
+                .eq("user_id", context.userId)
+                .neq("id", carrier.id);
+        }
         const { data: updated, error } = await context.supabase
             .from("carriers")
             .update(payload)
@@ -88,6 +129,12 @@ export const upsertCarrier = createServerFn({ method: "POST" })
         carrierId = updated.id;
     }
     else {
+        if (carrier.is_default) {
+            await context.supabase
+                .from("carriers")
+                .update({ is_default: false })
+                .eq("user_id", context.userId);
+        }
         const { data: inserted, error } = await context.supabase
             .from("carriers")
             .insert({ ...payload, user_id: context.userId })
@@ -129,3 +176,19 @@ export const deleteCarrier = createServerFn({ method: "POST" })
         throw new Error(error.message);
     return { ok: true };
 });
+export const reorderCarriers = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((data) => data)
+    .handler(async ({ data, context }) => {
+    const updates = data.orderedIds.map((id, index) => context.supabase
+        .from("carriers")
+        .update({ sort_order: index + 1 })
+        .eq("id", id)
+        .eq("user_id", context.userId));
+    const results = await Promise.all(updates);
+    for (const r of results) {
+        if (r.error)
+            throw new Error(r.error.message);
+    }
+    return { ok: true };
+});