@flowselections/logistiek-engine 1.0.99 → 1.0.100

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

@@ -8,6 +8,14 @@ export interface ControlScanRun {
 }
 /** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
 export declare const CONTROL_SCAN_MAX_ATTEMPTS = 60;
+/** Maximale wachttijd sinds goedkeuring (uren). */
+export declare const CONTROL_SCAN_MAX_HOURS = 24;
+/** Is de wachtgrens (pogingen of tijd) bereikt? */
+export declare function controlWaitExceeded(row: {
+    attempts?: number | null;
+    approved_at?: string | null;
+    created_at?: string | null;
+}, now?: number): "pogingen" | "tijd" | null;
 export declare function runControlScanQueue(sb: SupabaseClient, options?: {
     limit?: number;
 }): Promise<ControlScanRun>;

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

@@ -1 +1 @@
-{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAwC5C,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAmKzB"}
+{"version":3,"file":"controlScan.server.d.ts","sourceRoot":"","sources":["../../src/lib/controlScan.server.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAiBD,qFAAqF;AACrF,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAC5C,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAgBzC,mDAAmD;AACnD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC1F,GAAG,GAAE,MAAmB,GACvB,UAAU,GAAG,MAAM,GAAG,IAAI,CAK5B;AA6BD,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,OAAO,CAAC,cAAc,CAAC,CAiMzB"}

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

@@ -15,8 +15,12 @@
 // klantwaarden in deze code; de printer komt uit de werkwijze in de database.
 // ============================================================================
 import { printViaLayout } from "./layoutPrint.server.js";
+import { isFloridayCancelled, FLORIDAY_CANCELLED_REASON } from "./floridayCancellation.server.js";
+import { trace } from "./trace.server.js";
 /** Maximaal aantal wachtrondes op Floriday voordat de controle als mislukt stopt. */
 export const CONTROL_SCAN_MAX_ATTEMPTS = 60;
+/** Maximale wachttijd sinds goedkeuring (uren). */
+export const CONTROL_SCAN_MAX_HOURS = 24;
 function pickPdf(result) {
     const base64 = result["pdfBase64"] ??
         result["base64"] ??
@@ -28,20 +32,31 @@ function pickPdf(result) {
         null;
     return { base64: base64 ?? null, url: url ?? null };
 }
+/** Is de wachtgrens (pogingen of tijd) bereikt? */
+export function controlWaitExceeded(row, now = Date.now()) {
+    if (Number(row.attempts ?? 0) >= CONTROL_SCAN_MAX_ATTEMPTS)
+        return "pogingen";
+    const start = Date.parse(String(row.approved_at ?? row.created_at ?? ""));
+    if (Number.isFinite(start) && now - start >= CONTROL_SCAN_MAX_HOURS * 3600000)
+        return "tijd";
+    return null;
+}
 /**
- * Laat de controle wachten op Floriday. Pogingen blijven meetellen; na het
- * maximum eindigt de controle als mislukt in plaats van eeuwig te wachten.
+ * Laat de controle wachten op Floriday. Na het maximum (pogingen of 24 uur)
+ * eindigt de controle als mislukt in plaats van eeuwig te wachten.
  * Geeft true terug als de controle nu terminaal is afgesloten.
  */
 async function keepWaiting(sb, row) {
-    const attempts = Number(row.attempts ?? 0);
-    if (attempts >= CONTROL_SCAN_MAX_ATTEMPTS) {
+    const grens = controlWaitExceeded(row);
+    if (grens) {
         await sb.rpc("logistics_control_scan_finish", {
             _id: row.id,
             _ok: false,
             _status: "mislukt",
             _error_code: "wachtlimiet",
-            _error: `Na ${attempts} pogingen kende Floriday deze order nog steeds niet; de controle is gestopt. Controleer de order in Floriday en scan opnieuw.`,
+            _error: grens === "pogingen"
+                ? `Na ${row.attempts} pogingen kende Floriday deze order nog steeds niet; de controle is gestopt.`
+                : `Na ${CONTROL_SCAN_MAX_HOURS} uur kende Floriday deze order nog steeds niet; de controle is gestopt.`,
         });
         return true;
     }
@@ -84,6 +99,35 @@ export async function runControlScanQueue(sb, options = {}) {
                 run.failed++;
                 continue;
             }
+            // Geannuleerd in Floriday? Dan direct stoppen.
+            const annulering = await isFloridayCancelled(sb, {
+                orderId: row.order_id,
+                orderNumber: row.order_number,
+                fulfillmentOrderId: row.fulfillment_order_id ?? null,
+            });
+            if (annulering.cancelled) {
+                await sb.rpc("logistics_control_scan_finish", {
+                    _id: row.id,
+                    _ok: false,
+                    _status: "mislukt",
+                    _error_code: "floriday_geannuleerd",
+                    _error: `${FLORIDAY_CANCELLED_REASON} (${annulering.bron}).`,
+                });
+                await trace(sb, {
+                    orderRef: row.order_number,
+                    orderSource: "floriday",
+                    cartRef: row.cart_id,
+                    phase: "controle",
+                    step: "Afleverbrief gestopt: order geannuleerd",
+                    status: "mislukt",
+                    actor: "engine:controlepost",
+                    errorClass: "extern",
+                    reason: `${FLORIDAY_CANCELLED_REASON} (${annulering.bron}).`,
+                    error: FLORIDAY_CANCELLED_REASON,
+                });
+                run.failed++;
+                continue;
+            }
             // Stand van de push naar Floriday. De belading gaat via de bestaande
             // pushwachtrij; wij wachten tot Floriday de fulfillment-order kent.
             const { data: push } = await sb

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

@@ -0,0 +1,15 @@
+import type { SupabaseClient } from "@supabase/supabase-js";
+export type CancellationResult = {
+    cancelled: true;
+    bron: string;
+} | {
+    cancelled: false;
+    unknown?: boolean;
+};
+export declare const FLORIDAY_CANCELLED_REASON = "Floriday heeft deze order geannuleerd";
+export declare function isFloridayCancelled(sb: SupabaseClient, input: {
+    orderId?: string | null;
+    orderNumber?: string | null;
+    fulfillmentOrderId?: string | null;
+}): Promise<CancellationResult>;
+//# sourceMappingURL=floridayCancellation.server.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"floridayCancellation.server.d.ts","sourceRoot":"","sources":["../../src/lib/floridayCancellation.server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAC1B;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE5C,eAAO,MAAM,yBAAyB,0CAA0C,CAAC;AAIjF,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,cAAc,EAClB,KAAK,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAClG,OAAO,CAAC,kBAAkB,CAAC,CAuE7B"}

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

@@ -0,0 +1,89 @@
+// ============================================================================
+// src/lib/floridayCancellation.server.ts — is de order in Floriday geannuleerd?
+// ============================================================================
+// Leest alleen de gegevens die de Floriday-koppelmodule al periodiek ophaalt
+// (salesorders, fulfillment-orders, delivery-orders). Geen extra API-aanroep.
+// Niet leesbaar of geen gegevens => "onbekend": de wachtlus gaat dan gewoon
+// door en de eindgrens vangt het op. Er wordt nooit een annulering verzonnen.
+// ============================================================================
+export const FLORIDAY_CANCELLED_REASON = "Floriday heeft deze order geannuleerd";
+const isCancelledStatus = (s) => String(s ?? "").toUpperCase() === "CANCELLED";
+export async function isFloridayCancelled(sb, input) {
+    try {
+        let unknown = false;
+        // Salesorder-id: eerst van de order zelf, anders via de nummerkoppeling.
+        let salesOrderId = null;
+        if (input.orderId) {
+            const { data, error } = await sb
+                .from("orders")
+                .select("floriday_sales_order_id")
+                .eq("id", input.orderId)
+                .maybeSingle();
+            if (error)
+                unknown = true;
+            salesOrderId = String(data?.floriday_sales_order_id ?? "").trim() || null;
+        }
+        if (!salesOrderId && input.orderNumber) {
+            const { data, error } = await sb
+                .from("floriday_order_number_map")
+                .select("floriday_id")
+                .eq("order_number", input.orderNumber)
+                .limit(1)
+                .maybeSingle();
+            if (error)
+                unknown = true;
+            salesOrderId = String(data?.floriday_id ?? "").trim() || null;
+        }
+        if (salesOrderId) {
+            const { data, error } = await sb
+                .from("floriday_salesorders_cache")
+                .select("status, is_deleted, data")
+                .eq("floriday_id", salesOrderId)
+                .maybeSingle();
+            if (error)
+                unknown = true;
+            const so = data;
+            if (so) {
+                if (isCancelledStatus(so.status) || isCancelledStatus(so.data?.status)) {
+                    return { cancelled: true, bron: "salesorder" };
+                }
+                if (so.data?.automaticallyCancelledOn)
+                    return { cancelled: true, bron: "salesorder (automatisch geannuleerd)" };
+            }
+        }
+        if (input.fulfillmentOrderId) {
+            const { data, error } = await sb
+                .from("floriday_fulfillment_orders_cache")
+                .select("status, is_deleted, delivery_order_id")
+                .eq("floriday_id", input.fulfillmentOrderId)
+                .maybeSingle();
+            if (error)
+                unknown = true;
+            const fo = data;
+            if (fo) {
+                if (isCancelledStatus(fo.status))
+                    return { cancelled: true, bron: "fulfillment-order" };
+                if (fo.is_deleted === true)
+                    return { cancelled: true, bron: "fulfillment-order (verwijderd)" };
+                if (fo.delivery_order_id) {
+                    const { data: d, error: dErr } = await sb
+                        .from("floriday_delivery_orders_cache")
+                        .select("status, is_deleted")
+                        .eq("floriday_id", fo.delivery_order_id)
+                        .maybeSingle();
+                    if (dErr)
+                        unknown = true;
+                    const del = d;
+                    if (del && isCancelledStatus(del.status))
+                        return { cancelled: true, bron: "delivery-order" };
+                    if (del && del.is_deleted === true)
+                        return { cancelled: true, bron: "delivery-order (verwijderd)" };
+                }
+            }
+        }
+        return unknown ? { cancelled: false, unknown: true } : { cancelled: false };
+    }
+    catch {
+        return { cancelled: false, unknown: true };
+    }
+}

package/dist-lib/lib/floridayCancellation.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floridayCancellation.test.d.ts.map

package/dist-lib/lib/floridayCancellation.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floridayCancellation.test.d.ts","sourceRoot":"","sources":["../../src/lib/floridayCancellation.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/floridayCancellation.test.js

@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+import { isFloridayCancelled } from "./floridayCancellation.server";
+import { controlWaitExceeded } from "./controlScan.server";
+function stub(rows) {
+    return {
+        from(table) {
+            const q = {
+                select: () => q,
+                eq: () => q,
+                limit: () => q,
+                maybeSingle: async () => {
+                    const r = rows[table];
+                    return r === "error" ? { data: null, error: { message: "x" } } : { data: r ?? null, error: null };
+                },
+            };
+            return q;
+        },
+    };
+}
+describe("isFloridayCancelled", () => {
+    it("geannuleerde salesorder", async () => {
+        const r = await isFloridayCancelled(stub({ orders: { floriday_sales_order_id: "so1" }, floriday_salesorders_cache: { status: "CANCELLED", data: {} } }), { orderId: "o1" });
+        expect(r.cancelled).toBe(true);
+    });
+    it("geannuleerde fulfillment-order", async () => {
+        const r = await isFloridayCancelled(stub({ orders: null, floriday_fulfillment_orders_cache: { status: "CANCELLED" } }), { orderId: "o1", fulfillmentOrderId: "fo1" });
+        expect(r).toEqual({ cancelled: true, bron: "fulfillment-order" });
+    });
+    it("onleesbare gegevens => niet geannuleerd, onbekend", async () => {
+        const r = await isFloridayCancelled(stub({ orders: "error", floriday_order_number_map: "error" }), {
+            orderId: "o1",
+            orderNumber: "FO-1",
+        });
+        expect(r).toEqual({ cancelled: false, unknown: true });
+    });
+});
+describe("controlWaitExceeded", () => {
+    const now = Date.parse("2026-10-02T12:00:00Z");
+    it("na 24 uur", () => expect(controlWaitExceeded({ attempts: 3, approved_at: "2026-10-01T11:00:00Z" }, now)).toBe("tijd"));
+    it("na 60 pogingen", () => expect(controlWaitExceeded({ attempts: 60 }, now)).toBe("pogingen"));
+    it("binnen grens", () => expect(controlWaitExceeded({ attempts: 5, approved_at: "2026-10-02T10:00:00Z" }, now)).toBeNull());
+});