@flowselections/floriday-authenticatie-module 1.0.39 → 1.0.41

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.39",
+  "version": "1.0.41",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",