@flowselections/logistiek-engine 1.0.2 → 1.0.4

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

@@ -7,15 +7,17 @@ export const startRecalcJob = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .inputValidator((data) => data ?? {})
     .handler(async ({ data, context }) => {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
     const { startJob } = await import("./logisticsRecalcJob.server");
-    const job = await startJob(context.userId ?? null, data.strategyId ?? null);
+    const job = await startJob(supabaseAdmin, context.userId ?? null, data.strategyId ?? null);
     return { id: job.id, status: job.status, phase: job.phase };
 });
 export const tickRecalcJob = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .handler(async () => {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
     const { tickJob } = await import("./logisticsRecalcJob.server");
-    const job = await tickJob();
+    const job = await tickJob(supabaseAdmin);
     return job
         ? {
             id: job.id,

package/dist-lib/lib/logisticsRecalcJob.server.d.ts

@@ -1,3 +1,4 @@
+import type { SupabaseClient } from "@supabase/supabase-js";
 export interface RecalcJob {
     id: string;
     status: "running" | "done" | "error";
@@ -17,14 +18,14 @@ export interface RecalcJob {
     finished_at: string | null;
     updated_at: string;
 }
-export declare function getRunningJob(): Promise<RecalcJob | null>;
-export declare function getLatestJob(): Promise<RecalcJob | null>;
+export declare function getRunningJob(sb: SupabaseClient): Promise<RecalcJob | null>;
+export declare function getLatestJob(sb: SupabaseClient): Promise<RecalcJob | null>;
 /** Start een nieuwe job, of geeft de al lopende job terug. */
-export declare function startJob(startedBy: string | null, strategyId: string | null): Promise<RecalcJob>;
+export declare function startJob(sb: SupabaseClient, startedBy: string | null, strategyId: string | null): Promise<RecalcJob>;
 /** Verwerkt één batch van de lopende job. Geeft de bijgewerkte job terug. */
-export declare function tickJob(): Promise<RecalcJob | null>;
+export declare function tickJob(sb: SupabaseClient): Promise<RecalcJob | null>;
 /** Draait de afsluitende herberekenstappen (planning, tellingen, capaciteit). */
-export declare function runFinalSteps(days?: number): Promise<{
+export declare function runFinalSteps(sb: SupabaseClient, days?: number): Promise<{
     step: string;
     ok: boolean;
     error?: string;

package/dist-lib/lib/logisticsRecalcJob.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logisticsRecalcJob.server.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsRecalcJob.server.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAG/D;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAO9D;AAED,8DAA8D;AAC9D,wBAAsB,QAAQ,CAC5B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,SAAS,CAAC,CAsBpB;AAED,6EAA6E;AAC7E,wBAAsB,OAAO,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2CzD;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,IAAI,SAAK;UAiBhB,MAAM;QAAM,OAAO;YAAU,MAAM;KAM/D"}
+{"version":3,"file":"logisticsRecalcJob.server.d.ts","sourceRoot":"","sources":["../../src/lib/logisticsRecalcJob.server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACzC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAGjF;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAOhF;AAED,8DAA8D;AAC9D,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,cAAc,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,SAAS,CAAC,CAsBpB;AAED,6EAA6E;AAC7E,wBAAsB,OAAO,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2C3E;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,SAAK;UAiBpC,MAAM;QAAM,OAAO;YAAU,MAAM;KAM/D"}

package/dist-lib/lib/logisticsRecalcJob.server.js

@@ -5,17 +5,15 @@
 // batch, zodat er nooit een timeout ontstaat en de job doorloopt ook als de
 // gebruiker de pagina verlaat.
 // ============================================================================
-import { supabaseAdmin } from "../integrations/supabase/client.server";
-import { planBuffersBatch, planLooseOrdersBatch } from "./bulkLoadCarrierPlanning.server";
-const db = () => supabaseAdmin;
+import { planBuffersBatch, planLooseOrdersBatch } from "./bulkLoadCarrierPlanning.server.js";
 const TABLE = "logistics_recalc_jobs";
 const BATCH = 20;
-export async function getRunningJob() {
-    const { data } = await db().from(TABLE).select("*").eq("status", "running").limit(1);
+export async function getRunningJob(sb) {
+    const { data } = await sb.from(TABLE).select("*").eq("status", "running").limit(1);
     return Array.isArray(data) && data.length > 0 ? data[0] : null;
 }
-export async function getLatestJob() {
-    const { data } = await db()
+export async function getLatestJob(sb) {
+    const { data } = await sb
         .from(TABLE)
         .select("*")
         .order("created_at", { ascending: false })
@@ -23,11 +21,11 @@ export async function getLatestJob() {
     return Array.isArray(data) && data.length > 0 ? data[0] : null;
 }
 /** Start een nieuwe job, of geeft de al lopende job terug. */
-export async function startJob(startedBy, strategyId) {
-    const running = await getRunningJob();
+export async function startJob(sb, startedBy, strategyId) {
+    const running = await getRunningJob(sb);
     if (running)
         return running;
-    const { data, error } = await db()
+    const { data, error } = await sb
         .from(TABLE)
         .insert({
         status: "running",
@@ -39,7 +37,7 @@ export async function startJob(startedBy, strategyId) {
         .single();
     if (error) {
         // Race: iemand anders startte net een job.
-        const existing = await getRunningJob();
+        const existing = await getRunningJob(sb);
         if (existing)
             return existing;
         throw new Error(error.message);
@@ -47,8 +45,8 @@ export async function startJob(startedBy, strategyId) {
     return data;
 }
 /** Verwerkt één batch van de lopende job. Geeft de bijgewerkte job terug. */
-export async function tickJob() {
-    const job = await getRunningJob();
+export async function tickJob(sb) {
+    const job = await getRunningJob(sb);
     if (!job)
         return null;
     const patch = { last_tick_at: new Date().toISOString() };
@@ -56,8 +54,8 @@ export async function tickJob() {
     try {
         if (job.phase === "buffers" || job.phase === "orders") {
             const batch = job.phase === "buffers"
-                ? await planBuffersBatch(job.cursor, BATCH)
-                : await planLooseOrdersBatch(job.cursor, BATCH);
+                ? await planBuffersBatch(sb, job.cursor, BATCH)
+                : await planLooseOrdersBatch(sb, job.cursor, BATCH);
             patch['processed'] = job.processed + batch.processed;
             patch['carts_created'] = job.carts_created + batch.cartsCreated;
             patch['skipped_locked'] = job.skipped_locked + batch.skippedLocked;
@@ -76,7 +74,7 @@ export async function tickJob() {
             }
         }
         else {
-            const steps = await runFinalSteps();
+            const steps = await runFinalSteps(sb);
             patch['steps'] = steps;
             patch['status'] = steps.every((s) => s.ok) ? "done" : "error";
             patch['finished_at'] = new Date().toISOString();
@@ -88,11 +86,11 @@ export async function tickJob() {
         patch['status'] = "error";
         patch['finished_at'] = new Date().toISOString();
     }
-    const { data } = await db().from(TABLE).update(patch).eq("id", job.id).select("*").single();
+    const { data } = await sb.from(TABLE).update(patch).eq("id", job.id).select("*").single();
     return (data ?? null);
 }
 /** Draait de afsluitende herberekenstappen (planning, tellingen, capaciteit). */
-export async function runFinalSteps(days = 21) {
+export async function runFinalSteps(sb, days = 21) {
     const today = new Date();
     const until = new Date(today.getTime() + days * 24 * 60 * 60 * 1000);
     const iso = (d) => d.toISOString().slice(0, 10);
@@ -109,7 +107,7 @@ export async function runFinalSteps(days = 21) {
     ];
     const steps = [];
     for (const call of calls) {
-        const { error } = await db().rpc(call.fn, call.args);
+        const { error } = await sb.rpc(call.fn, call.args);
         steps.push({ step: call.step, ok: !error, ...(error ? { error: error.message } : {}) });
     }
     return steps;