@flowselections/logistiek-engine 1.0.11 → 1.0.13

package/dist-lib/lib/floridayPush.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floridayPush.server.d.ts","sourceRoot":"","sources":["../../src/lib/floridayPush.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAc/C,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUlD;AAMD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,KAAK,CAAC;QAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,KAAK,EAAE,KAAK,CAAC;YACX,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;YACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;YAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;YACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;YACrB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;SAC/B,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ;AAED,sEAAsE;AACtE,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAkDhE;AAOD,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AAiBD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,eAAe,CAAC,CAuF1B;AAQD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F"}
+{"version":3,"file":"floridayPush.server.d.ts","sourceRoot":"","sources":["../../src/lib/floridayPush.server.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAc/C,mFAAmF;AACnF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUlD;AAcD,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AAUnE;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,cAAc,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CACN;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvF;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAC7C,CAqDA;AAED,8CAA8C;AAC9C,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CA+EtB;AAQD,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW3F;AAED,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhG;AA6BD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,cAAc,EAClB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACjD,OAAO,CAAC,eAAe,CAAC,CA0H1B;AAQD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3F"}

package/dist-lib/lib/floridayPush.server.js

@@ -36,51 +36,126 @@ export function hashPayload(value) {
     }
     return h1.toString(16).padStart(8, "0") + h2.toString(16).padStart(8, "0");
 }
