@open-mercato/scheduler 0.6.5-develop.4790.1.bffb4fd44b → 0.6.5-develop.4861.1.59f6de1891

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-[build:scheduler] found 50 entry points
+[build:scheduler] found 51 entry points
 [build:scheduler] built successfully

package/dist/modules/scheduler/__integration__/TC-SCHED-CRUDFORM-001.spec.js

@@ -0,0 +1,105 @@
+import { expect, test } from "@playwright/test";
+import { apiRequest, getAuthToken } from "@open-mercato/core/helpers/integration/api";
+import { readJsonSafe } from "@open-mercato/core/helpers/integration/generalFixtures";
+import {
+  runCrudFormRoundTrip,
+  skipIfCrudFormExtensionTestsDisabled
+} from "@open-mercato/core/helpers/integration/crudFormPersistence";
+const SCHEDULER_JOBS_PATH = "/api/scheduler/jobs";
+async function readScheduledJobById(request, token, id) {
+  const response = await apiRequest(
+    request,
+    "GET",
+    `${SCHEDULER_JOBS_PATH}?id=${encodeURIComponent(id)}&page=1&pageSize=100`,
+    { token }
+  );
+  expect(response.status(), `read-back scheduler jobs failed: ${response.status()}`).toBe(200);
+  const body = await readJsonSafe(response);
+  return (body?.items ?? []).find((item) => item.id === id) ?? null;
+}
+test.describe("TC-SCHED-CRUDFORM-001: Scheduled Job CrudForm persists scope, target + payload JSON", () => {
+  test.beforeAll(() => {
+    skipIfCrudFormExtensionTestsDisabled();
+  });
+  test("round-trips scalars, scope, target + nested payload JSON on create and update", async ({ request }) => {
+    const token = await getAuthToken(request, "admin");
+    const stamp = Date.now();
+    const createPayload = {
+      source: "integration-test",
+      attempts: 3,
+      retries: { max: 5, backoff: "exponential" },
+      tags: ["alpha", "beta"]
+    };
+    const updatePayload = {
+      source: "integration-test-edited",
+      attempts: 1,
+      retries: { max: 0, backoff: "fixed" },
+      tags: ["gamma"]
+    };
+    await runCrudFormRoundTrip({
+      request,
+      token,
+      collectionPath: SCHEDULER_JOBS_PATH,
+      readById: (id) => readScheduledJobById(request, token, id),
+      create: {
+        payload: {
+          name: `QA CRUDFORM Scheduled Job ${stamp}`,
+          description: "Original scheduled job description",
+          scopeType: "organization",
+          scheduleType: "interval",
+          scheduleValue: "15m",
+          timezone: "UTC",
+          targetType: "queue",
+          targetQueue: "scheduler-execution",
+          targetPayload: createPayload,
+          isEnabled: true,
+          sourceType: "user"
+        }
+      },
+      expectAfterCreate: {
+        scalars: {
+          name: `QA CRUDFORM Scheduled Job ${stamp}`,
+          description: "Original scheduled job description",
+          scopeType: "organization",
+          scheduleType: "interval",
+          scheduleValue: "15m",
+          timezone: "UTC",
+          targetType: "queue",
+          targetQueue: "scheduler-execution",
+          targetCommand: null,
+          targetPayload: createPayload,
+          isEnabled: true,
+          sourceType: "user"
+        }
+      },
+      update: {
+        payload: (id) => ({
+          id,
+          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,
+          description: "Updated scheduled job description",
+          scheduleType: "cron",
+          scheduleValue: "0 0 * * *",
+          timezone: "Europe/Warsaw",
+          targetPayload: updatePayload,
+          isEnabled: false
+        })
+      },
+      expectAfterUpdate: {
+        scalars: {
+          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,
+          description: "Updated scheduled job description",
+          scopeType: "organization",
+          scheduleType: "cron",
+          scheduleValue: "0 0 * * *",
+          timezone: "Europe/Warsaw",
+          targetType: "queue",
+          targetQueue: "scheduler-execution",
+          targetCommand: null,
+          targetPayload: updatePayload,
+          isEnabled: false
+        }
+      }
+    });
+  });
+});
+//# sourceMappingURL=TC-SCHED-CRUDFORM-001.spec.js.map

