@flowselections/logistiek-engine 1.0.13 → 1.0.14

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

@@ -209,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", {
@@ -233,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;
@@ -246,14 +255,16 @@ export async function runFloridayPushQueue(sb, opts = {}) {
             if (!built.ok) {
                 // Wachttoestand (delivery-order nog niet gesynchroniseerd) of een
                 // databasefout; permanent alleen als de order zelf niet kan bestaan.
-                ok = false;
+                // 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++;
             }
@@ -268,7 +279,16 @@ 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 ?? null;
                 response = {
@@ -276,7 +296,7 @@ export async function runFloridayPushQueue(sb, opts = {}) {
                     error: payloadError ?? null,
                     fulfillmentOrderId: payload?.fulfillmentOrderId ?? null,
                 };
-                if (!ok) {
+                if (outcome !== "ok") {
                     error =
                         payloadError && String(payloadError).length > 0
                             ? String(payloadError)
@@ -287,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,
@@ -304,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.