-/** Bouwt de gewenste stand voor één order. null = niets te pushen. */
+/**
+ * Zoekt de delivery-order die bij een sales-order hoort. De koppeling ligt op
+ * de delivery-order: data->'fulfillmentRequests'[]->>'salesOrderId'.
+ * Bij meerdere treffers wint de meest recent opgehaalde rij (fetched_at desc).
+ */
+export async function findDeliveryOrderForSalesOrder(sb, salesOrderId) {
+    const { data, error } = await sb
+        .from("floriday_delivery_orders_cache")
+        .select("floriday_id, data, fetched_at")
+        .contains("data", { fulfillmentRequests: [{ salesOrderId }] })
+        .order("fetched_at", { ascending: false })
+        .limit(10);
+    if (error) {
+        return { ok: false, code: "db_error_delivery_orders", error: `Delivery-ordercache niet leesbaar: ${error.message}` };
+    }
+    const rows = Array.isArray(data) ? data : [];
+    if (rows.length === 0) {
+        return {
+            ok: false,
+            code: "delivery_order_not_found_local",
+            error: `Nog geen delivery-order in de cache voor sales-order ${salesOrderId}. De push wacht tot de synchronisatie hem binnenhaalt.`,
+        };
+    }
+    if (rows.length > 1) {
+        console.info(`[floridayPush] ${rows.length} delivery-orders gevonden voor sales-order ${salesOrderId}; meest recent gefetchte gekozen.`);
+    }
+    const row = rows[0];
+    const payloadData = (row["data"] ?? {});
+    const requests = Array.isArray(payloadData["fulfillmentRequests"])
+        ? payloadData["fulfillmentRequests"]
+        : [];
+    const fulfillmentRequestIds = requests
+        .filter((r) => String(r["salesOrderId"] ?? "") === salesOrderId)
+        .map((r) => String(r["fulfillmentRequestId"] ?? r["id"] ?? ""))
+        .filter((s) => s.length > 0)
+        .sort();
+    if (fulfillmentRequestIds.length === 0) {
+        return {
+            ok: false,
+            code: "delivery_order_without_requests",
+            error: `Delivery-order ${String(row["floriday_id"] ?? "")} bevat geen fulfillmentRequests voor sales-order ${salesOrderId}.`,
+        };
+    }
+    return {
+        ok: true,
+        deliveryOrderId: String(row["floriday_id"] ?? ""),
+        fulfillmentRequestIds,
+        matches: rows.length,
+    };
+}
+/** Bouwt de gewenste stand voor één order. */
 export async function buildFloridayPayload(sb, orderRef) {
-    const { data: order } = await sb
+    const { data: order, error: orderError } = await sb
         .from("orders")
         .select("id, order_number, floriday_sales_order_id")
         .eq("order_number", orderRef)
         .maybeSingle();
-    if (!order)
-        return null;
+    if (orderError) {
+        return {
+            ok: false,
+            code: "db_error_orders",
+            error: `Order niet leesbaar: ${orderError.message}`,
+            permanent: false,
+        };
+    }
+    if (!order) {
+        return { ok: false, code: "order_missing", error: "Order niet gevonden in de Engine.", permanent: true };
+    }
     const row = order;
-    const { data: carts } = await sb
+    const salesOrderId = row["floriday_sales_order_id"] ?? null;
+    if (!salesOrderId) {
+        return {
+            ok: false,
+            code: "sales_order_missing",
+            error: "Order heeft geen Floriday sales-order; er valt niets te pushen.",
+            permanent: true,
+        };
+    }
+    const found = await findDeliveryOrderForSalesOrder(sb, salesOrderId);
+    if (!found.ok) {
+        // Wachttoestand, geen mislukking: de delivery-order kan later binnenkomen.
+        return { ok: false, code: found.code, error: found.error, permanent: false };
+    }
+    const { data: carts, error: cartsError } = await sb
         .from("order_carts")
         .select("id, cart_number, carrier_type, total_layers_used, max_layers, occupancy_pct, weight_kg, order_cart_items(product_id, product_name, crates, boxes, plants_per_crate)")
         .eq("order_id", row["id"])
         .order("cart_number", { ascending: true });
-    const safeCarts = Array.isArray(carts) ? carts : [];
+    if (cartsError) {
+        return {
+            ok: false,
+            code: "db_error_carts",
+            error: `Karindeling niet leesbaar: ${cartsError.message}`,
+            permanent: false,
+        };
+    }
+    const indeling = (Array.isArray(carts) ? carts : []).map((c) => {
+        const cart = c;
+        const items = Array.isArray(cart["order_cart_items"])
+            ? cart["order_cart_items"]
+            : [];
+        return {
+            cartNumber: cart["cart_number"] ?? null,
+            carrierType: cart["carrier_type"] ?? null,
+            layersUsed: cart["total_layers_used"] ?? null,
+            items: items
+                .map((i) => ({
+                productId: i["product_id"] ?? null,
+                crates: i["crates"] ?? null,
+                boxes: i["boxes"] ?? null,
+            }))
+                .sort((a, b) => String(a.productId).localeCompare(String(b.productId))),
+        };
+    });
     const payload = {
-        orderRef,
-        fulfillmentOrderId: null,
-        salesOrderId: row["floriday_sales_order_id"] ?? null,
-        loadCarriers: safeCarts.map((c) => {
-            const cart = c;
-            const items = Array.isArray(cart["order_cart_items"])
-                ? cart["order_cart_items"]
-                : [];
-            return {
-                cartNumber: cart["cart_number"] ?? null,
-                carrierType: cart["carrier_type"] ?? null,
-                layersUsed: cart["total_layers_used"] ?? null,
-                maxLayers: cart["max_layers"] ?? null,
-                occupancyPct: cart["occupancy_pct"] ?? null,
-                weightKg: cart["weight_kg"] ?? null,
-                items: items
-                    .map((i) => ({
-                    productId: i["product_id"] ?? null,
-                    productName: i["product_name"] ?? null,
-                    crates: i["crates"] ?? null,
-                    boxes: i["boxes"] ?? null,
-                    plantsPerCrate: i["plants_per_crate"] ?? null,
-                }))
-                    .sort((a, b) => String(a.productId).localeCompare(String(b.productId))),
-            };
-        }),
+        deliveryOrderId: found.deliveryOrderId,
+        fulfillmentRequestIds: found.fulfillmentRequestIds,
     };
-    return { payload, hash: hashPayload(payload) };
+    // De hash bewaakt ook de karindeling, zodat een herindeling opnieuw pusht.
+    return { ok: true, payload, hash: hashPayload({ payload, indeling }) };
 }
 // ---------------------------------------------------------------------------
 // In de wachtrij zetten — snel, zonder netwerk, veilig overal aan te roepen
@@ -116,6 +191,21 @@ function isPermanent(status, message) {
         return true;
     return /validat|ongeldig|invalid|schema|not found|bestaat niet/i.test(message);
 }