package/dist/modules/scheduler/__integration__/TC-SCHED-CRUDFORM-001.spec.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/scheduler/__integration__/TC-SCHED-CRUDFORM-001.spec.ts"],
+  "sourcesContent": ["import { expect, test, type APIRequestContext } from '@playwright/test';\nimport { apiRequest, getAuthToken } from '@open-mercato/core/helpers/integration/api';\nimport { readJsonSafe } from '@open-mercato/core/helpers/integration/generalFixtures';\nimport {\n  runCrudFormRoundTrip,\n  skipIfCrudFormExtensionTestsDisabled,\n  type CrudRecord,\n} from '@open-mercato/core/helpers/integration/crudFormPersistence';\n\n/**\n * TC-SCHED-CRUDFORM-001: Scheduled Job CrudForm persists scope, target + payload JSON (#2466).\n *\n * The scheduler's scheduled-job is the Tier-B \"JSON-bearing scalar\" surface: scope\n * (scopeType, server-derived org/tenant), schedule (scheduleType/scheduleValue/timezone),\n * target (targetType/targetQueue), and a nested `targetPayload` JSON object. Proves create +\n * update round-trip every value.\n *\n * Verified contract (differs from the makeCrud-default reference specs):\n * - The list GET filters by `?id=` (single uuid), not the `?ids=` other sweep modules use; the\n *   explicit `readById` documents that contract and mirrors the sibling specs (the shared\n *   harness default reads back via `?id=` too).\n * - Read-back is camelCase: the list `transformItem` maps every column to camelCase\n *   (`scopeType`, `scheduleType`, `targetPayload`, `isEnabled`, ...), so the scalar\n *   expectations use camelCase keys (not the snake_case of resources/staff).\n * - The scheduled-job declares no custom entity (no `ce.ts`), so there are no `cf_*` fields \u2014\n *   the surface is scalars + nested JSON only.\n * - Scope is derived server-side from the caller's auth context and is immutable on update:\n *   `scopeType: 'organization'` fills org+tenant from the admin token and survives the edit.\n * - Update is a partial PUT: omitted target fields are retained, so the update changes the\n *   payload JSON while proving `targetType`/`targetQueue` survive untouched.\n * - Harness cleanup deletes via `?id=`; the scheduler delete resolves the id from the query\n *   string, so the default `finally` cleanup removes the fixture.\n *\n * Self-contained: the job needs no pre-created fixtures (queue target + inline JSON), and the\n * harness deletes it in `finally`.\n *\n * Gated by `OM_INTEGRATION_CRUDFORM_EXTENSION_TESTS_DISABLED` (default off \u2192 runs).\n */\nconst SCHEDULER_JOBS_PATH = '/api/scheduler/jobs';\n\nasync function readScheduledJobById(\n  request: APIRequestContext,\n  token: string,\n  id: string,\n): Promise<CrudRecord | null> {\n  const response = await apiRequest(\n    request,\n    'GET',\n    `${SCHEDULER_JOBS_PATH}?id=${encodeURIComponent(id)}&page=1&pageSize=100`,\n    { token },\n  );\n  expect(response.status(), `read-back scheduler jobs failed: ${response.status()}`).toBe(200);\n  const body = await readJsonSafe<{ items?: CrudRecord[] }>(response);\n  return (body?.items ?? []).find((item) => item.id === id) ?? null;\n}\n\ntest.describe('TC-SCHED-CRUDFORM-001: Scheduled Job CrudForm persists scope, target + payload JSON', () => {\n  test.beforeAll(() => {\n    skipIfCrudFormExtensionTestsDisabled();\n  });\n\n  test('round-trips scalars, scope, target + nested payload JSON on create and update', async ({ request }) => {\n    const token = await getAuthToken(request, 'admin');\n    const stamp = Date.now();\n\n    const createPayload = {\n      source: 'integration-test',\n      attempts: 3,\n      retries: { max: 5, backoff: 'exponential' },\n      tags: ['alpha', 'beta'],\n    };\n    const updatePayload = {\n      source: 'integration-test-edited',\n      attempts: 1,\n      retries: { max: 0, backoff: 'fixed' },\n      tags: ['gamma'],\n    };\n\n    await runCrudFormRoundTrip({\n      request,\n      token,\n      collectionPath: SCHEDULER_JOBS_PATH,\n      readById: (id) => readScheduledJobById(request, token, id),\n      create: {\n        payload: {\n          name: `QA CRUDFORM Scheduled Job ${stamp}`,\n          description: 'Original scheduled job description',\n          scopeType: 'organization',\n          scheduleType: 'interval',\n          scheduleValue: '15m',\n          timezone: 'UTC',\n          targetType: 'queue',\n          targetQueue: 'scheduler-execution',\n          targetPayload: createPayload,\n          isEnabled: true,\n          sourceType: 'user',\n        },\n      },\n      expectAfterCreate: {\n        scalars: {\n          name: `QA CRUDFORM Scheduled Job ${stamp}`,\n          description: 'Original scheduled job description',\n          scopeType: 'organization',\n          scheduleType: 'interval',\n          scheduleValue: '15m',\n          timezone: 'UTC',\n          targetType: 'queue',\n          targetQueue: 'scheduler-execution',\n          targetCommand: null,\n          targetPayload: createPayload,\n          isEnabled: true,\n          sourceType: 'user',\n        },\n      },\n      update: {\n        payload: (id) => ({\n          id,\n          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,\n          description: 'Updated scheduled job description',\n          scheduleType: 'cron',\n          scheduleValue: '0 0 * * *',\n          timezone: 'Europe/Warsaw',\n          targetPayload: updatePayload,\n          isEnabled: false,\n        }),\n      },\n      expectAfterUpdate: {\n        scalars: {\n          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,\n          description: 'Updated scheduled job description',\n          scopeType: 'organization',\n          scheduleType: 'cron',\n          scheduleValue: '0 0 * * *',\n          timezone: 'Europe/Warsaw',\n          targetType: 'queue',\n          targetQueue: 'scheduler-execution',\n          targetCommand: null,\n          targetPayload: updatePayload,\n          isEnabled: false,\n        },\n      },\n    });\n  });\n});\n"],
+  "mappings": "AAAA,SAAS,QAAQ,YAAoC;AACrD,SAAS,YAAY,oBAAoB;AACzC,SAAS,oBAAoB;AAC7B;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AA+BP,MAAM,sBAAsB;AAE5B,eAAe,qBACb,SACA,OACA,IAC4B;AAC5B,QAAM,WAAW,MAAM;AAAA,IACrB;AAAA,IACA;AAAA,IACA,GAAG,mBAAmB,OAAO,mBAAmB,EAAE,CAAC;AAAA,IACnD,EAAE,MAAM;AAAA,EACV;AACA,SAAO,SAAS,OAAO,GAAG,oCAAoC,SAAS,OAAO,CAAC,EAAE,EAAE,KAAK,GAAG;AAC3F,QAAM,OAAO,MAAM,aAAuC,QAAQ;AAClE,UAAQ,MAAM,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,KAAK,OAAO,EAAE,KAAK;AAC/D;AAEA,KAAK,SAAS,uFAAuF,MAAM;AACzG,OAAK,UAAU,MAAM;AACnB,yCAAqC;AAAA,EACvC,CAAC;AAED,OAAK,iFAAiF,OAAO,EAAE,QAAQ,MAAM;AAC3G,UAAM,QAAQ,MAAM,aAAa,SAAS,OAAO;AACjD,UAAM,QAAQ,KAAK,IAAI;AAEvB,UAAM,gBAAgB;AAAA,MACpB,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,SAAS,EAAE,KAAK,GAAG,SAAS,cAAc;AAAA,MAC1C,MAAM,CAAC,SAAS,MAAM;AAAA,IACxB;AACA,UAAM,gBAAgB;AAAA,MACpB,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,SAAS,EAAE,KAAK,GAAG,SAAS,QAAQ;AAAA,MACpC,MAAM,CAAC,OAAO;AAAA,IAChB;AAEA,UAAM,qBAAqB;AAAA,MACzB;AAAA,MACA;AAAA,MACA,gBAAgB;AAAA,MAChB,UAAU,CAAC,OAAO,qBAAqB,SAAS,OAAO,EAAE;AAAA,MACzD,QAAQ;AAAA,QACN,SAAS;AAAA,UACP,MAAM,6BAA6B,KAAK;AAAA,UACxC,aAAa;AAAA,UACb,WAAW;AAAA,UACX,cAAc;AAAA,UACd,eAAe;AAAA,UACf,UAAU;AAAA,UACV,YAAY;AAAA,UACZ,aAAa;AAAA,UACb,eAAe;AAAA,UACf,WAAW;AAAA,UACX,YAAY;AAAA,QACd;AAAA,MACF;AAAA,MACA,mBAAmB;AAAA,QACjB,SAAS;AAAA,UACP,MAAM,6BAA6B,KAAK;AAAA,UACxC,aAAa;AAAA,UACb,WAAW;AAAA,UACX,cAAc;AAAA,UACd,eAAe;AAAA,UACf,UAAU;AAAA,UACV,YAAY;AAAA,UACZ,aAAa;AAAA,UACb,eAAe;AAAA,UACf,eAAe;AAAA,UACf,WAAW;AAAA,UACX,YAAY;AAAA,QACd;AAAA,MACF;AAAA,MACA,QAAQ;AAAA,QACN,SAAS,CAAC,QAAQ;AAAA,UAChB;AAAA,UACA,MAAM,6BAA6B,KAAK;AAAA,UACxC,aAAa;AAAA,UACb,cAAc;AAAA,UACd,eAAe;AAAA,UACf,UAAU;AAAA,UACV,eAAe;AAAA,UACf,WAAW;AAAA,QACb;AAAA,MACF;AAAA,MACA,mBAAmB;AAAA,QACjB,SAAS;AAAA,UACP,MAAM,6BAA6B,KAAK;AAAA,UACxC,aAAa;AAAA,UACb,WAAW;AAAA,UACX,cAAc;AAAA,UACd,eAAe;AAAA,UACf,UAAU;AAAA,UACV,YAAY;AAAA,UACZ,aAAa;AAAA,UACb,eAAe;AAAA,UACf,eAAe;AAAA,UACf,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH,CAAC;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/scheduler",
-  "version": "0.6.5-develop.4790.1.bffb4fd44b",
+  "version": "0.6.5-develop.4861.1.59f6de1891",
   "description": "Database-managed scheduled jobs with admin UI",
   "type": "module",
   "main": "./dist/index.js",
