@flowselections/floriday-voorraad 1.0.87 → 1.0.90

package/dist-lib/lib/floriday-takeover.functions.js

@@ -1,58 +1,7 @@
-/**
- * Proefrapport "Overnemen uit Floriday". Leest alleen: niets wordt geschreven
- * en niets gaat naar Floriday. Het daadwerkelijk overnemen gebeurt via de
- * databasefunctie `floriday_takeover_apply` (één transactie, terug te draaien).
- *
- * Floriday (Suppliers API 2026v1), alleen lezen via de leesroute van de
- * Floriday-authenticatiemodule:
- *  - GET /trade-items/base-supply?year&week  → WeeklyBaseSupply { tradeItemId, numberOfPieces, isAvailable, basePricePerPiece { currency, value } }
- * Daarnaast de lokaal bijgehouden Floriday-gegevens van deze koppeling:
- *  - trade items (TradeItemBase: tradeItemId, supplierArticleCode, articleGtin, vbnProductCode, tradeItemName)
- *  - doorlopende voorraad (GET /trade-items/{id}/continuous-stock, door de ophaaltaak bewaard)
- *  - catalogusprijzen en aanbodregels (supply lines), incl. klantspecifieke aanbiedingen (alleen tonen)
- */
+/** Proefrapport "Overnemen uit Floriday" (alleen lezen); de logica staat in floriday-takeover-core.ts. */
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
-import { fetchState } from "./floriday-fetch-status.js";
-function offerView(id, d) {
-    const pr = d?.pricePerPiece ?? d?.price ?? null;
-    const price = typeof pr === "number" ? pr : pr?.value != null ? Number(pr.value) : null;
-    const orgs = d?.customerOrganizationIds ?? (d?.customerOrganizationId ? [d.customerOrganizationId] : []);
-    return {
-        id,
-        customer: d?.customerOrganizationName ?? (Array.isArray(orgs) && orgs.length ? orgs.join(", ") : null),
-        price: Number.isFinite(price) ? price : null,
-        currency: pr?.currency ?? d?.currency ?? null,
-        pieces: d?.numberOfPieces != null ? Number(d.numberOfPieces) : d?.availableNumberOfPieces != null ? Number(d.availableNumberOfPieces) : null,
-        from: d?.period?.startDateTime ?? d?.startDateTime ?? d?.validFrom ?? null,
-        to: d?.period?.endDateTime ?? d?.endDateTime ?? d?.validTo ?? null,
-    };
-}
-function offerTradeItems(d) {
-    const ids = new Set();
-    if (d?.tradeItemId)
-        ids.add(String(d.tradeItemId).toLowerCase());
-    for (const l of Array.isArray(d?.lines) ? d.lines : Array.isArray(d?.tradeItems) ? d.tradeItems : []) {
-        if (l?.tradeItemId)
-            ids.add(String(l.tradeItemId).toLowerCase());
-    }
-    return [...ids];
-}
-function isoWeek(d) {
-    const t = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()));
-    const day = t.getUTCDay() || 7;
-    t.setUTCDate(t.getUTCDate() + 4 - day);
-    const y = t.getUTCFullYear();
-    const w = Math.ceil(((t.getTime() - Date.UTC(y, 0, 1)) / 86400000 + 1) / 7);
-    return { year: y, week: w };
-}
-function nameOf(data) {
-    const n = data?.tradeItemName;
-    if (typeof n === "string")
-        return n;
-    return String(n?.nl ?? n?.en ?? Object.values(n ?? {})[0] ?? "").trim();
-}
-const norm = (v) => String(v ?? "").trim().toLowerCase();
+import { buildTakeoverPreview } from "./floriday-takeover-core.js";
 export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .handler(async ({ context }) => {
@@ -62,170 +11,5 @@ export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
     const { resolveActiveFloridayConnection } = await import("./floriday-env.server.js");
     const conn = await resolveActiveFloridayConnection(context.supabase);
     const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
-    const admin = supabaseAdmin;
-    const nowIso = new Date().toISOString();
-    const [items, products, stock, cont, catalog, lines, syncRows, offers] = await Promise.all([
-        admin.from("floriday_trade_items_cache").select("floriday_id, data").eq("connection_id", conn.id).eq("is_deleted", false).limit(5000),
-        admin.from("products").select("id, product, barcode, article_number, floriday_trade_item_id, sale_price").limit(10000),
-        admin.from("trade_item_stock").select("trade_item_key, physical_stock").eq("connection_id", conn.id).limit(20000),
-        admin.from("floriday_continuous_stock_cache").select("trade_item_id, number_of_pieces").eq("connection_id", conn.id).limit(5000),
-        admin.from("floriday_catalog_prices_cache").select("trade_item_id, price, updated_at").eq("connection_id", conn.id).eq("is_deleted", false).or(`valid_to.is.null,valid_to.gte.${nowIso}`).order("updated_at", { ascending: false }).limit(20000),
-        admin.from("trade_item_supply_lines").select("trade_item_id, supply_type, price_per_piece, updated_at").eq("connection_id", conn.id).order("updated_at", { ascending: false }).limit(20000),
-        admin.from("floriday_sync_state").select("entity_type, backfill_target_sequence, backfill_done_at, last_success_at").eq("connection_id", conn.id).in("entity_type", ["trade-items", "catalog-prices", "customer-offers"]),
-        admin.from("floriday_customer_offers_cache").select("floriday_id, data").eq("connection_id", conn.id).eq("is_deleted", false).limit(5000),
-    ]);
-    for (const r of [items, products, stock, cont, catalog, lines, syncRows, offers])
-        if (r.error)
-            throw new Error(r.error.message);
-    // Weekaanbod: huidige en twee komende weken, live gelezen (1 per seconde).
-    const now = new Date();
-    const weeks = [0, 1, 2].map((i) => isoWeek(new Date(now.getTime() + i * 7 * 86400000)));
-    let weekError = null;
-    const weekly = new Map();
-    try {
-        const { readBaseSupplyWeeks } = await import("./base-supply-reader.server.js");
-        const out = await readBaseSupplyWeeks(weeks);
-        if (out.error)
-            weekError = out.error;
-        for (const w of out.results) {
-            if (!w.ok) {
-                weekError = weekError ?? w.error;
-                continue;
-            }
-            for (const r of w.rows) {
-                const arr = weekly.get(r.tradeItemId) ?? [];
-                arr.push({ year: w.year, week: w.week, pieces: r.numberOfPieces, available: r.isAvailable, price: r.basePricePerPiece });
-                weekly.set(r.tradeItemId, arr);
-            }
-        }
-    }
-    catch (e) {
-        weekError = e?.message ?? String(e);
-    }
-    const byFid = new Map();
-    const unlinked = [];
-    for (const p of products.data ?? []) {
-        if (p.floriday_trade_item_id)
-            byFid.set(String(p.floriday_trade_item_id).toLowerCase(), p);
-        else
-            unlinked.push(p);
-    }
-    const stockBy = new Map();
-    for (const s of stock.data ?? [])
-        stockBy.set(String(s.trade_item_key), Number(s.physical_stock ?? 0));
-    const contBy = new Map();
-    for (const c of cont.data ?? [])
-        contBy.set(String(c.trade_item_id), Number(c.number_of_pieces ?? 0));
-    const catBy = new Map();
-    for (const c of catalog.data ?? []) {
-        const k = String(c.trade_item_id);
-        if (!catBy.has(k) && Number(c.price) > 0)
-            catBy.set(k, Number(c.price));
-    }
-    const lineBy = new Map();
-    for (const l of lines.data ?? []) {
-        const k = String(l.trade_item_id);
-        const cur = lineBy.get(k) ?? { price: null, count: 0, customer: 0 };
-        const isCustomer = /customer/i.test(String(l.supply_type ?? ""));
-        if (isCustomer)
-            cur.customer++;
-        else {
-            cur.count++;
-            if (cur.price == null && Number(l.price_per_piece) > 0)
-                cur.price = Number(l.price_per_piece);
-        }
-        lineBy.set(k, cur);
-    }
-    const syncBy = new Map();
-    for (const r of syncRows.data ?? [])
-        syncBy.set(String(r.entity_type), r);
-    const offersBy = new Map();
-    for (const o of offers.data ?? []) {
-        for (const tid of offerTradeItems(o.data)) {
-            const arr = offersBy.get(tid) ?? [];
-            arr.push(offerView(String(o.floriday_id), o.data));
-            offersBy.set(tid, arr);
-        }
-    }
-    const fetchStatus = {
-        tradeItems: fetchState(syncBy.get("trade-items") ?? null, (items.data ?? []).length),
-        catalogPrices: fetchState(syncBy.get("catalog-prices") ?? null, (catalog.data ?? []).length),
-        customerOffers: fetchState(syncBy.get("customer-offers") ?? null, (offers.data ?? []).length),
-    };
-    const cur = weeks[0];
-    const rows = (items.data ?? []).map((it) => {
-        const fid = String(it.floriday_id).toLowerCase();
-        const d = it.data ?? {};
-        const p = byFid.get(fid) ?? null;
-        const w = (weekly.get(fid) ?? []).sort((a, b) => a.year - b.year || a.week - b.week);
-        const contRaw = contBy.has(fid) ? contBy.get(fid) : null;
-        const line = lineBy.get(fid) ?? { price: null, count: 0, customer: 0 };
-        // Aanbodvorm uit Floriday zelf: staat er een doorlopende-voorraadrecord, dan is dat de vorm; anders weekaanbod huidige week.
-        let floridayStock = null;
-        let stockSource = null;
-        if (contRaw != null) {
-            floridayStock = contRaw;
-            stockSource = "Doorlopende voorraad";
-        }
-        else {
-            const now = w.find((x) => x.year === cur.year && x.week === cur.week);
-            if (now) {
-                floridayStock = now.pieces;
-                stockSource = `Weekaanbod week ${now.week}`;
-            }
-        }
-        // Prijs: aanbodregel gaat voor op catalogusprijs.
-        const weekPrice = w.find((x) => x.price != null && x.price > 0)?.price ?? null;
-        const supplyLinePrice = line.price ?? weekPrice;
-        const catalogPrice = catBy.get(fid) ?? null;
-        const floridayPrice = supplyLinePrice ?? catalogPrice;
-        const priceSource = supplyLinePrice != null ? "Aanbodregel" : catalogPrice != null ? "Catalogusprijs" : null;
-        let suggestion = null;
-        if (!p) {
-            const gtin = norm(d.articleGtin), code = norm(d.supplierArticleCode), nm = norm(nameOf(d));
-            const hit = unlinked.find((u) => (gtin && norm(u.barcode) === gtin) || (code && norm(u.article_number) === code) || (nm && norm(u.product) === nm));
-            if (hit)
-                suggestion = `Lijkt op bestaand artikel "${hit.product}" (niet automatisch gekoppeld)`;
-        }
-        const erpStock = p
-            ? stockBy.get(fid) ?? stockBy.get(`product:${p.id}`) ?? stockBy.get(String(p.id)) ?? null
-            : null;
-        const name = nameOf(d) || String(d.supplierArticleCode ?? fid);
-        let action = p ? "bijwerken" : "aanmaken";
-        let reason = null;
-        if (floridayStock == null && floridayPrice == null) {
-            action = p ? "niet" : "aanmaken";
-            reason = "Geen aantal en geen prijs gevonden in Floriday";
-        }
-        return {
-            tradeItemId: fid, name,
-            articleCode: d.supplierArticleCode ?? null,
-            gtin: d.articleGtin ?? null,
-            vbnCode: d.vbnProductCode != null ? String(d.vbnProductCode) : null,
-            productId: p?.id ?? null, productName: p?.product ?? null,
-            action, reason, suggestion,
-            erpStock, erpPrice: p?.sale_price != null ? Number(p.sale_price) : null,
-            floridayStock, stockSource,
-            supplyLinePrice, catalogPrice, floridayPrice, priceSource,
-            priceDiffers: supplyLinePrice != null && catalogPrice != null && Math.abs(supplyLinePrice - catalogPrice) > 0.0001,
-            forms: {
-                continuous: contRaw != null && contRaw > 0,
-                continuousAvailable: contRaw == null ? null : contRaw > 0,
-                weekly: w.length > 0,
-                weeks: w.map(({ year, week, pieces, available }) => ({ year, week, pieces, available })),
-                supply_lines: line.count,
-                customer_offers: (offersBy.get(fid) ?? []).length || line.customer,
-            },
-            customerOffers: offersBy.get(fid) ?? [],
-        };
-    });
-    rows.sort((a, b) => a.name.localeCompare(b.name, "nl"));
-    return {
-        connectionId: conn.id,
-        environment: conn.environment ?? null,
-        weeks,
-        weekError,
-        fetchStatus,
-        rows,
-    };
+    return buildTakeoverPreview(supabaseAdmin, conn);
 });

