@flowselections/floriday-verkoop-module 1.0.20 → 1.0.24

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

@@ -3,11 +3,34 @@
 import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
+import { mapJsonbToSalesOrderDTO, } from "./salesorders-mapping";
 import { loadActiveConnections, syncBySequence, } from "./floriday-sync";
 const ENTITY_TYPE = "salesorders";
 const MAX_ENDPOINT = "/sales-orders/current-max-sequence";
 const SYNC_ENDPOINT_BASE = "/sales-orders/sync";
 const CACHE_TABLE = "floriday_salesorders_cache";
+function pickString(v) {
+    if (v == null)
+        return null;
+    if (typeof v === "string")
+        return v;
+    if (typeof v === "number")
+        return String(v);
+    if (Array.isArray(v)) {
+        for (const item of v) {
+            const s = pickString(item?.text ?? item?.value ?? item);
+            if (s)
+                return s;
+        }
+        return null;
+    }
+    if (typeof v === "object") {
+        return (v.nl ?? v.NL ?? v.en ?? v.EN ?? v.text ?? v.value ??
+            Object.values(v).find((x) => typeof x === "string") ??
+            null);
+    }
+    return null;
+}
 function mapSalesOrderRow(record, connectionId) {
     return {
         connection_id: connectionId,
@@ -61,6 +84,15 @@ async function runSalesOrdersSyncInternal() {
             });
         }
     }
+    // Spiegel recent gewijzigde FO's naar de lokale orders-tabel zodat
+    // buffergroepering en gedeelde karren werken.
+    try {
+        const { mirrorFloridayOrdersFromCron } = await import("./floriday-mirror.functions");
+        await mirrorFloridayOrdersFromCron(500);
+    }
+    catch (mirrorErr) {
+        console.error("[floriday-mirror] failed", mirrorErr);
+    }
     return { ok: results.every((r) => r.ok), results };
 }
 export async function runSalesOrdersSyncFromCron() {
@@ -180,3 +212,278 @@ export const diagnoseFloridayConnection = createServerFn({ method: "POST" })
         syncState: state ?? null,
     };
 });
