@flowselections/floriday-verkoop-module 1.0.8 → 1.0.10

package/dist-lib/lib/salesorders.functions.js

@@ -1,9 +1,9 @@
 // Sales orders sync (Floriday sequence-pattern) + write actions.
-// Reads tokens read-only from floriday_connections; never refreshes them here.
+// Alle Floriday HTTP-calls lopen via floriday-gateway.server.
 import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
-import { loadActiveConnections, syncBySequence, FLORIDAY_API_BASES, } from "./floriday-sync";
+import { loadActiveConnections, syncBySequence, } from "./floriday-sync";
 const ENTITY_TYPE = "salesorders";
 const MAX_ENDPOINT = "/sales-orders/current-max-sequence";
 const SYNC_ENDPOINT_BASE = "/sales-orders/sync";
@@ -37,7 +37,6 @@ async function runSalesOrdersSyncInternal() {
             results.push(r);
         }
         catch (err) {
-            // Log per-connectie fout in floriday_sync_state.last_error en ga door.
             await supabaseAdmin.from("floriday_sync_state").upsert({
                 connection_id: conn.id,
                 entity_type: ENTITY_TYPE,
@@ -56,15 +55,13 @@ async function runSalesOrdersSyncInternal() {
     }
     return { ok: results.every((r) => r.ok), results };
 }
-// Public helper for cron route (no middleware — protected by /api/public + DB-only secrets)
 export async function runSalesOrdersSyncFromCron() {
     return runSalesOrdersSyncInternal();
 }
-// Manual trigger from authenticated UI / admin
 export const runSalesOrdersSync = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .handler(async () => runSalesOrdersSyncInternal());
-// ─── Write actions: createSalesOrder ──────────────────────────────────────
+// ─── Write actions ────────────────────────────────────────────────────────
 const CreateOrderSchema = z.object({
     customerOrganizationId: z.string().min(1),
     deliveryDateTime: z.string().min(1),
@@ -77,41 +74,24 @@ const CreateOrderSchema = z.object({
         .min(1),
     reference: z.string().optional(),
 });
-function apiBaseFor(env) {
-    return env === "production" || env === "prod"
-        ? FLORIDAY_API_BASES.production
-        : FLORIDAY_API_BASES.staging;
-}
-async function pickActiveConnection() {
+async function readActiveEnvironment() {
     const { supabaseAdmin } = await import("../integrations/supabase/client.server");
-    const { data: settings } = await supabaseAdmin
+    const { data } = await supabaseAdmin
         .from("floriday_settings")
         .select("active_environment")
         .eq("id", 1)
         .maybeSingle();
-    const env = (settings?.active_environment ?? "staging");
-    const { data, error } = await supabaseAdmin
-        .from("floriday_connections")
-        .select("id, environment, access_token, api_key, is_active, gln_code")
-        .eq("environment", env)
-        .eq("is_active", true)
-        .order("updated_at", { ascending: false })
-        .limit(1)
-        .maybeSingle();
-    if (error)
-        throw new Error(`Floriday connectie ophalen mislukt: ${error.message}`);
-    if (!data)
-        throw new Error(`Geen actieve Floriday connectie voor omgeving "${env}"`);
-    return data;
+    const env = String(data?.active_environment ?? "staging");
+    return env === "production" || env === "prod" || env === "live" ? "live" : "staging";
 }
 export const createSalesOrder = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .inputValidator((data) => CreateOrderSchema.parse(data))
-    .handler(async ({ data }) => {
-    const conn = await pickActiveConnection();
-    if (!conn.access_token) {
-        throw new Error("Floriday access_token ontbreekt — auth-module moet eerst draaien");
-    }
+    .handler(async ({ data, context }) => {
+    const env = await readActiveEnvironment();
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { florydayWrite, pickActiveConnection } = await import("./floriday-gateway.server");
+    const conn = await pickActiveConnection(supabaseAdmin, env);
     const body = {
         orderReference: data.reference ?? `ORD-${Date.now()}`,
         deliveryDateTime: data.deliveryDateTime,
@@ -123,59 +103,38 @@ export const createSalesOrder = createServerFn({ method: "POST" })
             pricePerPiece: { value: l.pricePerPiece, currency: "EUR" },
         })),
     };
-    const url = `${apiBaseFor(conn.environment)}/sales-orders`;
-    const res = await fetch(url, {
+    const result = await florydayWrite(supabaseAdmin, env, {
+        module: "sales",
+        action: "create-sales-order",
         method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            Accept: "application/json",
-            Authorization: `Bearer ${conn.access_token}`,
-            ...(conn.api_key ? { "x-api-key": conn.api_key } : {}),
-        },
-        body: JSON.stringify(body),
-    });
-    const text = await res.text();
-    if (!res.ok) {
-        throw new Error(`Floriday POST /sales-orders [${res.status}]: ${text.slice(0, 400)}`);
+        path: "/sales-orders",
+        referenceId: data.reference ?? null,
+        body,
+    }, context.userId);
+    if (!result.ok) {
+        throw new Error(result.error ?? `Floriday POST /sales-orders faalde (status ${result.status})`);
     }
-    const result = text ? JSON.parse(text) : null;
-    return { id: result?.id ?? result?.salesOrderId ?? null, ok: true };
+    const r = result.data;
+    return { id: r?.id ?? r?.salesOrderId ?? null, ok: true, attemptId: result.attemptId };
 });
-// ─── Diagnose: /current-max-sequence + lokale cron-status ─────────────────
-// We bellen alleen /sales-orders/current-max-sequence; de oude /organisation-call
-// bestaat niet op suppliers-api-2026v1 (404 route-not-found). Tenant-identiteit
-// tonen we op basis van de lokaal opgeslagen gln_code uit floriday_connections.
+// ─── Diagnose ─────────────────────────────────────────────────────────────
 export const diagnoseFloridayConnection = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .handler(async () => {
-    const conn = await pickActiveConnection();
-    const base = apiBaseFor(conn.environment);
-    const headers = {
-        Accept: "application/json",
-        Authorization: `Bearer ${conn.access_token ?? ""}`,
-        ...(conn.api_key ? { "x-api-key": conn.api_key } : {}),
-    };
-    const res = await fetch(`${base}/sales-orders/current-max-sequence`, {
+    const env = await readActiveEnvironment();
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { florydayFetch, pickActiveConnection } = await import("./floriday-gateway.server");
+    const conn = await pickActiveConnection(supabaseAdmin, env);
+    const maxRes = await florydayFetch(supabaseAdmin, conn, {
         method: "GET",
-        headers,
+        path: MAX_ENDPOINT,
     });
-    const text = await res.text();
-    let body = null;
-    try {
-        body = text ? JSON.parse(text) : null;
-    }
-    catch {
-        body = null;
-    }
-    const maxOk = res.ok;
-    const maxValue = maxOk
-        ? Number((typeof body === "number"
-            ? body
-            : body?.maxSequenceNumber ?? body?.sequenceNumber ?? 0) ?? 0)
+    const maxValue = maxRes.ok
+        ? Number((typeof maxRes.data === "number"
+            ? maxRes.data
+            : maxRes.data?.maxSequenceNumber ?? maxRes.data?.sequenceNumber ?? 0) ?? 0)
         : null;
-    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
-    // Bij een succesvolle max-call: wis een eventuele stale last_error.
-    if (maxOk) {
+    if (maxRes.ok) {
         await supabaseAdmin.from("floriday_sync_state").upsert({
             connection_id: conn.id,
             entity_type: ENTITY_TYPE,
@@ -191,12 +150,6 @@ export const diagnoseFloridayConnection = createServerFn({ method: "POST" })
         .maybeSingle();
     const lastSeq = Number(state?.last_sequence_number ?? 0) || 0;
     const lastSyncedAt = state?.last_synced_at ?? null;
-    const cronHealth = {
-        lastSyncedAt,
-        lastSequenceNumber: lastSeq,
-        behindBy: maxValue !== null ? Math.max(0, maxValue - lastSeq) : null,
-        neverSynced: lastSyncedAt === null,
-    };
     return {
         connectionId: conn.id,
         environment: conn.environment,
@@ -205,12 +158,17 @@ export const diagnoseFloridayConnection = createServerFn({ method: "POST" })
             source: "floriday_connections",
         },
         maxSequence: {
-            ok: maxOk,
-            status: res.status,
+            ok: maxRes.ok,
+            status: maxRes.status,
             value: maxValue,
-            rawError: maxOk ? null : text.slice(0, 400),
+            rawError: maxRes.ok ? null : maxRes.rawText.slice(0, 400),
+        },
+        cronHealth: {
+            lastSyncedAt,
+            lastSequenceNumber: lastSeq,
+            behindBy: maxValue !== null ? Math.max(0, maxValue - lastSeq) : null,
+            neverSynced: lastSyncedAt === null,
         },
-        cronHealth,
         syncState: state ?? null,
     };
 });