@pgpm/database-jobs 0.26.0 → 0.26.1

package/Makefile

@@ -1,5 +1,5 @@
 EXTENSION = pgpm-database-jobs
-DATA = sql/pgpm-database-jobs--0.22.0.sql
+DATA = sql/pgpm-database-jobs--0.26.0.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/deploy/schemas/app_jobs/procedures/add_job.sql

@@ -13,7 +13,8 @@ CREATE FUNCTION app_jobs.add_job (
   queue_name text DEFAULT NULL,
   run_at timestamptz DEFAULT now(),
   max_attempts integer DEFAULT 25,
-  priority integer DEFAULT 0
+  priority integer DEFAULT 0,
+  entity_id uuid DEFAULT NULL
 )
   RETURNS app_jobs.jobs
   AS $$
@@ -31,6 +32,7 @@ BEGIN
     INSERT INTO app_jobs.jobs (
       database_id,
       actor_id,
+      entity_id,
       task_identifier,
       payload,
       queue_name,
@@ -41,6 +43,7 @@ BEGIN
     ) VALUES (
         v_database_id,
         v_actor_id,
+        add_job.entity_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -84,6 +87,7 @@ BEGIN
   INSERT INTO app_jobs.jobs (
     database_id,
     actor_id,
+    entity_id,
     task_identifier,
     payload,
     queue_name,
@@ -93,6 +97,7 @@ BEGIN
   ) VALUES (
     v_database_id,
     v_actor_id,
+    add_job.entity_id,
     identifier,
     payload,
     queue_name,

package/deploy/schemas/app_jobs/procedures/add_scheduled_job.sql

@@ -14,7 +14,8 @@ CREATE FUNCTION app_jobs.add_scheduled_job(
   job_key text DEFAULT NULL,
   queue_name text DEFAULT NULL,
   max_attempts integer DEFAULT 25,
-  priority integer DEFAULT 0
+  priority integer DEFAULT 0,
+  entity_id uuid DEFAULT NULL
 )
   RETURNS app_jobs.scheduled_jobs
   AS $$
@@ -32,6 +33,7 @@ BEGIN
     INSERT INTO app_jobs.scheduled_jobs (
       database_id,
       actor_id,
+      entity_id,
       task_identifier,
       payload,
       queue_name,
@@ -42,6 +44,7 @@ BEGIN
       ) VALUES (
         v_database_id,
         v_actor_id,
+        add_scheduled_job.entity_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -81,6 +84,7 @@ BEGIN
   INSERT INTO app_jobs.scheduled_jobs (
     database_id,
     actor_id,
+    entity_id,
     task_identifier,
     payload,
     queue_name,
@@ -90,6 +94,7 @@ BEGIN
     ) VALUES (
     v_database_id,
     v_actor_id,
+    add_scheduled_job.entity_id,
     identifier,
     payload,
     queue_name,

package/deploy/schemas/app_jobs/procedures/run_scheduled_job.sql

@@ -42,6 +42,7 @@ BEGIN
   INSERT INTO app_jobs.jobs (
     database_id,
     actor_id,
+    entity_id,
     queue_name,
     task_identifier,
     payload,
@@ -51,6 +52,7 @@ BEGIN
   ) SELECT
     database_id,
     actor_id,
+    entity_id,
     queue_name,
     task_identifier,
     payload,

package/deploy/schemas/app_jobs/tables/jobs/table.sql

@@ -6,6 +6,7 @@ CREATE TABLE app_jobs.jobs (
   id bigserial PRIMARY KEY,
   database_id uuid,
   actor_id uuid,
+  entity_id uuid,
   queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload json DEFAULT '{}' ::json NOT NULL,
@@ -30,6 +31,7 @@ COMMENT ON TABLE app_jobs.jobs IS 'Background job queue: each row is a pending o
 COMMENT ON COLUMN app_jobs.jobs.id IS 'Auto-incrementing job identifier';
 COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to (nullable for system-level jobs without tenant context)';
 COMMENT ON COLUMN app_jobs.jobs.actor_id IS 'User who triggered this job, read from JWT claims at enqueue time';
+COMMENT ON COLUMN app_jobs.jobs.entity_id IS 'Entity (org/team) this job is scoped to for billing; NULL means platform-level (resolved via database_id → owner_id)';
 COMMENT ON COLUMN app_jobs.jobs.queue_name IS 'Name of the queue this job belongs to; used for worker routing and concurrency control';
 COMMENT ON COLUMN app_jobs.jobs.task_identifier IS 'Identifier for the task type (maps to a worker handler function)';
 COMMENT ON COLUMN app_jobs.jobs.payload IS 'JSON payload of arguments passed to the task handler';

package/deploy/schemas/app_jobs/tables/scheduled_jobs/table.sql

@@ -6,6 +6,7 @@ CREATE TABLE app_jobs.scheduled_jobs (
   id bigserial PRIMARY KEY,
   database_id uuid,
   actor_id uuid,
+  entity_id uuid,
   queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload json DEFAULT '{}' ::json NOT NULL,
@@ -29,6 +30,7 @@ COMMENT ON TABLE app_jobs.scheduled_jobs IS 'Recurring/cron-style job definition
 COMMENT ON COLUMN app_jobs.scheduled_jobs.id IS 'Auto-incrementing scheduled job identifier';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this scheduled job belongs to (nullable for system-level schedules without tenant context)';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.actor_id IS 'User who created this scheduled job, read from JWT claims at creation time';
+COMMENT ON COLUMN app_jobs.scheduled_jobs.entity_id IS 'Entity (org/team) this scheduled job is scoped to for billing; NULL means platform-level (resolved via database_id → owner_id)';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.queue_name IS 'Name of the queue spawned jobs are placed into';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.task_identifier IS 'Task type identifier for spawned jobs';
 COMMENT ON COLUMN app_jobs.scheduled_jobs.payload IS 'JSON payload passed to each spawned job';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/database-jobs",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "Database-specific job handling and queue management",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -35,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "3badf1e5e2fc71deae9e194b779599d17ab28a0d"
+  "gitHead": "e1f2e9bec1c91d0751ebe49e9193459191d3c464"
 }

package/pgpm-database-jobs.control

@@ -1,6 +1,6 @@
 # pgpm-database-jobs extension
 comment = 'pgpm-database-jobs extension'
-default_version = '0.22.0'
+default_version = '0.26.0'
 module_pathname = '$libdir/pgpm-database-jobs'
 requires = 'plpgsql,pgcrypto,pgpm-verify,pgpm-jwt-claims'
 relocatable = false

package/sql/{pgpm-database-jobs--0.22.0.sql → pgpm-database-jobs--0.26.0.sql}

@@ -53,7 +53,9 @@ $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
 COMMENT ON FUNCTION app_jobs.tg_add_job_with_row IS 'Useful shortcut to create a job on insert or update. Pass the task name as the trigger argument, and the record data will automatically be available on the JSON payload.';
 
-CREATE FUNCTION app_jobs.json_build_object_apply(arguments text[]) RETURNS pg_catalog.json AS $EOFCODE$
+CREATE FUNCTION app_jobs.json_build_object_apply(
+  arguments text[]
+) RETURNS pg_catalog.json AS $EOFCODE$
 DECLARE
   arg text;
   _sql text;
@@ -116,6 +118,7 @@ CREATE TABLE app_jobs.scheduled_jobs (
   id bigserial PRIMARY KEY,
   database_id uuid,
   actor_id uuid,
+  entity_id uuid,
   queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
@@ -143,6 +146,8 @@ COMMENT ON COLUMN app_jobs.scheduled_jobs.database_id IS 'Database this schedule
 
 COMMENT ON COLUMN app_jobs.scheduled_jobs.actor_id IS 'User who created this scheduled job, read from JWT claims at creation time';
 
+COMMENT ON COLUMN app_jobs.scheduled_jobs.entity_id IS 'Entity (org/team) this scheduled job is scoped to for billing; NULL means platform-level (resolved via database_id → owner_id)';
+
 COMMENT ON COLUMN app_jobs.scheduled_jobs.queue_name IS 'Name of the queue spawned jobs are placed into';
 
 COMMENT ON COLUMN app_jobs.scheduled_jobs.task_identifier IS 'Task type identifier for spawned jobs';
@@ -189,6 +194,7 @@ CREATE TABLE app_jobs.jobs (
   id bigserial PRIMARY KEY,
   database_id uuid,
   actor_id uuid,
+  entity_id uuid,
   queue_name text DEFAULT NULL,
   task_identifier text NOT NULL,
   payload pg_catalog.json DEFAULT '{}'::json NOT NULL,
@@ -218,6 +224,8 @@ COMMENT ON COLUMN app_jobs.jobs.database_id IS 'Database this job belongs to (nu
 
 COMMENT ON COLUMN app_jobs.jobs.actor_id IS 'User who triggered this job, read from JWT claims at enqueue time';
 
+COMMENT ON COLUMN app_jobs.jobs.entity_id IS 'Entity (org/team) this job is scoped to for billing; NULL means platform-level (resolved via database_id → owner_id)';
+
 COMMENT ON COLUMN app_jobs.jobs.queue_name IS 'Name of the queue this job belongs to; used for worker routing and concurrency control';
 
 COMMENT ON COLUMN app_jobs.jobs.task_identifier IS 'Identifier for the task type (maps to a worker handler function)';
@@ -366,7 +374,10 @@ CREATE INDEX job_queues_locked_by_idx ON app_jobs.job_queues (locked_by);
 
 GRANT SELECT, INSERT, UPDATE, DELETE ON app_jobs.job_queues TO administrator;
 
-CREATE FUNCTION app_jobs.run_scheduled_job(id bigint, job_expiry interval DEFAULT '1 hours') RETURNS app_jobs.jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.run_scheduled_job(
+  id bigint,
+  job_expiry interval DEFAULT '1 hours'
+) RETURNS app_jobs.jobs AS $EOFCODE$
 DECLARE
   j app_jobs.jobs;
   last_id bigint;
@@ -402,6 +413,7 @@ BEGIN
   INSERT INTO app_jobs.jobs (
     database_id,
     actor_id,
+    entity_id,
     queue_name,
     task_identifier,
     payload,
@@ -411,6 +423,7 @@ BEGIN
   ) SELECT
     database_id,
     actor_id,
+    entity_id,
     queue_name,
     task_identifier,
     payload,
@@ -435,7 +448,13 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.reschedule_jobs(job_ids bigint[], run_at timestamptz DEFAULT NULL, priority int DEFAULT NULL, attempts int DEFAULT NULL, max_attempts int DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+CREATE FUNCTION app_jobs.reschedule_jobs(
+  job_ids bigint[],
+  run_at timestamptz DEFAULT NULL,
+  priority int DEFAULT NULL,
+  attempts int DEFAULT NULL,
+  max_attempts int DEFAULT NULL
+) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
   UPDATE
     app_jobs.jobs
   SET
@@ -451,7 +470,10 @@ CREATE FUNCTION app_jobs.reschedule_jobs(job_ids bigint[], run_at timestamptz DE
     *;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.release_scheduled_jobs(worker_id text, ids bigint[] DEFAULT NULL) RETURNS void AS $EOFCODE$
+CREATE FUNCTION app_jobs.release_scheduled_jobs(
+  worker_id text,
+  ids bigint[] DEFAULT NULL
+) RETURNS void AS $EOFCODE$
 DECLARE
 BEGIN
   -- clear the scheduled job
@@ -467,7 +489,9 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.release_jobs(worker_id text) RETURNS void AS $EOFCODE$
+CREATE FUNCTION app_jobs.release_jobs(
+  worker_id text
+) RETURNS void AS $EOFCODE$
 DECLARE
 BEGIN
   -- clear the job
@@ -490,7 +514,10 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
-CREATE FUNCTION app_jobs.permanently_fail_jobs(job_ids bigint[], error_message text DEFAULT NULL) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+CREATE FUNCTION app_jobs.permanently_fail_jobs(
+  job_ids bigint[],
+  error_message text DEFAULT NULL
+) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
   UPDATE
     app_jobs.jobs
   SET
@@ -504,7 +531,10 @@ CREATE FUNCTION app_jobs.permanently_fail_jobs(job_ids bigint[], error_message t
     *;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.get_scheduled_job(worker_id text, task_identifiers text[] DEFAULT NULL) RETURNS app_jobs.scheduled_jobs LANGUAGE plpgsql AS $EOFCODE$
+CREATE FUNCTION app_jobs.get_scheduled_job(
+  worker_id text,
+  task_identifiers text[] DEFAULT NULL
+) RETURNS app_jobs.scheduled_jobs LANGUAGE plpgsql AS $EOFCODE$
 DECLARE
   v_job_id bigint;
   v_row app_jobs.scheduled_jobs;
@@ -556,7 +586,11 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.get_job(worker_id text, task_identifiers text[] DEFAULT NULL, job_expiry interval DEFAULT '4 hours') RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
+CREATE FUNCTION app_jobs.get_job(
+  worker_id text,
+  task_identifiers text[] DEFAULT NULL,
+  job_expiry interval DEFAULT '4 hours'
+) RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
 DECLARE
   v_job_id bigint;
   v_queue_name text;
@@ -611,7 +645,11 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.fail_job(worker_id text, job_id bigint, error_message text) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
+CREATE FUNCTION app_jobs.fail_job(
+  worker_id text,
+  job_id bigint,
+  error_message text
+) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
 DECLARE
   v_row app_jobs.jobs;
 BEGIN
@@ -641,7 +679,9 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.complete_jobs(job_ids bigint[]) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
+CREATE FUNCTION app_jobs.complete_jobs(
+  job_ids bigint[]
+) RETURNS SETOF app_jobs.jobs LANGUAGE sql AS $EOFCODE$
   DELETE FROM app_jobs.jobs
   WHERE id = ANY (job_ids)
     AND (locked_by IS NULL
@@ -650,7 +690,10 @@ CREATE FUNCTION app_jobs.complete_jobs(job_ids bigint[]) RETURNS SETOF app_jobs.
     *;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.complete_job(worker_id text, job_id bigint) RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
+CREATE FUNCTION app_jobs.complete_job(
+  worker_id text,
+  job_id bigint
+) RETURNS app_jobs.jobs LANGUAGE plpgsql AS $EOFCODE$
 DECLARE
   v_row app_jobs.jobs;
 BEGIN
@@ -672,7 +715,16 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.add_scheduled_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, schedule_info pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_scheduled_job(
+  identifier text,
+  payload pg_catalog.json DEFAULT '{}'::json,
+  schedule_info pg_catalog.json DEFAULT '{}'::json,
+  job_key text DEFAULT NULL,
+  queue_name text DEFAULT NULL,
+  max_attempts int DEFAULT 25,
+  priority int DEFAULT 0,
+  entity_id uuid DEFAULT NULL
+) RETURNS app_jobs.scheduled_jobs AS $EOFCODE$
 DECLARE
   v_job app_jobs.scheduled_jobs;
   v_database_id uuid;
@@ -687,6 +739,7 @@ BEGIN
     INSERT INTO app_jobs.scheduled_jobs (
       database_id,
       actor_id,
+      entity_id,
       task_identifier,
       payload,
       queue_name,
@@ -697,6 +750,7 @@ BEGIN
       ) VALUES (
         v_database_id,
         v_actor_id,
+        add_scheduled_job.entity_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -736,6 +790,7 @@ BEGIN
   INSERT INTO app_jobs.scheduled_jobs (
     database_id,
     actor_id,
+    entity_id,
     task_identifier,
     payload,
     queue_name,
@@ -745,6 +800,7 @@ BEGIN
     ) VALUES (
     v_database_id,
     v_actor_id,
+    add_scheduled_job.entity_id,
     identifier,
     payload,
     queue_name,
@@ -756,7 +812,16 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
-CREATE FUNCTION app_jobs.add_job(identifier text, payload pg_catalog.json DEFAULT '{}'::json, job_key text DEFAULT NULL, queue_name text DEFAULT NULL, run_at timestamptz DEFAULT now(), max_attempts int DEFAULT 25, priority int DEFAULT 0) RETURNS app_jobs.jobs AS $EOFCODE$
+CREATE FUNCTION app_jobs.add_job(
+  identifier text,
+  payload pg_catalog.json DEFAULT '{}'::json,
+  job_key text DEFAULT NULL,
+  queue_name text DEFAULT NULL,
+  run_at timestamptz DEFAULT now(),
+  max_attempts int DEFAULT 25,
+  priority int DEFAULT 0,
+  entity_id uuid DEFAULT NULL
+) RETURNS app_jobs.jobs AS $EOFCODE$
 DECLARE
   v_job app_jobs.jobs;
   v_database_id uuid;
@@ -771,6 +836,7 @@ BEGIN
     INSERT INTO app_jobs.jobs (
       database_id,
       actor_id,
+      entity_id,
       task_identifier,
       payload,
       queue_name,
@@ -781,6 +847,7 @@ BEGIN
     ) VALUES (
         v_database_id,
         v_actor_id,
+        add_job.entity_id,
         identifier,
         coalesce(payload, '{}'::json),
         queue_name,
@@ -824,6 +891,7 @@ BEGIN
   INSERT INTO app_jobs.jobs (
     database_id,
     actor_id,
+    entity_id,
     task_identifier,
     payload,
     queue_name,
@@ -833,6 +901,7 @@ BEGIN
   ) VALUES (
     v_database_id,
     v_actor_id,
+    add_job.entity_id,
     identifier,
     payload,
     queue_name,
@@ -846,7 +915,9 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
 
-CREATE FUNCTION app_jobs.remove_job(job_key text) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
+CREATE FUNCTION app_jobs.remove_job(
+  job_key text
+) RETURNS app_jobs.jobs LANGUAGE plpgsql STRICT AS $EOFCODE$
 DECLARE
   v_job app_jobs.jobs;
 BEGIN
@@ -871,7 +942,9 @@ BEGIN
 END;
 $EOFCODE$;
 
-CREATE FUNCTION app_jobs.force_unlock_workers(worker_ids text[]) RETURNS void LANGUAGE sql VOLATILE AS $EOFCODE$
+CREATE FUNCTION app_jobs.force_unlock_workers(
+  worker_ids text[]
+) RETURNS void LANGUAGE sql VOLATILE AS $EOFCODE$
   UPDATE app_jobs.jobs
   SET locked_at = NULL, locked_by = NULL
   WHERE locked_by = ANY (worker_ids);