@flowselections/floriday-authenticatie-module 1.0.40 → 1.0.42

package/dist-lib/lib/gateway/fulfillment-order-body.d.ts

@@ -0,0 +1,57 @@
+import type { SupabaseClient } from "@supabase/supabase-js";
+export declare function deriveFulfillmentOrderId(deliveryOrderId: string): Promise<string>;
+export declare function resolvePackageCount(req: any): number | null;
+export interface SkippedFulfillmentRequest {
+    fulfillmentRequestId: string;
+    reason: "load_carrier_none" | "already_claimed";
+}
+export type BuildFulfillmentOrderBodyResult = {
+    kind: "body";
+    body: Record<string, unknown>;
+    fulfillmentOrderId: string;
+    usedRequestIds: string[];
+    skipped: SkippedFulfillmentRequest[];
+} | {
+    kind: "already_fulfilled";
+    code: "already_fulfilled";
+    source: FulfillmentDetectionSource;
+    message: string;
+    fulfillmentOrderId?: string;
+    skipped: SkippedFulfillmentRequest[];
+} | {
+    kind: "error";
+    error: string;
+    /** false = tijdelijk (opnieuw proberen kan slagen na sync). */
+    permanent: boolean;
+};
+export interface BuildFulfillmentOrderBodyInput {
+    connectionId: string;
+    deliveryOrderId: string;
+    /** De `data`-kolom van floriday_delivery_orders_cache. */
+    deliveryOrderData: any;
+    /** Optionele filter op fulfillmentRequestId (gateway-pad). */
+    fulfillmentRequestIds?: string[] | null;
+}
+export type FulfillmentDetectionSource = "delivery_order_claims" | "fulfillment_orders_cache";
+export type FulfillmentDetection = {
+    code: "already_fulfilled";
+    source: FulfillmentDetectionSource;
+    message: string;
+    fulfillmentOrderId?: string;
+    skipped: SkippedFulfillmentRequest[];
+} | {
+    code: "delivery_order_not_cached";
+    message: string;
+} | {
+    code: "not_fulfilled";
+};
+export interface DetectFulfillmentStateInput {
+    connectionId: string;
+    deliveryOrderId: string;
+    /** Optioneel: de al gelezen `data`-kolom. Ontbreekt hij, dan lezen we zelf. */
+    deliveryOrderData?: any;
+    fulfillmentRequestIds?: string[] | null;
+}
+export declare function detectFulfillmentState(supabase: SupabaseClient, input: DetectFulfillmentStateInput): Promise<FulfillmentDetection>;
+export declare function buildFulfillmentOrderBody(supabase: SupabaseClient, input: BuildFulfillmentOrderBodyInput): Promise<BuildFulfillmentOrderBodyResult>;
+//# sourceMappingURL=fulfillment-order-body.d.ts.map

package/dist-lib/lib/gateway/fulfillment-order-body.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fulfillment-order-body.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-body.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAqD5D,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjF;AAWD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAO3D;AAMD,MAAM,WAAW,yBAAyB;IACxC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,CAAC;CACjD;AAED,MAAM,MAAM,+BAA+B,GACvC;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,yBAAyB,EAAE,CAAC;CACtC,GACD;IACE,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,0BAA0B,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,yBAAyB,EAAE,CAAC;CACtC,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,+DAA+D;IAC/D,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEN,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,iBAAiB,EAAE,GAAG,CAAC;IACvB,8DAA8D;IAC9D,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACzC;AAqBD,MAAM,MAAM,0BAA0B,GAClC,uBAAuB,GACvB,0BAA0B,CAAC;AAE/B,MAAM,MAAM,oBAAoB,GAC5B;IACE,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,0BAA0B,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,yBAAyB,EAAE,CAAC;CACtC,GACD;IACE,IAAI,EAAE,2BAA2B,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC;AAyC9B,MAAM,WAAW,2BAA2B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACzC;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,2BAA2B,GACjC,OAAO,CAAC,oBAAoB,CAAC,CA0D/B;AAOD,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,8BAA8B,GACpC,OAAO,CAAC,+BAA+B,CAAC,CA2N1C"}