package/dist-lib/server-hooks/floriday-follow.d.ts

@@ -0,0 +1,3 @@
+/** Shell-handler voor /api/public/hooks/floriday-follow. */
+export declare function handleFloridayFollow(request: Request): Promise<Response>;
+//# sourceMappingURL=floriday-follow.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-follow.d.ts","sourceRoot":"","sources":["../../src/server-hooks/floriday-follow.ts"],"names":[],"mappings":"AA4CA,4DAA4D;AAC5D,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE9E"}

package/dist-lib/server-hooks/floriday-follow.js

@@ -0,0 +1,46 @@
+/**
+ * "Volgt Floriday": elk uur (na de Floriday-synchronisatie) nemen Floriday-leidende
+ * artikelen (erp_leading = false) het actuele aantal, de prijs en de aanbodvorm over,
+ * met dezelfde bronkeuze als het proefrapport "Overnemen uit Floriday".
+ * Er gaat niets naar Floriday en er ontstaat geen wachtrijregel (wachtrijbewaking).
+ * Schakelaar: voorraad_hook_enabled.follow_floriday (standaard aan).
+ */
+import { runGuardedHook } from "./guard.js";
+async function handle() {
+    const json = (b, status = 200) => new Response(JSON.stringify(b), { status, headers: { "Content-Type": "application/json" } });
+    const { getAdminClient } = await import("../lib/supabase-admin.server.js");
+    const admin = getAdminClient();
+    const { resolveActiveFloridayConnection } = await import("../lib/floriday-env.server.js");
+    const conn = await resolveActiveFloridayConnection(admin);
+    const { data: follow, error: fErr } = await admin
+        .from("floriday_inventory_settings")
+        .select("floriday_trade_item_id")
+        .eq("connection_id", conn.id)
+        .eq("erp_leading", false)
+        .limit(10000);
+    if (fErr)
+        return json({ error: fErr.message }, 500);
+    const wanted = new Set((follow ?? []).map((r) => String(r.floriday_trade_item_id ?? "").toLowerCase()).filter(Boolean));
+    if (wanted.size === 0)
+        return json({ idle: true });
+    const { buildTakeoverPreview } = await import("../lib/floriday-takeover-core.js");
+    const preview = await buildTakeoverPreview(admin, conn);
+    if (preview.fetchStatus.tradeItems !== "compleet")
+        return json({ waiting: true, reason: "Artikelen worden nog opgehaald" });
+    const items = preview.rows
+        .filter((r) => r.productId && wanted.has(r.tradeItemId))
+        .map((r) => ({
+        trade_item_id: r.tradeItemId,
+        stock: r.floridayStock,
+        price: r.floridayPrice,
+        offer_forms: { ...r.forms, customer_offer: r.customerOffers.length > 0 },
+    }));
+    const { data, error } = await admin.rpc("floriday_follow_apply", { p_connection_id: conn.id, p_items: items });
+    if (error)
+        return json({ error: error.message }, 500);
+    return json({ ...data, candidates: items.length, weekError: preview.weekError });
+}
+/** Shell-handler voor /api/public/hooks/floriday-follow. */
+export async function handleFloridayFollow(request) {
+    return runGuardedHook(request, "follow_floriday", () => handle(), "floriday-follow");
+}