@@ -58,13 +58,13 @@
     "./*/*/*/*/*/*.json": "./src/*/*/*/*/*/*.json"
   },
   "dependencies": {
-    "@open-mercato/events": "0.6.5-develop.4790.1.bffb4fd44b",
-    "@open-mercato/queue": "0.6.5-develop.4790.1.bffb4fd44b",
+    "@open-mercato/events": "0.6.5-develop.4861.1.59f6de1891",
+    "@open-mercato/queue": "0.6.5-develop.4861.1.59f6de1891",
     "cron-parser": "^5.5.0"
   },
   "peerDependencies": {
     "@mikro-orm/core": "^7.0.14",
-    "@open-mercato/shared": "0.6.5-develop.4790.1.bffb4fd44b",
+    "@open-mercato/shared": "0.6.5-develop.4861.1.59f6de1891",
     "bullmq": "^5.0.0",
     "ioredis": "^5.0.0",
     "zod": ">=3.23.0"
@@ -78,7 +78,7 @@
     }
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.5-develop.4790.1.bffb4fd44b",
+    "@open-mercato/shared": "0.6.5-develop.4861.1.59f6de1891",
     "@types/jest": "^30.0.0",
     "@types/node": "^25.9.1",
     "jest": "^30.4.2",

package/src/modules/scheduler/__integration__/TC-SCHED-CRUDFORM-001.spec.ts

