@flowselections/logistiek-engine 1.0.12 → 1.0.14

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

@@ -4,38 +4,56 @@ export declare const FLORIDAY_PUSH_LEASE_SECONDS = 120;
 /** FNV-1a, 64 bits als hex. Geen crypto nodig, deterministisch in elke runtime. */
 export declare function hashPayload(value: unknown): string;
 export interface FloridayPushPayload {
-    orderRef: string;
-    fulfillmentOrderId: string | null;
-    salesOrderId: string | null;
-    loadCarriers: Array<{
-        cartNumber: number | null;
-        carrierType: string | null;
-        layersUsed: number | null;
-        maxLayers: number | null;
-        occupancyPct: number | null;
-        weightKg: number | null;
-        items: Array<{
-            productId: string | null;
-            productName: string | null;
-            crates: number | null;
-            boxes: number | null;
-            plantsPerCrate: number | null;
-        }>;
-    }>;
+    deliveryOrderId: string;
+    fulfillmentRequestIds: string[];
 }
-/** Bouwt de gewenste stand voor één order. null = niets te pushen. */
-export declare function buildFloridayPayload(sb: SupabaseClient, orderRef: string): Promise<{
+export type BuildResult = {
+    ok: true;
     payload: FloridayPushPayload;
     hash: string;
-} | null>;
+} | {
+    ok: false;
+    code: string;
+    error: string;
+    permanent: boolean;
+};
+/**
+ * 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 declare function findDeliveryOrderForSalesOrder(sb: SupabaseClient, salesOrderId: string): Promise<{
+    ok: true;
+    deliveryOrderId: string;
+    fulfillmentRequestIds: string[];
+    matches: number;
+} | {
+    ok: false;
+    code: string;
+    error: string;
+}>;
+/** Bouwt de gewenste stand voor één order. */
+export declare function buildFloridayPayload(sb: SupabaseClient, orderRef: string): Promise<BuildResult>;
 export declare function queueFloridayPush(sb: SupabaseClient, orderRef: string): Promise<void>;
 export declare function queueFloridayPushes(sb: SupabaseClient, orderRefs: string[]): Promise<void>;