package/dist-lib/server-hooks/guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../src/server-hooks/guard.ts"],"names":[],"mappings":"AA4DA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC/C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB"}
+{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../src/server-hooks/guard.ts"],"names":[],"mappings":"AA+DA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAahE;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC/C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB"}

package/dist-lib/server-hooks/guard.js

@@ -20,6 +20,8 @@ const CORS = {
  * uit Floriday overneemt, verstuurt dan niets.
  */
 const DEFAULT_ON_IF_ERP_LEADING = new Set(["floriday_base_supply", "logistics_tasks"]);
+/** Standaard aan zonder voorwaarde (alleen lezen uit Floriday, verstuurt niets). */
+const DEFAULT_ON = new Set(["follow_floriday"]);
 async function hasErpLeadingArticle(admin) {
     const lead = await admin
         .from("floriday_inventory_settings")
@@ -62,8 +64,11 @@ export async function hookEnabled(name) {
         .select("value")
         .eq("key", `voorraad_hook_enabled.${name}`)
         .maybeSingle();
-    if (!data)
+    if (!data) {
+        if (DEFAULT_ON.has(name))
+            return true;
         return DEFAULT_ON_IF_ERP_LEADING.has(name) && (await hasErpLeadingArticle(admin));
+    }
     return String(data.value).trim().toLowerCase() === "true";
 }
 export async function runGuardedHook(request, name, handle, label) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-voorraad",
-  "version": "1.0.87",
+  "version": "1.0.90",
   "sideEffects": false,
   "type": "module",
   "main": "./dist-lib/index.js",
@@ -17,7 +17,8 @@
   },
   "files": [
     "dist-lib",
-    "public"
+    "public",
+    "sql"
   ],
   "publishConfig": {
     "access": "public"
@@ -76,6 +77,10 @@
   "private": false,
   "flowselections": {
     "moduleId": "Voorraad",
+    "schema": {
+      "file": "sql/floriday-voorraad-schema.sql",
+      "order": 20
+    },
     "pages": [
       {
         "export": "VoorraadPage",
@@ -150,6 +155,15 @@
           "OPTIONS"
         ]
       },
+      {
+        "routePath": "/api/public/hooks/floriday-follow",
+        "import": "@flowselections/floriday-voorraad/hooks",
+        "handler": "handleFloridayFollow",
+        "methods": [
+          "POST",
+          "OPTIONS"
+        ]
+      },
       {
         "routePath": "/api/public/hooks/logistics-tasks-run",
         "import": "@flowselections/floriday-voorraad/hooks",

package/sql/AGENTS.md

@@ -0,0 +1,3 @@
+- `floriday-voorraad-schema.sql` is generated from the database by `scripts/generate-voorraad-schema.py` (via `voorraad_schema_ddl`, service role only); regenerate after every migration and never hand-edit, because a new Shell gets its schema only from this file.
+- Voorraad owns `floriday_continuous_stock_queue_status_check`; the schema recreates it with all statuses, because other modules once recreated it without ours.
+- Schema-update order 20 (`flowselections.schema.order`); the generator keeps only own objects and wraps statements that touch other modules' tables in a to_regclass guard with a NOTICE, because Floriday-auth (30) and the Engine (60) run after Voorraad.