@flowselections/floriday-verkoop-module 1.0.20 → 1.0.24

package/dist-lib/lib/floriday-public.functions.js

@@ -33,8 +33,107 @@ const ENTITY_TABLE = {
 const CachedListSchema = z.object({
     environment: EnvSchema,
     entity: z.string().min(1),
-    limit: z.number().int().positive().max(5000).optional(),
+    limit: z.number().int().positive().max(20000).optional(),
+    // Optioneel — alleen benut voor entity "sales-orders".
+    since: z.string().optional(),
+    until: z.string().optional(),
+    dateField: z.enum(["ordered", "delivery"]).optional(),
 });
+// Sales-orders lezen we via een aparte, geoptimaliseerde tak: scope op de
+// actieve connectie, sorteer op sequence_number DESC, pagineer met .range(),
+// en filter serverside op de opgegeven periode. Zo blijft dit toekomstbestendig
+// bij tienduizenden orders in de cache.
+async function readSalesOrdersCache(supabase, args) {
+    // 1) Actieve connection_id voor de gekozen omgeving.
+    const dbEnv = args.environment === "live" ? "live" : "staging";
+    const { data: connRows, error: connErr } = await supabase
+        .from("floriday_connections")
+        .select("id")
+        .eq("is_active", true)
+        .eq("environment", dbEnv)
+        .limit(1);
+    if (connErr)
+        throw new Error(`floriday_connections lezen faalde: ${connErr.message}`);
+    const connectionId = (connRows ?? [])[0]?.id;
+    if (!connectionId)
+        return [];
+    // 2) Kolom in `data`-JSON die correspondeert met het gekozen dateField.
+    //    Postgrest ondersteunt filters op JSON via ->>.
+    const dateColumn = args.dateField === "delivery"
+        ? "data->delivery->>latestDeliveryDateTime"
+        : "data->>orderDateTime";
+    // 3) Gepagineerd lezen tot `limit` of tot de dataset uitgeput is.
+    const pageSize = 1000;
+    const collected = [];
+    for (let from = 0; from < args.limit; from += pageSize) {
+        const to = Math.min(from + pageSize - 1, args.limit - 1);
+        let q = supabase
+            .from("floriday_salesorders_cache")
+            .select("*")
+            .eq("connection_id", connectionId)
+            .eq("is_deleted", false)
+            .order("sequence_number", { ascending: false })
+            .range(from, to);
+        if (args.since)
+            q = q.gte(dateColumn, args.since);
+        if (args.until)
+            q = q.lt(dateColumn, args.until);
+        const { data: rows, error } = await q;
+        if (error)
+            throw new Error(`floriday_salesorders_cache lezen faalde: ${error.message}`);
+        const batch = rows ?? [];
+        collected.push(...batch);
+        if (batch.length < pageSize)
+            break;
+    }
+    return collected;
+}
+async function joinOrderNumbers(supabase, rows) {
+    const ids = Array.from(new Set(rows
+        .map((r) => String(r?.floriday_id ?? r?.data?.salesOrderId ?? ""))
+        .filter((id) => id.length > 0)));
+    if (ids.length === 0)
+        return rows;
+    const orderNumbers = new Map();
+    const chunkSize = 500;
+    const maxAttempts = 3;
+    for (let i = 0; i < ids.length; i += chunkSize) {
+        const chunk = ids.slice(i, i + chunkSize);
+        let lastErr = null;
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            try {
+                const { data: mapRows, error: mapErr } = await supabase
+                    .from("floriday_order_number_map")
+                    .select("floriday_id, order_number")
+                    .in("floriday_id", chunk);
+                if (mapErr)
+                    throw new Error(mapErr.message);
+                for (const m of mapRows ?? []) {
+                    orderNumbers.set(String(m.floriday_id), String(m.order_number ?? ""));
+                }
+                lastErr = null;
+                break;
+            }
+            catch (e) {
+                lastErr = e;
+                if (attempt < maxAttempts) {
+                    await new Promise((r) => setTimeout(r, 250 * attempt));
+                }
+            }
+        }
+        if (lastErr) {
+            // Non-fatal: log en ga door zonder order_number verrijking voor deze chunk.
+            console.warn(`[floriday-public] joinOrderNumbers chunk ${i / chunkSize} faalde na ${maxAttempts} pogingen:`, lastErr instanceof Error ? lastErr.message : lastErr);
+        }
+    }
+    return rows.map((r) => {
+        const floridayId = String(r?.floriday_id ?? r?.data?.salesOrderId ?? "");
+        const orderNumber = orderNumbers.get(floridayId);
+        return orderNumber
+            ? { ...r, order_number: orderNumber, data: { ...(r.data ?? {}), orderNumber } }
+            : r;
+    });
+}
 export const getFlorydayCachedList = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .inputValidator((d) => CachedListSchema.parse(d))
