@flowselections/floriday-authenticatie-module 1.0.20 → 1.0.21

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

@@ -7,8 +7,34 @@
 // ============================================================================
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { FLORYDAY_AGREEMENT_PERMISSION_MESSAGE, FLORYDAY_CONTRACT_PERMISSION_MESSAGE, FLORYDAY_SALES_STRATEGY_PERMISSION_MESSAGE, } from "./floriday-scopes";
+import { FLORYDAY_CONTRACT_PERMISSION_MESSAGE, FLORYDAY_SALES_STRATEGY_PERMISSION_MESSAGE, } from "./floriday-scopes";
 import { SUPPLIERS_API_VERSION, getActiveFlorydayCredentials, resolveFlorydayCronBaseUrl, syncFloridayEntityBySequence, } from "./floriday.functions";
+// Chunked upsert met retry-op-statement-timeout. Voorkomt dat één trage batch
+// een hele sync-run doet falen; zie .lovable/plan.md (verharding).
+async function upsertInChunks(supabase, table, rows, onConflict, label, chunkSize = 200) {
+    if (rows.length === 0)
+        return;
+    const total = Math.ceil(rows.length / chunkSize);
+    for (let i = 0; i < rows.length; i += chunkSize) {
+        const chunk = rows.slice(i, i + chunkSize);
+        const idx = Math.floor(i / chunkSize) + 1;
+        let attempt = 0;
+        while (true) {
+            const { error } = await supabase
+                .from(table)
+                .upsert(chunk, { onConflict });
+            if (!error)
+                break;
+            const msg = String(error?.message ?? "");
+            const isTimeout = error?.code === "57014" || /statement timeout/i.test(msg);
+            if (!isTimeout || attempt >= 2) {
+                throw new Error(`${label} upsert: ${msg} (chunk ${idx}/${total}, size ${chunk.length})`);
+            }
+            attempt += 1;
+            await new Promise((r) => setTimeout(r, 250 * Math.pow(2, attempt - 1)));
+        }
+    }
+}
 const now = () => new Date().toISOString();
 const RESOURCE_CONFIG = {
     "trade-items": {
@@ -34,11 +60,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_trade_items_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`trade-items upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_trade_items_cache", rows, "connection_id,floriday_id", "trade-items");
         },
     },
     "sales-orders": {
@@ -66,11 +88,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_salesorders_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`sales-orders upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_salesorders_cache", rows, "connection_id,floriday_id", "sales-orders");
         },
     },
     "customer-organizations": {
@@ -109,11 +127,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_customers_cache")
-                .upsert(rows, { onConflict: "organization_id" });
-            if (error)
-                throw new Error(`customer-organizations upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_customers_cache", rows, "organization_id", "customer-organizations");
         },
     },
     "carriers": {
@@ -144,11 +158,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_carriers_cache")
-                .upsert(rows, { onConflict: "organization_id" });
-            if (error)
-                throw new Error(`carriers upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_carriers_cache", rows, "organization_id", "carriers");
         },
     },
     "fulfillment-orders": {
@@ -184,11 +194,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_fulfillment_orders_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`fulfillment-orders upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_fulfillment_orders_cache", rows, "connection_id,floriday_id", "fulfillment-orders");
         },
     },
     "customer-stickers": {
@@ -218,11 +224,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_customer_stickers_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`customer-stickers upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_customer_stickers_cache", rows, "connection_id,floriday_id", "customer-stickers");
         },
     },
     "packings": {
@@ -251,11 +253,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_packings_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`packings upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_packings_cache", rows, "connection_id,floriday_id", "packings");
         },
     },
     "clock-supplies": {
@@ -291,11 +289,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_clock_supplies_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`clock-supplies upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_clock_supplies_cache", rows, "connection_id,floriday_id", "clock-supplies");
         },
     },
     "delivery-orders": {
@@ -328,11 +322,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_delivery_orders_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`delivery-orders upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_delivery_orders_cache", rows, "connection_id,floriday_id", "delivery-orders");
         },
     },
     "clock-presales": {
@@ -366,11 +356,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_clock_presales_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`clock-presales upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_clock_presales_cache", rows, "connection_id,floriday_id", "clock-presales");
         },
     },
     // Legacy resources (agreements, agreement-calloffs, trips, invoices) zijn