+/** Korte, stabiele foutcode om later op te kunnen filteren. */
+function gatewayErrorCode(status, payloadOk) {
+    if (status === null)
+        return "unknown";
+    if (status >= 200 && status < 300)
+        return payloadOk === true ? "unknown" : "gateway_ok_unreadable";
+    if (status >= 500)
+        return "gateway_5xx";
+    if (status === 400 || status === 401 || status === 404 || status === 429) {
+        return `gateway_${status}`;
+    }
+    if (status >= 400)
+        return "gateway_4xx";
+    return "unknown";
+}
 export async function runFloridayPushQueue(sb, opts = {}) {
     const limit = opts.limit ?? FLORIDAY_PUSH_BATCH;
     const deadlineAt = opts.deadlineAt ?? Date.now() + 10000;
@@ -148,13 +238,18 @@ export async function runFloridayPushQueue(sb, opts = {}) {
         let error = null;
         let sentHash = null;
         let fulfillmentOrderId = null;
+        let gatewayStatus = null;
+        let errorCode = null;
+        let response = null;
         try {
             const built = await buildFloridayPayload(sb, orderRef);
-            if (!built) {
-                // Order bestaat niet (meer): niets te pushen, geen eindeloze retry.
+            if (!built.ok) {
+                // Wachttoestand (delivery-order nog niet gesynchroniseerd) of een
+                // databasefout; permanent alleen als de order zelf niet kan bestaan.
                 ok = false;
-                permanent = true;
-                error = "Order niet gevonden in de Engine.";
+                permanent = built.permanent;
+                error = built.error;
+                errorCode = built.code;
             }
             else if (built.hash === lastSentHash) {
                 // Identieke stand: niets versturen, wel als geslaagd afronden.
@@ -163,22 +258,41 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 out.skipped++;
             }
             else {
-                const res = (await sendFlorydayFulfillmentOrder(sb, built.payload));
-                ok = res?.ok === true;
+                const res = await sendFlorydayFulfillmentOrder(sb, built.payload);
+                gatewayStatus = typeof res?.status === "number" ? res.status : null;
+                // Nieuw contract: { status, payload: { ok, error, fulfillmentOrderId } }.
+                // Defensief: een oudere gatewayversie gaf ok/error op het hoogste niveau.
+                const payload = (res?.payload ?? null);
+                if (!payload && res && ("ok" in res || "error" in res)) {
+                    console.warn("[floridayPush] gateway gaf de oude responsvorm terug (ok/error op hoofdniveau)");
+                }
+                const payloadOk = payload?.ok ?? res?.ok;
+                const payloadError = payload?.error ?? res?.error;
+                ok = payloadOk === true;
                 sentHash = built.hash;
-                fulfillmentOrderId = built.payload.fulfillmentOrderId;
+                fulfillmentOrderId = payload?.fulfillmentOrderId ?? null;
+                response = {
+                    ok: payloadOk ?? null,
+                    error: payloadError ?? null,
+                    fulfillmentOrderId: payload?.fulfillmentOrderId ?? null,
+                };
                 if (!ok) {
-                    error = res?.error ?? "Floriday gaf geen bevestiging.";
-                    permanent = isPermanent(res?.status ?? null, error);
+                    error =
+                        payloadError && String(payloadError).length > 0
+                            ? String(payloadError)
+                            : `Floriday gaf geen bevestiging. (gatewaystatus ${gatewayStatus ?? "onbekend"})`;
+                    errorCode = gatewayErrorCode(gatewayStatus, payloadOk);
+                    permanent = isPermanent(gatewayStatus, error);
                 }
             }
         }
         catch (e) {
             error = String(e?.message ?? e);
+            errorCode = errorCode ?? "unknown";
             permanent = isPermanent(null, error);
         }
         try {
-            const { data: outcome } = await sb.rpc("logistics_floriday_finish_push", {
+            const { data: outcome } = await sb.rpc("logistics_floriday_finish_push_v2", {
                 _id: id,
                 _revision: revision,
                 _ok: ok,
@@ -186,6 +300,9 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 _fulfillment_order_id: fulfillmentOrderId,
                 _sent_hash: sentHash,
                 _permanent: permanent,
+                _gateway_status: gatewayStatus,
+                _error_code: errorCode,
+                _response: response,
             });
             const status = String(outcome ?? "");
             if (status === "sent")