diff --git a/apps/webapp/app/platform/zodWorker.server.ts b/apps/webapp/app/platform/zodWorker.server.ts index c2eb7ff65..c16fbeafd 100644 --- a/apps/webapp/app/platform/zodWorker.server.ts +++ b/apps/webapp/app/platform/zodWorker.server.ts @@ -82,11 +82,15 @@ type BatchTaskSpec = TaskSpec & { maxPayloads?: number; }; -export type ZodWorkerEnqueueOptions = TaskSpec & +export type ZodWorkerBatchEnqueueOptions = TaskSpec & Pick & { tx?: PrismaClientOrTransaction; }; +export type ZodWorkerEnqueueOptions = TaskSpec & { + tx?: PrismaClientOrTransaction; + }; + export type ZodWorkerDequeueOptions = { tx?: PrismaClientOrTransaction; }; @@ -313,13 +317,13 @@ export class ZodWorker { return job; } - public async enqueueBatch< + public async batchEnqueue< K extends keyof TMessageCatalog, TPayload extends z.infer >( identifier: K, payload: TPayload extends any[] ? TPayload : never, - options?: ZodWorkerEnqueueOptions + options?: ZodWorkerBatchEnqueueOptions ): Promise { const task = this.#tasks[identifier]; diff --git a/apps/webapp/app/routes/admin.api.v1.simulate.batch.ts b/apps/webapp/app/routes/admin.api.v1.simulate.batch.ts index 7b774fda8..554e111d7 100644 --- a/apps/webapp/app/routes/admin.api.v1.simulate.batch.ts +++ b/apps/webapp/app/routes/admin.api.v1.simulate.batch.ts @@ -26,7 +26,7 @@ export async function action({ request }: ActionArgs) { const body: any = await request.json(); - await workerQueue.enqueueBatch( + await workerQueue.batchEnqueue( "simulateBatch", [ { diff --git a/apps/webapp/app/services/db/graphileMigrationHelper.server.ts b/apps/webapp/app/services/db/graphileMigrationHelper.server.ts index 654b6a46f..d6c99a82a 100644 --- a/apps/webapp/app/services/db/graphileMigrationHelper.server.ts +++ b/apps/webapp/app/services/db/graphileMigrationHelper.server.ts @@ -69,7 +69,7 @@ export class GraphileMigrationHelperService { flags := flags, job_key_mode := job_key_mode ); - + IF max_payloads IS NOT NULL AND json_array_length(v_job.payload) >= max_payloads THEN UPDATE ${env.WORKER_SCHEMA}.jobs SET run_at = NOW() WHERE jobs.id = v_job.id RETURNING * INTO v_job; diff --git a/apps/webapp/app/services/worker.server.ts b/apps/webapp/app/services/worker.server.ts index bb9dd4220..46c5fb087 100644 --- a/apps/webapp/app/services/worker.server.ts +++ b/apps/webapp/app/services/worker.server.ts @@ -167,7 +167,7 @@ if (env.NODE_ENV === "production") { export async function init() { const migrationHelper = new GraphileMigrationHelperService(); await migrationHelper.call(); - + // const pgNotify = new PgNotifyService(); // await pgNotify.call("trigger:graphile:migrate", { latestMigration: 10 }); // await new Promise((resolve) => setTimeout(resolve, 10000))