@@ -404,11 +390,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_warehouses_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`warehouses upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_warehouses_cache", rows, "connection_id,floriday_id", "warehouses");
         },
     },
     "delivery-locations": {
@@ -437,11 +419,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_delivery_locations_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`delivery-locations upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_delivery_locations_cache", rows, "connection_id,floriday_id", "delivery-locations");
         },
     },
     "contracts": {
@@ -469,11 +447,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_contracts_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`contracts upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_contracts_cache", rows, "connection_id,floriday_id", "contracts");
         },
     },
     "blanket-orders": {
@@ -501,11 +475,7 @@ const RESOURCE_CONFIG = {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_blanket_orders_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`blanket-orders upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_blanket_orders_cache", rows, "connection_id,floriday_id", "blanket-orders");
         },
     },
     // ── Stamdata voor productformulieren (centraal voor andere modules) ────
@@ -519,17 +489,22 @@ const RESOURCE_CONFIG = {
     "sales-strategies": makeSimpleSeq("sales-strategies", "sales-strategies", "floriday_sales_strategies_cache", ["salesStrategyId"], { maxSequencePath: "/sales-strategies/sync/max-sequence-number" }),
     "base-items": makeSimpleSeq("base-items", "base-items", "floriday_base_items_cache", ["baseItemId"]),
     "contract-trade-item-groups": makeSimpleSeq("contract-trade-item-groups", "contract-trade-item-groups", "floriday_contract_trade_item_groups_cache", ["contractTradeItemGroupId"]),
-    // Agreements + agreement-calloffs (klantspecifieke contractprijzen).
-    // Vereist scope `agreement:read` — zie floriday-scopes.ts.
-    "agreements": {
+    // Agreements + agreement-calloffs zijn verwijderd: Floriday Suppliers API
+    // 2026v1 kent deze endpoints niet meer (404 route-not-found). Klant-
+    // specifieke prijs-/leveringsafspraken komen via /contracts en
+    // /customer-offers.
+    // Handelsinstellingen per klant (accepteert directe orders, contracten,
+    // transportkosten, FSI-eisen etc.). Endpoint: /trade-settings/customer/sync
+    // — geen aparte scope nodig; werkt met standaardtoken.
+    "trade-settings-customers": {
         kind: "sequence",
-        entityType: "agreements",
-        maxSequenceEndpoint: `/${SUPPLIERS_API_VERSION}/agreements/current-max-sequence`,
-        bySequenceEndpointBase: `/${SUPPLIERS_API_VERSION}/agreements/sync`,
+        entityType: "trade-settings-customers",
+        maxSequenceEndpoint: `/${SUPPLIERS_API_VERSION}/trade-settings/customer/sync/0`,
+        bySequenceEndpointBase: `/${SUPPLIERS_API_VERSION}/trade-settings/customer/sync`,
         upsert: async (supabase, connectionId, items) => {
             const rows = items
                 .map((item) => {
-                const fid = item?.agreementId ?? item?.id ?? null;
+                const fid = item?.customerOrganizationId ?? null;
                 if (!fid)
                     return null;
                 return {
@@ -537,55 +512,15 @@ const RESOURCE_CONFIG = {
                     floriday_id: String(fid),
                     sequence_number: Number(item?.sequenceNumber ?? 0),
                     is_deleted: Boolean(item?.isDeleted),
-                    buyer_organization_id: item?.buyerOrganizationId ?? null,
-                    status: item?.status ?? null,
-                    valid_from: item?.validFrom ?? item?.periodStart ?? null,
-                    valid_until: item?.validUntil ?? item?.periodEnd ?? null,
-                    data: item,
-                    fetched_at: now(),
-                };
-            })
-                .filter(Boolean);
-            if (rows.length === 0)
-                return;
-            const { error } = await supabase
-                .from("floriday_agreements_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`agreements upsert: ${error.message}`);
-        },
-    },
-    "agreement-calloffs": {
-        kind: "sequence",
-        entityType: "agreement-calloffs",
-        maxSequenceEndpoint: `/${SUPPLIERS_API_VERSION}/agreement-calloffs/current-max-sequence`,
-        bySequenceEndpointBase: `/${SUPPLIERS_API_VERSION}/agreement-calloffs/sync`,
-        upsert: async (supabase, connectionId, items) => {
-            const rows = items
-                .map((item) => {
-                const fid = item?.agreementCalloffId ?? item?.id ?? null;
-                if (!fid)
-                    return null;
-                return {
-                    connection_id: connectionId,
-                    floriday_id: String(fid),
-                    sequence_number: Number(item?.sequenceNumber ?? 0),
-                    is_deleted: Boolean(item?.isDeleted),
-                    agreement_id: item?.agreementId ?? null,
-                    delivery_date: item?.deliveryDate ?? null,
-                    status: item?.status ?? null,
                     data: item,
                     fetched_at: now(),
+                    updated_at: now(),
                 };
             })
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from("floriday_agreement_calloffs_cache")
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`agreement-calloffs upsert: ${error.message}`);
+            await upsertInChunks(supabase, "floriday_trade_settings_customers_cache", rows, "connection_id,floriday_id", "trade-settings-customers");
         },
     },
     // NB: `trade-item-classifications` is GEEN Floriday Suppliers-resource (2026v1
@@ -621,11 +556,7 @@ function makeSimpleSeq(entityType, apiPath, table, idFields, opts) {
                 .filter(Boolean);
             if (rows.length === 0)
                 return;
-            const { error } = await supabase
-                .from(table)
-                .upsert(rows, { onConflict: "connection_id,floriday_id" });
-            if (error)
-                throw new Error(`${entityType} upsert: ${error.message}`);
+            await upsertInChunks(supabase, table, rows, "connection_id,floriday_id", entityType);
         },
     };
 }
@@ -686,9 +617,6 @@ async function runSyncHandler(context, environment, resource) {
         if (resource === "sales-strategies" && policyDenied) {
             message = FLORYDAY_SALES_STRATEGY_PERMISSION_MESSAGE;
         }
-        else if ((resource === "agreements" || resource === "agreement-calloffs") && policyDenied) {
-            message = FLORYDAY_AGREEMENT_PERMISSION_MESSAGE;
-        }
         else if (isContractResource && policyDenied) {
             message = FLORYDAY_CONTRACT_PERMISSION_MESSAGE;
         }
@@ -867,15 +795,10 @@ const SCHEDULER_SPECS = {
         path: "/api/public/cron/sync-floriday-contract-trade-item-groups",
         jobname: "floriday-contract-trade-item-groups-sync-hourly",
     },
-    "agreements": {
-        rpc: "schedule_floriday_agreements_sync",
-        path: "/api/public/cron/sync-floriday-agreements",
-        jobname: "floriday-agreements-sync-hourly",
-    },
-    "agreement-calloffs": {
-        rpc: "schedule_floriday_agreement_calloffs_sync",
-        path: "/api/public/cron/sync-floriday-agreement-calloffs",
-        jobname: "floriday-agreement-calloffs-sync-hourly",
+    "trade-settings-customers": {
+        rpc: "schedule_floriday_trade_settings_customers_sync",
+        path: "/api/public/cron/sync-floriday-trade-settings-customers",
+        jobname: "floriday-trade-settings-customers-sync-hourly",
     },
 };
 export async function scheduleFlorydayResourceSyncInternal(supabase, resource) {
@@ -983,14 +906,8 @@ export const syncFlorydayContractTradeItemGroups = createServerFn({ method: "POS
     .middleware([requireSupabaseAuth])
     .inputValidator(envValidator)
     .handler(async ({ data, context }) => runSyncHandler(context, data.environment, "contract-trade-item-groups"));
-export const syncFlorydayAgreements = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
-    .inputValidator(envValidator)
-    .handler(async ({ data, context }) => runSyncHandler(context, data.environment, "agreements"));
-export const syncFlorydayAgreementCalloffs = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
-    .inputValidator(envValidator)
-    .handler(async ({ data, context }) => runSyncHandler(context, data.environment, "agreement-calloffs"));
+// syncFlorydayAgreements + syncFlorydayAgreementCalloffs zijn verwijderd:
+// Suppliers API 2026v1 kent /agreements en /agreement-calloffs niet meer.
 // Opmerking: `trade-item-classifications` is verwijderd als sync-resource. De
 // Floriday Suppliers API (2026v1) kent dit endpoint niet (404 op
 // /current-max-sequence). Classificatie-data leeft in de Swagger-enums en