+/**
+ * Uitkomst van één push, zoals die aan de database wordt doorgegeven.
+ * - "ok"                → verstuurd (of identieke stand, niets te doen)
+ * - "error"             → mislukt, mogelijk opnieuw proberen
+ * - "already_fulfilled" → Floriday had de order al afgehandeld; eindstatus
+ * - "not_applicable"    → order bestaat niet (meer) bij ons; eindstatus
+ */
+export type PushOutcome = "ok" | "error" | "already_fulfilled" | "not_applicable";
 export interface PushQueueResult {
     claimed: number;
     sent: number;
     skipped: number;
     failed: number;
     retried: number;
+    alreadyFulfilled: number;
+    notApplicable: number;
+    /** Statuswaarden die we niet kennen — nooit stilzwijgend laten verdwijnen. */
+    unknown: number;
 }
 export declare function runFloridayPushQueue(sb: SupabaseClient, opts?: {
     limit?: number;

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;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,CAyH1B;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;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,OAAO,GAAG,mBAAmB,GAAG,gBAAgB,CAAC;AAElF,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;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,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,CA0J1B;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
@@ -134,7 +209,16 @@ function gatewayErrorCode(status, payloadOk) {
 export async function runFloridayPushQueue(sb, opts = {}) {
     const limit = opts.limit ?? FLORIDAY_PUSH_BATCH;
     const deadlineAt = opts.deadlineAt ?? Date.now() + 10000;
-    const out = { claimed: 0, sent: 0, skipped: 0, failed: 0, retried: 0 };
+    const out = {
+        claimed: 0,
+        sent: 0,
+        skipped: 0,
+        failed: 0,
+        retried: 0,
+        alreadyFulfilled: 0,
+        notApplicable: 0,
+        unknown: 0,
+    };
     let claimed = [];
     try {
         const { data } = await sb.rpc("logistics_floriday_claim_pushes", {
@@ -158,7 +242,7 @@ export async function runFloridayPushQueue(sb, opts = {}) {
         const revision = Number(item["revision"] ?? 0);
         const orderRef = String(item["order_ref"] ?? "");
         const lastSentHash = item["last_sent_hash"] ?? null;
-        let ok = false;
+        let outcome = "error";
         let permanent = false;
         let error = null;
         let sentHash = null;
@@ -168,16 +252,19 @@ export async function runFloridayPushQueue(sb, opts = {}) {
         let response = null;
         try {
             const built = await buildFloridayPayload(sb, orderRef);
-            if (!built) {
-                // Order bestaat niet (meer): niets te pushen, geen eindeloze retry.
-                ok = false;
-                permanent = true;
-                error = "Order niet gevonden in de Engine.";
-                errorCode = "order_missing";
+            if (!built.ok) {
+                // Wachttoestand (delivery-order nog niet gesynchroniseerd) of een
+                // databasefout; permanent alleen als de order zelf niet kan bestaan.
+                // order_missing / sales_order_missing worden in de database vertaald
+                // naar de eindstatus not_applicable.
+                outcome = "error";
+                permanent = built.permanent;
+                error = built.error;
+                errorCode = built.code;
             }
             else if (built.hash === lastSentHash) {
                 // Identieke stand: niets versturen, wel als geslaagd afronden.
-                ok = true;
+                outcome = "ok";
                 sentHash = built.hash;
                 out.skipped++;
             }
@@ -192,16 +279,24 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 }
                 const payloadOk = payload?.ok ?? res?.ok;
                 const payloadError = payload?.error ?? res?.error;
-                ok = payloadOk === true;
+                // TODO(already_fulfilled): zodra de auth-module (@flowselections/
+                // floriday-authenticatie-module) de uitkomst "al afgehandeld" publiceert,
+                // hier de herkenning inbouwen op basis van het gepubliceerde veld —
+                // NIET op tekstmatching van last_error. Zet dan:
+                //   outcome = "already_fulfilled"; sentHash = built.hash;
+                //   errorCode = "already_fulfilled";
+                // Het veld is nog niet vastgesteld: in de nu beschikbare gatewayversie
+                // bestaat de code "already_fulfilled" niet. Tot die tijd blijft dit pad
+                // ongebruikt; de statuswaarde is verder overal al doorgevoerd.
+                outcome = payloadOk === true ? "ok" : "error";
                 sentHash = built.hash;
-                fulfillmentOrderId =
-                    payload?.fulfillmentOrderId ?? built.payload.fulfillmentOrderId ?? null;
+                fulfillmentOrderId = payload?.fulfillmentOrderId ?? null;
                 response = {
                     ok: payloadOk ?? null,
                     error: payloadError ?? null,
                     fulfillmentOrderId: payload?.fulfillmentOrderId ?? null,
                 };
-                if (!ok) {
+                if (outcome !== "ok") {
                     error =
                         payloadError && String(payloadError).length > 0
                             ? String(payloadError)
@@ -212,15 +307,16 @@ export async function runFloridayPushQueue(sb, opts = {}) {
             }
         }
         catch (e) {
+            outcome = "error";
             error = String(e?.message ?? e);
             errorCode = errorCode ?? "unknown";
             permanent = isPermanent(null, error);
         }
         try {
-            const { data: outcome } = await sb.rpc("logistics_floriday_finish_push_v2", {
+            const { data: finished } = await sb.rpc("logistics_floriday_finish_push_v3", {
                 _id: id,
                 _revision: revision,
-                _ok: ok,
+                _outcome: outcome,
                 _error: error,
                 _fulfillment_order_id: fulfillmentOrderId,
                 _sent_hash: sentHash,
@@ -229,13 +325,24 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                 _error_code: errorCode,
                 _response: response,
             });
-            const status = String(outcome ?? "");
+            const status = String(finished ?? "");
             if (status === "sent")
                 out.sent++;
             else if (status === "failed")
                 out.failed++;
             else if (status === "pending")
                 out.retried++;
+            else if (status === "already_fulfilled")
+                out.alreadyFulfilled++;
+            else if (status === "not_applicable")
+                out.notApplicable++;
+            else if (status === "superseded" || status === "missing") {
+                // Rij is intussen opnieuw in de wachtrij gezet of verwijderd; geen teller.
+            }
+            else {
+                out.unknown++;
+                console.warn(`[floridayPush] onbekende afrondstatus '${status}' voor order ${orderRef}`);
+            }
         }
         catch {
             // Lease loopt vanzelf af; de volgende tick pakt de rij opnieuw op.