@@ -43,50 +142,27 @@ export const getFlorydayCachedList = createServerFn({ method: "POST" })
     if (!table) {
         throw new Error(`Onbekende entity "${data.entity}" — toegestane waarden: ${Object.keys(ENTITY_TABLE).join(", ")}`);
     }
+    // Sales-orders: aparte, geoptimaliseerde leestak.
+    if (data.entity === "sales-orders") {
+        const rows = await readSalesOrdersCache(context.supabase, {
+            environment: data.environment,
+            limit: data.limit ?? 20000,
+            since: data.since,
+            until: data.until,
+            dateField: data.dateField ?? "ordered",
+        });
+        const withNumbers = await joinOrderNumbers(context.supabase, rows);
+        return { entity: data.entity, rows: withNumbers };
+    }
+    // Overige entities: onveranderd gedrag.
     const limit = data.limit ?? 1000;
     let q = context.supabase.from(table).select("*").limit(limit);
-    // Most cache-tables have an is_deleted column; filter when present.
-    const hasIsDeleted = [
-        "floriday_salesorders_cache",
-        "floriday_trade_items_cache",
-    ].includes(table);
+    const hasIsDeleted = table === "floriday_trade_items_cache";
     if (hasIsDeleted)
         q = q.eq("is_deleted", false);
     const { data: rows, error } = await q;
     if (error)
         throw new Error(`${table} lezen faalde: ${error.message}`);
-    if (table === "floriday_salesorders_cache") {
-        const ids = (rows ?? [])
-            .map((r) => String(r?.floriday_id ?? r?.data?.salesOrderId ?? ""))
-            .filter((id) => id.length > 0);
-        if (ids.length > 0) {
-            const mapped = [];
-            const idSet = new Set(ids);
-            for (let from = 0; from < 10000; from += 1000) {
-                const { data: chunkRows, error: mapError } = await context.supabase
-                    .from("floriday_order_number_map")
-                    .select("floriday_id, order_number")
-                    .range(from, from + 999);
-                if (mapError)
-                    throw new Error(`floriday_order_number_map lezen faalde: ${mapError.message}`);
-                const batch = chunkRows ?? [];
-                mapped.push(...batch.filter((m) => idSet.has(String(m.floriday_id))));
-                if (batch.length < 1000)
-                    break;
-            }
-            const orderNumbers = new Map((mapped ?? []).map((m) => [String(m.floriday_id), String(m.order_number ?? "")]));
-            return {
-                entity: data.entity,
-                rows: (rows ?? []).map((r) => {
-                    const floridayId = String(r?.floriday_id ?? r?.data?.salesOrderId ?? "");
-                    const orderNumber = orderNumbers.get(floridayId) ?? null;
-                    return orderNumber
-                        ? { ...r, order_number: orderNumber, data: { ...(r.data ?? {}), orderNumber } }
-                        : r;
-                }),
-            };
-        }
-    }
     return { entity: data.entity, rows: rows ?? [] };
 });
 const CodeListSchema = z.object({

package/dist-lib/lib/floriday-sync.d.ts

@@ -6,7 +6,6 @@ export declare const FLORIDAY_API_BASES: {
 export interface FloridayConnectionRow {
     id: string;
     environment: string | null;
-    access_token: string | null;
     api_key: string | null;
     is_active: boolean | null;
 }

package/dist-lib/lib/floriday-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-sync.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW,CAAC,IAAI;IAC/B,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAkCD,wBAAsB,cAAc,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnE,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,GACtB,OAAO,CAAC,UAAU,CAAC,CA+FrB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAOlC"}
+{"version":3,"file":"floriday-sync.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-sync.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC;AAEX,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW,CAAC,IAAI;IAC/B,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAkCD,wBAAsB,cAAc,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnE,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,GACtB,OAAO,CAAC,UAAU,CAAC,CA+FrB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAOlC"}

package/dist-lib/lib/floriday-sync.js

@@ -108,7 +108,7 @@ export async function syncBySequence(supabase, opts) {
 export async function loadActiveConnections(supabase) {
     const { data, error } = await supabase
         .from("floriday_connections")
-        .select("id, environment, access_token, api_key, is_active")
+        .select("id, environment, api_key, is_active")
         .eq("is_active", true);
     if (error)
         throw new Error(`floriday_connections lezen faalde: ${error.message}`);