@@ -0,0 +1,144 @@
+import { expect, test, type APIRequestContext } from '@playwright/test';
+import { apiRequest, getAuthToken } from '@open-mercato/core/helpers/integration/api';
+import { readJsonSafe } from '@open-mercato/core/helpers/integration/generalFixtures';
+import {
+  runCrudFormRoundTrip,
+  skipIfCrudFormExtensionTestsDisabled,
+  type CrudRecord,
+} from '@open-mercato/core/helpers/integration/crudFormPersistence';
+
+/**
+ * TC-SCHED-CRUDFORM-001: Scheduled Job CrudForm persists scope, target + payload JSON (#2466).
+ *
+ * The scheduler's scheduled-job is the Tier-B "JSON-bearing scalar" surface: scope
+ * (scopeType, server-derived org/tenant), schedule (scheduleType/scheduleValue/timezone),
+ * target (targetType/targetQueue), and a nested `targetPayload` JSON object. Proves create +
+ * update round-trip every value.
+ *
+ * Verified contract (differs from the makeCrud-default reference specs):
+ * - The list GET filters by `?id=` (single uuid), not the `?ids=` other sweep modules use; the
+ *   explicit `readById` documents that contract and mirrors the sibling specs (the shared
+ *   harness default reads back via `?id=` too).
+ * - Read-back is camelCase: the list `transformItem` maps every column to camelCase
+ *   (`scopeType`, `scheduleType`, `targetPayload`, `isEnabled`, ...), so the scalar
+ *   expectations use camelCase keys (not the snake_case of resources/staff).
+ * - The scheduled-job declares no custom entity (no `ce.ts`), so there are no `cf_*` fields —
+ *   the surface is scalars + nested JSON only.
+ * - Scope is derived server-side from the caller's auth context and is immutable on update:
+ *   `scopeType: 'organization'` fills org+tenant from the admin token and survives the edit.
+ * - Update is a partial PUT: omitted target fields are retained, so the update changes the
+ *   payload JSON while proving `targetType`/`targetQueue` survive untouched.
+ * - Harness cleanup deletes via `?id=`; the scheduler delete resolves the id from the query
+ *   string, so the default `finally` cleanup removes the fixture.
+ *
+ * Self-contained: the job needs no pre-created fixtures (queue target + inline JSON), and the
+ * harness deletes it in `finally`.
+ *
+ * Gated by `OM_INTEGRATION_CRUDFORM_EXTENSION_TESTS_DISABLED` (default off → runs).
+ */
+const SCHEDULER_JOBS_PATH = '/api/scheduler/jobs';
+
+async function readScheduledJobById(
+  request: APIRequestContext,
+  token: string,
+  id: string,
+): Promise<CrudRecord | null> {
+  const response = await apiRequest(
+    request,
+    'GET',
+    `${SCHEDULER_JOBS_PATH}?id=${encodeURIComponent(id)}&page=1&pageSize=100`,
+    { token },
+  );
+  expect(response.status(), `read-back scheduler jobs failed: ${response.status()}`).toBe(200);
+  const body = await readJsonSafe<{ items?: CrudRecord[] }>(response);
+  return (body?.items ?? []).find((item) => item.id === id) ?? null;
+}
+
+test.describe('TC-SCHED-CRUDFORM-001: Scheduled Job CrudForm persists scope, target + payload JSON', () => {
+  test.beforeAll(() => {
+    skipIfCrudFormExtensionTestsDisabled();
+  });
+
+  test('round-trips scalars, scope, target + nested payload JSON on create and update', async ({ request }) => {
+    const token = await getAuthToken(request, 'admin');
+    const stamp = Date.now();
+
+    const createPayload = {
+      source: 'integration-test',
+      attempts: 3,
+      retries: { max: 5, backoff: 'exponential' },
+      tags: ['alpha', 'beta'],
+    };
+    const updatePayload = {
+      source: 'integration-test-edited',
+      attempts: 1,
+      retries: { max: 0, backoff: 'fixed' },
+      tags: ['gamma'],
+    };
+
+    await runCrudFormRoundTrip({
+      request,
+      token,
+      collectionPath: SCHEDULER_JOBS_PATH,
+      readById: (id) => readScheduledJobById(request, token, id),
+      create: {
+        payload: {
+          name: `QA CRUDFORM Scheduled Job ${stamp}`,
+          description: 'Original scheduled job description',
+          scopeType: 'organization',
+          scheduleType: 'interval',
+          scheduleValue: '15m',
+          timezone: 'UTC',
+          targetType: 'queue',
+          targetQueue: 'scheduler-execution',
+          targetPayload: createPayload,
+          isEnabled: true,
+          sourceType: 'user',
+        },
+      },
+      expectAfterCreate: {
+        scalars: {
+          name: `QA CRUDFORM Scheduled Job ${stamp}`,
+          description: 'Original scheduled job description',
+          scopeType: 'organization',
+          scheduleType: 'interval',
+          scheduleValue: '15m',
+          timezone: 'UTC',
+          targetType: 'queue',
+          targetQueue: 'scheduler-execution',
+          targetCommand: null,
+          targetPayload: createPayload,
+          isEnabled: true,
+          sourceType: 'user',
+        },
+      },
+      update: {
+        payload: (id) => ({
+          id,
+          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,
+          description: 'Updated scheduled job description',
+          scheduleType: 'cron',
+          scheduleValue: '0 0 * * *',
+          timezone: 'Europe/Warsaw',
+          targetPayload: updatePayload,
+          isEnabled: false,
+        }),
+      },
+      expectAfterUpdate: {
+        scalars: {
+          name: `QA CRUDFORM Scheduled Job ${stamp} EDITED`,
+          description: 'Updated scheduled job description',
+          scopeType: 'organization',
+          scheduleType: 'cron',
+          scheduleValue: '0 0 * * *',
+          timezone: 'Europe/Warsaw',
+          targetType: 'queue',
+          targetQueue: 'scheduler-execution',
+          targetCommand: null,
+          targetPayload: updatePayload,
+          isEnabled: false,
+        },
+      },
+    });
+  });
+});