@flowselections/floriday-voorraad 1.0.71 → 1.0.72

package/dist-lib/lib/base-supply-reader.server.d.ts

@@ -7,6 +7,7 @@ export type ReaderWeek = {
         tradeItemId: string;
         numberOfPieces: number;
         isAvailable: boolean;
+        basePricePerPiece: number | null;
     }>;
     error: string | null;
     rateLimited: boolean;

package/dist-lib/lib/base-supply-reader.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-supply-reader.server.d.ts","sourceRoot":"","sources":["../../src/lib/base-supply-reader.server.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnE,IAAI,EAAE,KAAK,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnF,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACxE,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACxE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;CACpE,CAAC;AAwCF,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C,OAAO,CAAC,YAAY,CAAC,CA8DvB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3E,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3B,CAAC;AAEF,wEAAwE;AACxE,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CA4CtE"}
+{"version":3,"file":"base-supply-reader.server.d.ts","sourceRoot":"","sources":["../../src/lib/base-supply-reader.server.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnE,IAAI,EAAE,KAAK,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IACrH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACxE,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACxE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,YAAY,EAAE,OAAO,CAAC;CACpE,CAAC;AA6CF,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C,OAAO,CAAC,YAAY,CAAC,CA8DvB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3E,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3B,CAAC;AAEF,wEAAwE;AACxE,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CA4CtE"}

package/dist-lib/lib/base-supply-reader.server.js

@@ -31,6 +31,10 @@ function extractRows(data) {
         tradeItemId: String(r.tradeItemId),
         numberOfPieces: Number(r.numberOfPieces ?? 0) || 0,
         isAvailable: r.isAvailable !== false,
+        // WeeklyBaseSupply.basePricePerPiece is een Price { currency, value } (Suppliers API 2026v1).
+        basePricePerPiece: r.basePricePerPiece && Number.isFinite(Number(r.basePricePerPiece.value))
+            ? Number(r.basePricePerPiece.value)
+            : null,
     }));
 }
 async function callOnce(endpoint, secret, year, week) {

package/dist-lib/lib/stock-sync.functions.d.ts

@@ -17,7 +17,7 @@ export declare const enqueueTestStockPush: import("@tanstack/start-client-core")
 }, undefined, undefined, undefined>], (data: unknown) => {
     tradeItemId: string;
 }, Promise<{
-    id: any;
+    id: string | null;
     numberOfPieces: number;
 }>>;
 //# sourceMappingURL=stock-sync.functions.d.ts.map

package/dist-lib/lib/stock-sync.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stock-sync.functions.d.ts","sourceRoot":"","sources":["../../src/lib/stock-sync.functions.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;;;;;GA0B7B,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;GAuC7B,CAAC"}
+{"version":3,"file":"stock-sync.functions.d.ts","sourceRoot":"","sources":["../../src/lib/stock-sync.functions.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,oBAAoB;;;;;;GA0B7B,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;GAuD7B,CAAC"}

package/dist-lib/lib/stock-sync.functions.js

@@ -69,5 +69,21 @@ export const enqueueTestStockPush = createServerFn({ method: "POST" })
         .maybeSingle();
     if (error)
         throw new Error(error.message);
-    return { id: inserted?.id ?? null, numberOfPieces: pieces };
+    // M27: staat er al een open regel voor dit artikel en deze week, dan werkt de
+    // database die bij en komt er geen nieuwe rij terug; geef dan het id van die regel.
+    let id = inserted?.id ?? null;
+    if (!id) {
+        const { data: existing } = await admin
+            .from("floriday_continuous_stock_queue")
+            .select("id")
+            .eq("connection_id", stockRow.connection_id)
+            .eq("trade_item_id", data.tradeItemId)
+            .is("target_week", null)
+            .in("status", ["pending", "needs_base_supply", "skipped_no_price", "failed", "processing", "creating_base_supply"])
+            .order("updated_at", { ascending: false })
+            .limit(1)
+            .maybeSingle();
+        id = existing?.id ?? null;
+    }
+    return { id, numberOfPieces: pieces };
 });

package/dist-lib/server-hooks/floriday-base-supply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-base-supply.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-base-supply.ts"],"names":[],"mappings":"AA2EA,yHAAyH;AACzH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAElF"}
+{"version":3,"file":"floriday-base-supply.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-base-supply.ts"],"names":[],"mappings":"AAwGA,yHAAyH;AACzH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAElF"}

package/dist-lib/server-hooks/floriday-base-supply.js

@@ -33,6 +33,27 @@ async function handle(request) {
     if (error)
         return json({ error: `claim: ${error.message}` }, 500);
     const summary = { processed: 0, done: 0, retry: 0, stop: 0, week_past: 0, no_price: 0 };
+    // M27: bestaande prijs in Floriday per week (alleen lezen, 1 GET per week per ronde).
+    const { readBaseSupplyWeeks } = await import("../lib/base-supply-reader.server.js");
+    const weekCache = new Map();
+    async function floridayPrice(year, week, tradeItemId) {
+        if (!year || !week)
+            return null;
+        const k = `${year}-${week}`;
+        if (!weekCache.has(k)) {
+            const m = new Map();
+            try {
+                const out = await readBaseSupplyWeeks([{ year, week }]);
+                for (const r of out.results[0]?.rows ?? [])
+                    m.set(r.tradeItemId, r.basePricePerPiece);
+            }
+            catch {
+                /* lezen is optioneel; zonder antwoord geen melding over prijsaanpassing */
+            }
+            weekCache.set(k, m);
+        }
+        return weekCache.get(k).get(tradeItemId) ?? null;
+    }
     let first = true;
     for (const row of (rows ?? [])) {
         summary.processed++;
@@ -45,6 +66,7 @@ async function handle(request) {
         if (!first)
             await sleep(1000); // max 1 aanvraag per seconde
         first = false;
+        const previous = await floridayPrice(row.target_year, row.target_week, row.trade_item_id);
         let d;
         try {
             const { httpStatus, body } = await gatewaySupplyLineWeek(buildRequest(row, price.price, conn.environment));
@@ -53,10 +75,19 @@ async function handle(request) {
         catch (e) {
             d = { kind: "retry", label: "Floriday tijdelijk niet bereikbaar", error: String(e?.message ?? e) };
         }
+        let label = d.label;
+        const changed = d.kind === "done" &&
+            d.priceStatus === "sent" &&
+            previous != null &&
+            Math.abs(previous - price.price) > 0.0005;
+        if (changed) {
+            label = `Prijs in Floriday aangepast van € ${previous.toFixed(2)} naar € ${price.price.toFixed(2)}`;
+            await admin.from("floriday_continuous_stock_queue").update({ price_previous: previous }).eq("id", row.id);
+        }
         await admin.rpc("complete_floriday_base_supply", {
             p_id: row.id,
             p_kind: d.kind,
-            p_label: d.label,
+            p_label: label,
             p_error: d.error ?? null,
             p_attempt_id: d.attemptId ?? null,
             p_outcome: d.outcome ?? null,

package/package.json

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