@flowselections/floriday-afhandeling-module 1.0.9 → 1.0.11

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

@@ -11,6 +11,15 @@ function clean(obj) {
     }
     return out;
 }
+const DEFAULT_WEEKDAYS_ARR = [1, 2, 3, 4, 5];
+function sanitizeWeekdays(input) {
+    if (!Array.isArray(input))
+        return DEFAULT_WEEKDAYS_ARR;
+    const clean = Array.from(new Set(input
+        .map((n) => Math.floor(Number(n)))
+        .filter((n) => Number.isFinite(n) && n >= 1 && n <= 7))).sort((a, b) => a - b);
+    return clean.length > 0 ? clean : DEFAULT_WEEKDAYS_ARR;
+}
 function normalizeMoments(raw) {
     if (!Array.isArray(raw) || raw.length === 0)
         return [DEFAULT_PICKUP_MOMENT];
@@ -32,17 +41,23 @@ export const listCarriers = createServerFn({ method: "GET" })
     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, pickup_moments, ...rest } = r;
+        const { carrier_shipping_rates: _drop, pickup_moments, service_countries, service_provinces, service_cities, pickup_weekdays, delivery_weekdays, ...rest } = r;
         void _drop;
         return {
             ...rest,
             pickup_moments: normalizeMoments(pickup_moments),
+            service_countries: service_countries ?? [],
+            service_provinces: service_provinces ?? [],
+            service_cities: service_cities ?? [],
+            pickup_weekdays: sanitizeWeekdays(pickup_weekdays),
+            delivery_weekdays: sanitizeWeekdays(delivery_weekdays),
             rate_count: rates.length,
         };
     });
@@ -66,11 +81,16 @@ export const getCarrier = createServerFn({ method: "GET" })
     if (ratesError)
         throw new Error(ratesError.message);
     const c = carrier;
-    const { pickup_moments, ...rest } = c;
+    const { pickup_moments, service_countries, service_provinces, service_cities, pickup_weekdays, delivery_weekdays, ...rest } = c;
     return {
         carrier: {
             ...rest,
             pickup_moments: normalizeMoments(pickup_moments),
+            service_countries: service_countries ?? [],
+            service_provinces: service_provinces ?? [],
+            service_cities: service_cities ?? [],
+            pickup_weekdays: sanitizeWeekdays(pickup_weekdays),
+            delivery_weekdays: sanitizeWeekdays(delivery_weekdays),
             rates: (rates ?? []).map((r) => ({
                 id: r.id,
                 country_code: r.country_code,
@@ -97,6 +117,11 @@ export const upsertCarrier = createServerFn({ method: "POST" })
         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 : [],
+        pickup_weekdays: sanitizeWeekdays(carrier.pickup_weekdays),
+        delivery_weekdays: sanitizeWeekdays(carrier.delivery_weekdays),
     });
     let carrierId;
     if (carrier.id) {
@@ -166,3 +191,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 };
+});