@flowselections/floriday-voorraad 1.0.86 → 1.0.87

package/dist-lib/lib/__tests__/floriday-fetch-status.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floriday-fetch-status.test.d.ts.map

package/dist-lib/lib/__tests__/floriday-fetch-status.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-fetch-status.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__tests__/floriday-fetch-status.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/__tests__/floriday-fetch-status.test.js

@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { fetchState, fetchStateBlocksTakeover } from "../floriday-fetch-status.js";
+const row = (t, done, ok) => ({
+    backfill_target_sequence: t, backfill_done_at: done, last_success_at: ok,
+});
+describe("ophaalstatus artikelen", () => {
+    it("lopend ophalen blokkeert overnemen", () => {
+        expect(fetchState(row(500, null, "2026-10-20"), 120)).toBe("bezig");
+        expect(fetchStateBlocksTakeover(fetchState(row(500, null, null), 0))).toBe(true);
+    });
+    it("nog nooit gestart blokkeert overnemen", () => {
+        expect(fetchState(null, 0)).toBe("nooit_gestart");
+        expect(fetchState(row(null, null, null), 0)).toBe("nooit_gestart");
+        expect(fetchStateBlocksTakeover("nooit_gestart")).toBe(true);
+    });
+    it("na afloop met lege target komt de knop vrij", () => {
+        expect(fetchState(row(null, "2026-10-20", "2026-10-20"), 50)).toBe("compleet");
+        expect(fetchState(row(500, "2026-10-20", "2026-10-20"), 50)).toBe("compleet");
+        expect(fetchStateBlocksTakeover(fetchState(row(null, null, "2026-10-20"), 0))).toBe(false);
+    });
+    it("koppeling van vóór 1.0.95 zonder backfill is compleet", () => {
+        expect(fetchState(row(null, null, "2026-09-01"), 300)).toBe("compleet");
+        expect(fetchState(null, 300)).toBe("compleet");
+    });
+});

package/dist-lib/lib/floriday-fetch-status.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Ophaalstatus van Floriday-authenticatie (floriday_sync_state) per entiteit.
+ * Dezelfde regel staat in de database (floriday_takeover_fetch_state); houd ze gelijk.
+ *  - bezig:        backfill_target_sequence gevuld én backfill_done_at leeg
+ *  - nooit gestart: geen statusrij én geen gegevens in de cache, of een rij zonder
+ *                   enige geslaagde ophaling en zonder gegevens
+ *  - compleet:     al het andere (ook target leeg na afloop, of koppeling van vóór 1.0.95)
+ */
+export type FetchStateRow = {
+    backfill_target_sequence: number | null;
+    backfill_done_at: string | null;
+    last_success_at: string | null;
+} | null;
+export type FetchState = "bezig" | "nooit_gestart" | "compleet";
+export declare function fetchState(row: FetchStateRow, cachedCount: number): FetchState;
+export declare function fetchStateBlocksTakeover(s: FetchState): boolean;
+//# sourceMappingURL=floriday-fetch-status.d.ts.map

package/dist-lib/lib/floriday-fetch-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floriday-fetch-status.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-fetch-status.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,GAAG,IAAI,CAAC;AAET,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,eAAe,GAAG,UAAU,CAAC;AAEhE,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,UAAU,CAM9E;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO,CAE/D"}

package/dist-lib/lib/floriday-fetch-status.js

@@ -0,0 +1,14 @@
+export function fetchState(row, cachedCount) {
+    if (row && row.backfill_target_sequence != null && !row.backfill_done_at)
+        return "bezig";
+    if (cachedCount > 0)
+        return "compleet";
+    if (!row)
+        return "nooit_gestart";
+    if (row.backfill_done_at || row.last_success_at)
+        return "compleet";
+    return "nooit_gestart";
+}
+export function fetchStateBlocksTakeover(s) {
+    return s !== "compleet";
+}

package/dist-lib/lib/floriday-takeover.functions.d.ts

@@ -1,3 +1,4 @@
+import { type FetchState } from "./floriday-fetch-status.js";
 export type TakeoverRow = {
     tradeItemId: string;
     name: string;
@@ -31,6 +32,16 @@ export type TakeoverRow = {
         supply_lines: number;
         customer_offers: number;
     };
+    customerOffers: CustomerOfferView[];
+};
+export type CustomerOfferView = {
+    id: string;
+    customer: string | null;
+    price: number | null;
+    currency: string | null;
+    pieces: number | null;
+    from: string | null;
+    to: string | null;
 };
 export declare const getFloridayTakeoverPreview: import("@tanstack/start-client-core").OptionalFetcher<readonly [import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, {
     supabase: import("../integrations/supabase/auth-middleware.js").AuthedSupabaseClient;
@@ -44,6 +55,11 @@ export declare const getFloridayTakeoverPreview: import("@tanstack/start-client-
         week: number;
     }[];
     weekError: string | null;
+    fetchStatus: {
+        tradeItems: FetchState;
+        catalogPrices: FetchState;
+        customerOffers: FetchState;
+    };
     rows: TakeoverRow[];
 }>>;
 //# sourceMappingURL=floriday-takeover.functions.d.ts.map

package/dist-lib/lib/floriday-takeover.functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floriday-takeover.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-takeover.functions.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE;QACL,UAAU,EAAE,OAAO,CAAC;QACpB,mBAAmB,EAAE,OAAO,GAAG,IAAI,CAAC;QACpC,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACjF,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAmBF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;GA8InC,CAAC"}
+{"version":3,"file":"floriday-takeover.functions.d.ts","sourceRoot":"","sources":["../../src/lib/floriday-takeover.functions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE;QACL,UAAU,EAAE,OAAO,CAAC;QACpB,mBAAmB,EAAE,OAAO,GAAG,IAAI,CAAC;QACpC,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACjF,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,cAAc,EAAE,iBAAiB,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB,CAAC;AA2CF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;oBAmFF,UAAU;uBAAiB,UAAU;wBAAkB,UAAU;;;GAgFlG,CAAC"}

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

@@ -13,6 +13,31 @@
  */
 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;
@@ -38,15 +63,18 @@ export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
     const conn = await resolveActiveFloridayConnection(context.supabase);
     const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
     const admin = supabaseAdmin;
-    const [items, products, stock, cont, catalog, lines] = await Promise.all([
+    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).order("updated_at", { ascending: false }).limit(20000),
+        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])
+    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).
@@ -108,6 +136,22 @@ export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
         }
         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();
@@ -170,8 +214,9 @@ export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
                 weekly: w.length > 0,
                 weeks: w.map(({ year, week, pieces, available }) => ({ year, week, pieces, available })),
                 supply_lines: line.count,
-                customer_offers: line.customer,
+                customer_offers: (offersBy.get(fid) ?? []).length || line.customer,
             },
+            customerOffers: offersBy.get(fid) ?? [],
         };
     });
     rows.sort((a, b) => a.name.localeCompare(b.name, "nl"));
@@ -180,6 +225,7 @@ export const getFloridayTakeoverPreview = createServerFn({ method: "POST" })
         environment: conn.environment ?? null,
         weeks,
         weekError,
+        fetchStatus,
         rows,
     };
 });

package/package.json

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