+// ─── Detail read (bulletproof, per-order fetch) ───────────────────────────
+// Vervangt de zware lijst-query op de detailpagina. Doet ~4 gerichte
+// queries op geïndexeerde kolommen; elke neventabel-fetch is best-effort
+// (try/catch) zodat één falende bron de detailweergave niet blokkeert.
+const DetailInputSchema = z.object({ id: z.string().min(1) });
+export const getSalesOrderDetail = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => DetailInputSchema.parse(d))
+    .handler(async ({ data, context }) => {
+    const supabase = context.supabase;
+    // 1) Actieve environment + connectie.
+    const envRes = await supabase
+        .from("floriday_settings")
+        .select("active_environment")
+        .eq("id", 1)
+        .maybeSingle();
+    const rawEnv = String(envRes.data?.active_environment ?? "staging");
+    const environment = rawEnv === "production" || rawEnv === "prod" || rawEnv === "live" ? "live" : "staging";
+    const connRes = await supabase
+        .from("floriday_connections")
+        .select("id, organization_name, label")
+        .eq("is_active", true)
+        .eq("environment", environment)
+        .limit(1);
+    const conn = (connRes.data ?? [])[0];
+    const sellerFallback = conn?.organization_name ?? conn?.label ?? null;
+    if (!conn?.id) {
+        return { order: null, sellerFallback, environment, bufferId: null, bufferSiblings: [] };
+    }
+    // 2) De order zelf uit de cache (gerichte lookup op indexed kolom).
+    const orderRes = await supabase
+        .from("floriday_salesorders_cache")
+        .select("floriday_id, data, controlled_at")
+        .eq("connection_id", conn.id)
+        .eq("floriday_id", data.id)
+        .maybeSingle();
+    if (orderRes.error) {
+        throw new Error(`Order ophalen faalde: ${orderRes.error.message}`);
+    }
+    const row = orderRes.data;
+    if (!row?.data) {
+        return { order: null, sellerFallback, environment, bufferId: null, bufferSiblings: [] };
+    }
+    const orderData = row.data;
+    const customerOrgId = String(orderData?.customerOrganizationId ?? "");
+    const tradeItemId = String(orderData?.tradeItemId ?? "");
+    // 3) Neventabellen in parallel — allemaal best-effort.
+    const [customerLocalRes, customerCacheRes, tradeItemRes, orderNumberRes] = await Promise.all([
+        customerOrgId
+            ? supabase
+                .from("customers")
+                .select("id, company_name, commercial_name, city, postal_code, logo_url, floriday_organization_id, phone, phone_number, contact_person, custom_fields, gln, street, country")
+                .eq("floriday_organization_id", customerOrgId)
+                .limit(1)
+                .then((r) => r)
+                .catch((e) => ({ data: null, error: e }))
+            : Promise.resolve({ data: null, error: null }),
+        customerOrgId
+            ? supabase
+                .from("floriday_customers_cache")
+                .select("organization_id, data")
+                .eq("organization_id", customerOrgId)
+                .maybeSingle()
+                .then((r) => r)
+                .catch((e) => ({ data: null, error: e }))
+            : Promise.resolve({ data: null, error: null }),
+        tradeItemId
+            ? supabase
+                .from("floriday_trade_items_cache")
+                .select("floriday_id, data")
+                .eq("floriday_id", tradeItemId)
+                .maybeSingle()
+                .then((r) => r)
+                .catch((e) => ({ data: null, error: e }))
+            : Promise.resolve({ data: null, error: null }),
+        supabase
+            .from("floriday_order_number_map")
+            .select("floriday_id, order_number")
+            .eq("floriday_id", data.id)
+            .maybeSingle()
+            .then((r) => r)
+            .catch((e) => ({ data: null, error: e })),
+    ]);
+    // 4) Bouw lookups met precies één klant en één trade-item.
+    const customerLookup = new Map();
+    const localC = (customerLocalRes?.data ?? null);
+    if (localC) {
+        customerLookup.set(customerOrgId, {
+            name: localC.commercial_name ?? localC.company_name ?? "Onbekende klant",
+            postalCode: localC.postal_code ?? "",
+            city: localC.city ?? "",
+            logoUrl: localC.logo_url ?? null,
+            raw: localC,
+        });
+    }
+    else {
+        const cacheRow = (customerCacheRes?.data ?? null);
+        const d = cacheRow?.data ?? {};
+        if (cacheRow && customerOrgId) {
+            const addr = d.physicalAddress ?? d.mailingAddress ?? {};
+            customerLookup.set(customerOrgId, {
+                name: d.commercialName ?? d.name ?? "Onbekende klant",
+                postalCode: addr.postalCode ?? "",
+                city: addr.city ?? "",
+                logoUrl: d.logoUrl ?? null,
+                raw: d,
+            });
+        }
+    }
+    const tradeItemLookup = new Map();
+    const tiRow = (tradeItemRes?.data ?? null);
+    if (tiRow?.data && tradeItemId) {
+        const d = tiRow.data;
+        const photos = d.photos ?? d.images ?? d.tradeItemPhotos ?? [];
+        const firstPhotoRaw = Array.isArray(photos) && photos.length > 0
+            ? (photos[0]?.url ?? photos[0]?.imageUrl ?? photos[0]?.href ?? photos[0])
+            : null;
+        tradeItemLookup.set(tradeItemId, {
+            name: pickString(d.name) ??
+                pickString(d.productName) ??
+                pickString(d.tradeItemName) ??
+                pickString(d.tradeItemTexts) ??
+                "Onbekend artikel",
+            imageUrl: pickString(firstPhotoRaw),
+            sku: pickString(d.vbnProductCode) ??
+                pickString(d.gtin) ??
+                pickString(d.articleCode),
+            raw: d,
+        });
+    }
+    // 5) Verrijk met order_number + controle-status zodat de mapping alles heeft.
+    const onRow = (orderNumberRes?.data ?? null);
+    const controlledAt = row.controlled_at ?? null;
+    const enrichedOrder = {
+        ...orderData,
+        ...(onRow?.order_number ? { orderNumber: String(onRow.order_number) } : {}),
+        __controlledAt: controlledAt,
+    };
+    const dto = mapJsonbToSalesOrderDTO(enrichedOrder, customerLookup, tradeItemLookup);
+    // 6) Buffer-siblings: zoek buffer_id via orders-tabel en verzamel alle
+    //    verwante Floriday-orders. Zo werkt de detailweergave onafhankelijk
+    //    van de (soms trage of gefilterde) lijst-query.
+    let bufferId = null;
+    const bufferSiblings = [];
+    try {
+        const ownRes = await supabase
+            .from("orders")
+            .select("buffer_id")
+            .eq("floriday_sales_order_id", data.id)
+            .maybeSingle();
+        bufferId = ownRes.data?.buffer_id ?? null;
+        if (bufferId) {
+            dto.bufferId = bufferId;
+            const sibRes = await supabase
+                .from("orders")
+                .select("floriday_sales_order_id")
+                .eq("buffer_id", bufferId)
+                .not("floriday_sales_order_id", "is", null);
+            const sibFoIds = (sibRes.data ?? [])
+                .map((r) => String(r.floriday_sales_order_id))
+                .filter((id) => id && id !== data.id);
+            if (sibFoIds.length > 0) {
+                const sibCacheRes = await supabase
+                    .from("floriday_salesorders_cache")
+                    .select("floriday_id, data, controlled_at")
+                    .eq("connection_id", conn.id)
+                    .in("floriday_id", sibFoIds);
+                const sibRows = (sibCacheRes.data ?? []);
+                // Verzamel extra klant/trade-item lookups voor de siblings.
+                const extraOrgIds = Array.from(new Set(sibRows
+                    .map((r) => String(r?.data?.customerOrganizationId ?? ""))
+                    .filter((id) => id && !customerLookup.has(id))));
+                const extraTiIds = Array.from(new Set(sibRows
+                    .map((r) => String(r?.data?.tradeItemId ?? ""))
+                    .filter((id) => id && !tradeItemLookup.has(id))));
+                const [extraCustLocal, extraCustCache, extraTi] = await Promise.all([
+                    extraOrgIds.length
+                        ? supabase
+                            .from("customers")
+                            .select("id, company_name, commercial_name, city, postal_code, logo_url, floriday_organization_id")
+                            .in("floriday_organization_id", extraOrgIds)
+                        : Promise.resolve({ data: [] }),
+                    extraOrgIds.length
+                        ? supabase
+                            .from("floriday_customers_cache")
+                            .select("organization_id, data")
+                            .in("organization_id", extraOrgIds)
+                        : Promise.resolve({ data: [] }),
+                    extraTiIds.length
+                        ? supabase
+                            .from("floriday_trade_items_cache")
+                            .select("floriday_id, data")
+                            .in("floriday_id", extraTiIds)
+                        : Promise.resolve({ data: [] }),
+                ]);
+                const localByOrg = new Map();
+                for (const c of (extraCustLocal.data ?? [])) {
+                    localByOrg.set(String(c.floriday_organization_id), c);
+                }
+                for (const orgId of extraOrgIds) {
+                    const localC = localByOrg.get(orgId);
+                    if (localC) {
+                        customerLookup.set(orgId, {
+                            name: localC.commercial_name ?? localC.company_name ?? "Onbekende klant",
+                            postalCode: localC.postal_code ?? "",
+                            city: localC.city ?? "",
+                            logoUrl: localC.logo_url ?? null,
+                            raw: localC,
+                        });
+                    }
+                }
+                for (const c of (extraCustCache.data ?? [])) {
+                    const orgId = String(c.organization_id);
+                    if (customerLookup.has(orgId))
+                        continue;
+                    const d = c.data ?? {};
+                    const addr = d.physicalAddress ?? d.mailingAddress ?? {};
+                    customerLookup.set(orgId, {
+                        name: d.commercialName ?? d.name ?? "Onbekende klant",
+                        postalCode: addr.postalCode ?? "",
+                        city: addr.city ?? "",
+                        logoUrl: d.logoUrl ?? null,
+                        raw: d,
+                    });
+                }
+                for (const t of (extraTi.data ?? [])) {
+                    const tid = String(t.floriday_id);
+                    const d = t.data ?? {};
+                    const photos = d.photos ?? d.images ?? d.tradeItemPhotos ?? [];
+                    const firstPhotoRaw = Array.isArray(photos) && photos.length > 0
+                        ? (photos[0]?.url ?? photos[0]?.imageUrl ?? photos[0]?.href ?? photos[0])
+                        : null;
+                    tradeItemLookup.set(tid, {
+                        name: pickString(d.name) ??
+                            pickString(d.productName) ??
+                            pickString(d.tradeItemName) ??
+                            pickString(d.tradeItemTexts) ??
+                            "Onbekend artikel",
+                        imageUrl: pickString(firstPhotoRaw),
+                        sku: pickString(d.vbnProductCode) ??
+                            pickString(d.gtin) ??
+                            pickString(d.articleCode),
+                        raw: d,
+                    });
+                }
+                for (const sr of sibRows) {
+                    const sDto = mapJsonbToSalesOrderDTO({ ...sr.data, __controlledAt: sr.controlled_at ?? null }, customerLookup, tradeItemLookup);
+                    sDto.bufferId = bufferId;
+                    bufferSiblings.push(sDto);
+                }
+            }
+        }
+    }
+    catch (err) {
+        console.warn("[getSalesOrderDetail] buffer-siblings lookup faalde:", err.message);
+    }
+    return { order: dto, sellerFallback, environment, bufferId, bufferSiblings };
+});
+// ─── Handmatige controle na orderpicken ───────────────────────────────────
+const ControlInputSchema = z.object({
+    floridayId: z.string().min(1),
+    controlled: z.boolean(),
+});
+export const setSalesOrderControlled = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((d) => ControlInputSchema.parse(d))
+    .handler(async ({ data, context }) => {
+    const { error } = await context.supabase.rpc("mark_salesorder_controlled", {
+        p_floriday_id: data.floridayId,
+        p_controlled: data.controlled,
+    });
+    if (error)
+        throw new Error(error.message);
+    return { ok: true };
+});