package/dist-lib/lib/gateway/fulfillment-order-body.js

@@ -0,0 +1,361 @@
+// Gedeelde bodybouwer voor de Floriday fulfillment-order push (2026v1).
+//
+// Eén implementatie voor beide paden:
+//   - src/lib/gateway/fulfillment-order-send.ts (gateway-endpoint)
+//   - src/lib/floriday-auto-process.server.ts   (auto-process / cron-scan)
+//
+// De body wordt volledig opgebouwd uit de delivery-order-cache plus een join
+// op de sales-order-cache; er wordt niets verzonnen. Ontbrekende gegevens
+// leiden tot een expliciete fout, nooit tot een stille aanname.
+// ---------------------------------------------------------------------------
+// fulfillmentOrderId — deterministische UUIDv5
+// ---------------------------------------------------------------------------
+//
+// WAAROM DETERMINISTISCH:
+// Floriday vereist een client-side `fulfillmentOrderId` met een non-default
+// waarde. Een random UUID zou bij elke retry een nieuwe fulfillment-order
+// aanmaken: een netwerkfout of timeout na een geslaagde POST zou dan tot een
+// dubbele fulfilment leiden. Door de GUID deterministisch af te leiden uit de
+// deliveryOrderId (UUIDv5, vaste namespace hieronder) levert elke retry exact
+// dezelfde waarde op en dedupliceert Floriday zelf. Er is daarom géén extra
+// databasekolom en géén opslag nodig.
+//
+// BEPERKING:
+// Deze afleiding geeft precies één fulfillment-order per delivery-order.
+// Wil je ooit een delivery-order in meerdere fulfillment-orders splitsen
+// (bijvoorbeeld per ladingdrager in aparte pushes), dan moet de afleiding
+// worden uitgebreid met een discriminator én moet de gekozen waarde worden
+// vastgelegd, anders overschrijven de pushes elkaars identiteit.
+const FULFILLMENT_ORDER_NAMESPACE = "6f9a1e2c-7d34-4c1b-9a5e-3b8f0d2c4a71";
+// Web Crypto in plaats van node:crypto — dit bestand wordt ook client-side
+// gebundeld; Node-builtins bestaan daar niet.
+function toHex(bytes) {
+    return Array.from(bytes)
+        .map((b) => b.toString(16).padStart(2, "0"))
+        .join("");
+}
+async function uuidV5(name, namespace) {
+    const hex = namespace.replace(/-/g, "");
+    if (hex.length !== 32)
+        throw new Error("Ongeldige namespace-GUID");
+    const nsBytes = new Uint8Array(16);
+    for (let i = 0; i < 16; i++) {
+        nsBytes[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    }
+    const nameBytes = new TextEncoder().encode(name);
+    const input = new Uint8Array(nsBytes.length + nameBytes.length);
+    input.set(nsBytes, 0);
+    input.set(nameBytes, nsBytes.length);
+    const digest = new Uint8Array(await globalThis.crypto.subtle.digest("SHA-1", input));
+    const bytes = digest.slice(0, 16);
+    bytes[6] = (bytes[6] & 0x0f) | 0x50; // versie 5
+    bytes[8] = (bytes[8] & 0x3f) | 0x80; // RFC 4122 variant
+    const h = toHex(bytes);
+    return `${h.slice(0, 8)}-${h.slice(8, 12)}-${h.slice(12, 16)}-${h.slice(16, 20)}-${h.slice(20)}`;
+}
+export function deriveFulfillmentOrderId(deliveryOrderId) {
+    return uuidV5(deliveryOrderId, FULFILLMENT_ORDER_NAMESPACE);
+}
+// ---------------------------------------------------------------------------
+// numberOfPackages
+// ---------------------------------------------------------------------------
+//
+// In de delivery-order-cache is `numberOfPackages` in alle rijen 0; het
+// werkelijke aantal staat in `initialNumberOfPackages` (en wordt bevestigd
+// door fulfillmentOrderClaims[].claimedNumberOfPackages). Deze functie valt
+// NOOIT stil terug op 1: een ontbrekend aantal is een fout.
+export function resolvePackageCount(req) {
+    const candidates = [req?.initialNumberOfPackages, req?.numberOfPackages];
+    for (const c of candidates) {
+        const n = Number(c);
+        if (Number.isFinite(n) && n > 0)
+            return n;
+    }
+    return null;
+}
+/** Pure scan van de claims op de (gefilterde) fulfillmentRequests. */
+function scanClaims(doData, filterIds) {
+    const requests = Array.isArray(doData?.fulfillmentRequests)
+        ? doData.fulfillmentRequests
+        : [];
+    const claimed = [];
+    let unclaimedCount = 0;
+    let consideredCount = 0;
+    let fulfillmentOrderId;
+    for (const r of requests) {
+        const id = r?.fulfillmentRequestId ?? r?.id;
+        if (!id)
+            continue;
+        if (filterIds && !filterIds.includes(String(id)))
+            continue;
+        consideredCount += 1;
+        const claims = Array.isArray(r?.fulfillmentOrderClaims)
+            ? r.fulfillmentOrderClaims
+            : [];
+        if (claims.length > 0) {
+            claimed.push({ fulfillmentRequestId: String(id), reason: "already_claimed" });
+            if (!fulfillmentOrderId) {
+                const fromClaim = claims.find((c) => c?.fulfillmentOrderId)?.fulfillmentOrderId;
+                if (fromClaim)
+                    fulfillmentOrderId = String(fromClaim);
+            }
+        }
+        else {
+            unclaimedCount += 1;
+        }
+    }
+    return { claimed, unclaimedCount, consideredCount, fulfillmentOrderId };
+}
+export async function detectFulfillmentState(supabase, input) {
+    const { connectionId, deliveryOrderId } = input;
+    const filterIds = Array.isArray(input.fulfillmentRequestIds)
+        ? input.fulfillmentRequestIds.map((s) => String(s))
+        : null;
+    let doData = input.deliveryOrderData ?? null;
+    if (!doData && deliveryOrderId) {
+        const { data: doRow } = await supabase
+            .from("floriday_delivery_orders_cache")
+            .select("floriday_id, data")
+            .eq("connection_id", connectionId)
+            .eq("floriday_id", deliveryOrderId)
+            .maybeSingle();
+        doData = doRow?.data ?? null;
+    }
+    // ─ Bron (a): claims op de delivery-order-cache ───────────────────────────
+    if (doData) {
+        const scan = scanClaims(doData, filterIds);
+        if (scan.consideredCount > 0 && scan.unclaimedCount === 0) {
+            return {
+                code: "already_fulfilled",
+                source: "delivery_order_claims",
+                message: "Al afgehandeld bij Floriday",
+                fulfillmentOrderId: scan.fulfillmentOrderId,
+                skipped: scan.claimed,
+            };
+        }
+    }
+    // ─ Bron (b): fulfillment-order-cache (zie het commentaarblok hierboven) ──
+    if (deliveryOrderId) {
+        const { data: existing } = await supabase
+            .from("floriday_fulfillment_orders_cache")
+            .select("floriday_id")
+            .eq("connection_id", connectionId)
+            .eq("delivery_order_id", deliveryOrderId)
+            .maybeSingle();
+        if (existing?.floriday_id) {
+            return {
+                code: "already_fulfilled",
+                source: "fulfillment_orders_cache",
+                message: "Al afgehandeld bij Floriday",
+                fulfillmentOrderId: String(existing.floriday_id),
+                skipped: [],
+            };
+        }
+    }
+    if (!doData) {
+        return {
+            code: "delivery_order_not_cached",
+            message: "Delivery-order niet in cache — sync eerst",
+        };
+    }
+    return { code: "not_fulfilled" };
+}
+// ---------------------------------------------------------------------------
+// De bodybouwer
+// ---------------------------------------------------------------------------
+export async function buildFulfillmentOrderBody(supabase, input) {
+    const { connectionId, deliveryOrderId, deliveryOrderData } = input;
+    const doData = deliveryOrderData ?? {};
+    const allRequests = Array.isArray(doData.fulfillmentRequests)
+        ? doData.fulfillmentRequests
+        : [];
+    if (allRequests.length === 0) {
+        return {
+            kind: "error",
+            error: "Delivery-order bevat geen fulfillmentRequests",
+            permanent: true,
+        };
+    }
+    const filterIds = Array.isArray(input.fulfillmentRequestIds)
+        ? input.fulfillmentRequestIds.map((s) => String(s))
+        : null;
+    const skipped = [];
+    const candidates = [];
+    for (const r of allRequests) {
+        const id = r?.fulfillmentRequestId ?? r?.id;
+        if (!id) {
+            return {
+                kind: "error",
+                error: "fulfillmentRequest zonder fulfillmentRequestId in delivery-order",
+                permanent: true,
+            };
+        }
+        if (filterIds && !filterIds.includes(String(id)))
+            continue;
+        // Veiligheidscheck: bestaat er al een fulfillment-order bij Floriday?
+        const claims = Array.isArray(r?.fulfillmentOrderClaims)
+            ? r.fulfillmentOrderClaims
+            : [];
+        if (claims.length > 0) {
+            skipped.push({ fulfillmentRequestId: String(id), reason: "already_claimed" });
+            continue;
+        }
+        // Ladingdrager komt per request uit de delivery-order; "NONE" slaan we over.
+        const loadCarrier = String(r?.loadCarrier ?? "").trim();
+        if (!loadCarrier || loadCarrier === "NONE") {
+            skipped.push({ fulfillmentRequestId: String(id), reason: "load_carrier_none" });
+            continue;
+        }
+        candidates.push(r);
+    }
+    if (candidates.length === 0) {
+        const allClaimed = skipped.length > 0 && skipped.every((s) => s.reason === "already_claimed");
+        if (allClaimed) {
+            return {
+                kind: "already_fulfilled",
+                code: "already_fulfilled",
+                source: "delivery_order_claims",
+                message: "Al afgehandeld bij Floriday",
+                fulfillmentOrderId: scanClaims(doData, filterIds).fulfillmentOrderId,
+                skipped,
+            };
+        }
+        return {
+            kind: "error",
+            error: "Geen verstuurbare fulfillmentRequests: alle requests zijn overgeslagen " +
+                `(${skipped.map((s) => `${s.fulfillmentRequestId}=${s.reason}`).join(", ") || "geen"})`,
+            permanent: true,
+        };
+    }
+    // ─ Join: tradeItemId + organisatie-id's uit de sales-order-cache ─────────
+    const salesOrderIds = Array.from(new Set(candidates
+        .map((r) => (r?.salesOrderId ? String(r.salesOrderId) : ""))
+        .filter(Boolean)));
+    if (salesOrderIds.length === 0) {
+        return {
+            kind: "error",
+            error: "fulfillmentRequests zonder salesOrderId — tradeItemId niet te bepalen",
+            permanent: true,
+        };
+    }
+    const { data: soRows, error: soError } = await supabase
+        .from("floriday_salesorders_cache")
+        .select("floriday_id, data")
+        .eq("connection_id", connectionId)
+        .in("floriday_id", salesOrderIds);
+    if (soError) {
+        return {
+            kind: "error",
+            error: `Sales-orders lezen mislukt: ${soError.message}`,
+            permanent: false,
+        };
+    }
+    const soById = new Map();
+    for (const row of (soRows ?? [])) {
+        soById.set(String(row.floriday_id), row.data ?? {});
+    }
+    const missing = salesOrderIds.filter((id) => !soById.has(id));
+    if (missing.length > 0) {
+        return {
+            kind: "error",
+            error: `Sales-order(s) niet in cache — sync eerst: ${missing.join(", ")}`,
+            permanent: false,
+        };
+    }
+    const firstSo = soById.get(String(candidates[0].salesOrderId));
+    const supplierOrganizationId = firstSo?.supplierOrganizationId ?? null;
+    if (!supplierOrganizationId) {
+        return {
+            kind: "error",
+            error: "supplierOrganizationId ontbreekt op de gekoppelde sales-order",
+            permanent: false,
+        };
+    }
+    // ─ Groeperen per loadCarrier-waarde ──────────────────────────────────────
+    const groups = new Map();
+    for (const r of candidates) {
+        const key = String(r.loadCarrier).trim();
+        const list = groups.get(key);
+        if (list)
+            list.push(r);
+        else
+            groups.set(key, [r]);
+    }
+    const usedRequestIds = [];
+    const loadCarriers = [];
+    let carrierIndex = 0;
+    for (const [loadCarrierType, reqs] of groups) {
+        carrierIndex += 1;
+        const items = [];
+        let itemIndex = 0;
+        for (const r of reqs) {
+            const id = String(r?.fulfillmentRequestId ?? r?.id);
+            const count = resolvePackageCount(r);
+            if (count === null) {
+                return {
+                    kind: "error",
+                    error: `Aantal pakketten ontbreekt op fulfillmentRequest ${id}`,
+                    permanent: true,
+                };
+            }
+            const so = soById.get(String(r.salesOrderId));
+            const tradeItemId = so?.tradeItemId ?? null;
+            if (!tradeItemId) {
+                return {
+                    kind: "error",
+                    error: `tradeItemId ontbreekt op sales-order ${r.salesOrderId}`,
+                    permanent: false,
+                };
+            }
+            itemIndex += 1;
+            items.push({
+                sortIndex: itemIndex,
+                fulfillmentRequestId: id,
+                salesOrderId: String(r.salesOrderId),
+                tradeItemId,
+                numberOfPackages: count,
+            });
+            usedRequestIds.push(id);
+        }
+        loadCarriers.push({
+            sortIndex: carrierIndex,
+            loadCarrierType,
+            numberOfAdditionalLayers: 0,
+            loadCarrierItems: items,
+        });
+    }
+    const fulfillmentOrderId = await deriveFulfillmentOrderId(deliveryOrderId);
+    const body = {
+        type: "DIRECT_SALES",
+        fulfillmentOrderId,
+        supplierOrganizationId,
+        fulfillingOrganizationId: supplierOrganizationId,
+        despatchWarehouseId: doData.despatchWarehouseId ?? null,
+        latestDeliveryDateTime: doData.deliveryDateTime ?? null,
+        oneLabelOnly: false,
+        destination: doData.destination ?? null,
+        loadCarriers,
+    };
+    if (!body.despatchWarehouseId) {
+        return {
+            kind: "error",
+            error: "despatchWarehouseId ontbreekt in de delivery-order-cache",
+            permanent: false,
+        };
+    }
+    if (!body.latestDeliveryDateTime) {
+        return {
+            kind: "error",
+            error: "deliveryDateTime ontbreekt in de delivery-order-cache",
+            permanent: false,
+        };
+    }
+    if (!body.destination) {
+        return {
+            kind: "error",
+            error: "destination ontbreekt in de delivery-order-cache",
+            permanent: false,
+        };
+    }
+    return { kind: "body", body, fulfillmentOrderId, usedRequestIds, skipped };
+}

package/dist-lib/lib/gateway/fulfillment-order-send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fulfillment-order-send.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-send.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAkB5D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC,CA8GrC;AAcD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAmCnB"}
+{"version":3,"file":"fulfillment-order-send.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/fulfillment-order-send.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC,CA0JrC;AAeD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAmCnB"}

package/dist-lib/lib/gateway/fulfillment-order-send.js

@@ -2,20 +2,7 @@
 // Spiegel van src/routes/api/public/gateway/fulfillment-order.send.ts.
 import { resolveGatewayEnvironment } from "./shared.js";
 import { florydayWrite, getActiveFlorydayCredentials } from "../floriday.functions.js";
-function extractPackageCount(req) {
-    const candidates = [
-        req?.numberOfPackages,
-        req?.packageCount,
-        req?.numberOfLoadCarriers,
-        req?.quantity,
-    ];
-    for (const c of candidates) {
-        const n = Number(c);
-        if (Number.isFinite(n) && n > 0)
-            return n;
-    }
-    return 1;
-}
+import { buildFulfillmentOrderBody, detectFulfillmentState, } from "./fulfillment-order-body.js";
 export async function runFulfillmentOrderSend(supabase, body, caller) {
     const deliveryOrderId = String(body?.deliveryOrderId ?? "").trim();
     const explicitLoadCarrierItems = Array.isArray(body?.loadCarrierItems)
@@ -29,28 +16,53 @@ export async function runFulfillmentOrderSend(supabase, body, caller) {
             payload: { ok: false, error: `Geen actieve Floriday-koppeling voor ${env}` },
         };
     }
-    // Idempotency: is er al een fulfillment-order voor deze delivery?
-    if (deliveryOrderId) {
-        const { data: existing } = await supabase
-            .from("floriday_fulfillment_orders_cache")
-            .select("floriday_id")
-            .eq("connection_id", conn.id)
-            .eq("delivery_order_id", deliveryOrderId)
-            .maybeSingle();
-        if (existing?.floriday_id) {
-            return {
-                status: 200,
-                payload: {
-                    ok: true,
-                    skipped: true,
-                    fulfillmentOrderId: existing.floriday_id,
-                },
-            };
-        }
+    const fulfillmentRequestIds = Array.isArray(body?.fulfillmentRequestIds)
+        ? body.fulfillmentRequestIds.map((s) => String(s))
+        : null;
+    // Detectie "al afgehandeld" — één functie, twee bronnen, één uitkomst.
+    // Deze check geldt voor BEIDE paden: ook een caller die zelf
+    // `loadCarrierItems` meestuurt (passthrough) komt hier langs, zodat er langs
+    // geen enkel pad een dubbele fulfillment-order bij Floriday kan ontstaan.
+    const detection = await detectFulfillmentState(supabase, {
+        connectionId: conn.id,
+        deliveryOrderId,
+        fulfillmentRequestIds,
+    });
+    if (detection.code === "already_fulfilled") {
+        return {
+            status: 200,
+            payload: {
+                ok: true,
+                code: "already_fulfilled",
+                // `skipped` blijft staan als alias van het codeveld.
+                skipped: true,
+                source: detection.source,
+                reason: detection.message,
+                fulfillmentOrderId: detection.fulfillmentOrderId,
+                skippedRequests: detection.skipped,
+            },
+        };
     }
-    // Body opbouwen — hetzij passthrough, hetzij vanuit cache.
-    let loadCarrierItems = explicitLoadCarrierItems;
-    if (!loadCarrierItems) {
+    if (detection.code === "delivery_order_not_cached") {
+        // Niet stilzwijgend versturen: zonder cache kan de claim-check niet worden
+        // uitgevoerd, ook niet op het passthrough-pad.
+        return {
+            status: 409,
+            payload: {
+                ok: false,
+                code: "delivery_order_not_cached",
+                error: detection.message,
+            },
+        };
+    }
+    // Body opbouwen — hetzij passthrough (caller geeft zelf loadCarrierItems),
+    // hetzij via de gedeelde bodybouwer vanuit de cache.
+    let writeBody;
+    let skipped = [];
+    if (explicitLoadCarrierItems) {
+        writeBody = { loadCarrierItems: explicitLoadCarrierItems };
+    }
+    else {
         const { data: doRow } = await supabase
             .from("floriday_delivery_orders_cache")
             .select("floriday_id, data")
@@ -59,49 +71,49 @@ export async function runFulfillmentOrderSend(supabase, body, caller) {
             .maybeSingle();
         if (!doRow) {
             return {
-                status: 404,
-                payload: { ok: false, error: "Delivery-order niet in cache — sync eerst" },
+                status: 409,
+                payload: {
+                    ok: false,
+                    code: "delivery_order_not_cached",
+                    error: "Delivery-order niet in cache — sync eerst",
+                },
             };
         }
-        const allRequests = Array.isArray(doRow.data?.fulfillmentRequests)
-            ? doRow.data.fulfillmentRequests
-            : [];
-        const filterIds = Array.isArray(body?.fulfillmentRequestIds)
-            ? body.fulfillmentRequestIds.map((s) => String(s))
-            : null;
-        const requests = allRequests
-            .filter((r) => {
-            const id = r?.fulfillmentRequestId ?? r?.id;
-            return !filterIds || filterIds.includes(String(id));
-        })
-            .map((r) => {
-            const id = r?.fulfillmentRequestId ?? r?.id;
-            if (!id)
-                return null;
+        const built = await buildFulfillmentOrderBody(supabase, {
+            connectionId: conn.id,
+            deliveryOrderId,
+            deliveryOrderData: doRow.data,
+            fulfillmentRequestIds,
+        });
+        if (built.kind === "already_fulfilled") {
             return {
-                deliveryOrderId,
-                fulfillmentRequestId: id,
-                numberOfPackages: extractPackageCount(r),
-            };
-        })
-            .filter(Boolean);
-        if (requests.length === 0) {
-            return {
-                status: 400,
+                status: 200,
                 payload: {
-                    ok: false,
-                    error: "Geen fulfillmentRequests gevonden in delivery-order",
+                    ok: true,
+                    code: "already_fulfilled",
+                    skipped: true,
+                    source: built.source,
+                    reason: built.message,
+                    fulfillmentOrderId: built.fulfillmentOrderId,
+                    skippedRequests: built.skipped,
                 },
             };
         }
-        loadCarrierItems = [{ fulfillmentRequests: requests }];
+        if (built.kind === "error") {
+            return {
+                status: built.permanent ? 400 : 409,
+                payload: { ok: false, error: built.error },
+            };
+        }
+        writeBody = built.body;
+        skipped = built.skipped;
     }
     const result = await florydayWrite(supabase, env, {
         module: "auto-process",
         action: "send-fulfillment-order",
         method: "POST",
         path: "/fulfillment-orders",
-        body: { loadCarrierItems },
+        body: writeBody,
         referenceId: deliveryOrderId || "batch",
         idempotencyKey: deliveryOrderId
             ? `do:${deliveryOrderId}:fulfillment-order`
@@ -111,11 +123,26 @@ export async function runFulfillmentOrderSend(supabase, body, caller) {
     const fulfillmentOrderId = result.data?.fulfillmentOrderId ??
         result.data?.id ??
         result.data?.floridayId;
+    if (result.ok) {
+        // Geen `error` in een ok:true-payload.
+        return {
+            status: 200,
+            payload: {
+                ok: true,
+                code: "created",
+                skipped: false,
+                skippedRequests: skipped,
+                fulfillmentOrderId,
+            },
+        };
+    }
     return {
-        status: result.ok ? 200 : 502,
+        status: 502,
         payload: {
-            ok: result.ok,
+            ok: false,
+            code: "write_failed",
             skipped: false,
+            skippedRequests: skipped,
             fulfillmentOrderId,
             error: result.error,
         },

package/dist-lib/lib/gateway/index.d.ts

@@ -18,4 +18,5 @@ export * from "./supply-line.js";
 export * from "./auto-process.js";
 export * from "./cron-scan.js";
 export * from "./documents.js";
+export * from "./fulfillment-order-body.js";
 //# sourceMappingURL=index.d.ts.map

package/dist-lib/lib/gateway/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/gateway/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC"}

package/dist-lib/lib/gateway/index.js

@@ -18,3 +18,4 @@ export * from "./supply-line.js";
 export * from "./auto-process.js";
 export * from "./cron-scan.js";
 export * from "./documents.js";
+export * from "./fulfillment-order-body.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-authenticatie-module",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",