fix(adapter): preserve schedule runCount on schedule upsert

Author: RomainLanz

src/drivers/fake_adapter.ts

@@ -345,6 +345,7 @@ export class FakeAdapter implements Adapter {
 
   async upsertSchedule(config: ScheduleConfig): Promise<string> {
     const id = config.id ?? randomUUID()
+    const existing = this.#schedules.get(id)
     const now = new Date()
 
     const schedule: ScheduleData = {
@@ -357,11 +358,11 @@ export class FakeAdapter implements Adapter {
       from: config.from ?? null,
       to: config.to ?? null,
       limit: config.limit ?? null,
-      runCount: 0,
-      nextRunAt: null, // Will be calculated by the caller
-      lastRunAt: null,
+      runCount: existing?.runCount ?? 0,
+      nextRunAt: existing?.nextRunAt ?? null, // Will be (re)calculated by the caller
+      lastRunAt: existing?.lastRunAt ?? null,
       status: 'active',
-      createdAt: now,
+      createdAt: existing?.createdAt ?? now,
     }
 
     this.#schedules.set(id, schedule)

src/drivers/redis_adapter.ts

@@ -704,15 +704,20 @@ export class RedisAdapter implements Adapter {
     const id = config.id ?? randomUUID()
     const now = Date.now()
     const scheduleKey = `${schedulesKey}::${id}`
+    const [existingRunCount, existingCreatedAt] = await this.#connection.hmget(
+      scheduleKey,
+      'run_count',
+      'created_at'
+    )
 
     const scheduleData: Record<string, string> = {
       id,
       name: config.name,
       payload: JSON.stringify(config.payload),
       timezone: config.timezone,
       status: 'active',
-      run_count: '0',
-      created_at: now.toString(),
+      run_count: existingRunCount ?? '0',
+      created_at: existingCreatedAt ?? now.toString(),
     }
 
     if (config.cronExpression !== undefined) scheduleData.cron_expression = config.cronExpression

tests/_mocks/memory_adapter.ts

@@ -259,6 +259,7 @@ export class MemoryAdapter implements Adapter {
 
   async upsertSchedule(config: ScheduleConfig): Promise<string> {
     const id = config.id ?? randomUUID()
+    const existing = this.#schedules.get(id)
     const now = new Date()
 
     const schedule: ScheduleData = {
@@ -271,11 +272,11 @@ export class MemoryAdapter implements Adapter {
       from: config.from ?? null,
       to: config.to ?? null,
       limit: config.limit ?? null,
-      runCount: 0,
-      nextRunAt: null, // Will be calculated by the caller
-      lastRunAt: null,
+      runCount: existing?.runCount ?? 0,
+      nextRunAt: existing?.nextRunAt ?? null, // Will be (re)calculated by the caller
+      lastRunAt: existing?.lastRunAt ?? null,
       status: 'active',
-      createdAt: now,
+      createdAt: existing?.createdAt ?? now,
     }
 
     this.#schedules.set(id, schedule)

tests/_utils/register_driver_test_suite.ts

@@ -1167,6 +1167,39 @@ export function registerDriverTestSuite(options: DriverTestSuiteOptions) {
     assert.isNull(schedule!.limit)
   })
 
+  test('upsertSchedule should preserve runtime runCount when id exists', async ({ assert }) => {
+    const adapter = await options.createAdapter()
+
+    await adapter.upsertSchedule({
+      id: 'upsert-preserve-run-count',
+      name: 'TestJob',
+      payload: { version: 1 },
+      everyMs: 5000,
+      timezone: 'UTC',
+    })
+
+    await adapter.updateSchedule('upsert-preserve-run-count', {
+      runCount: 3,
+      lastRunAt: new Date(),
+      nextRunAt: new Date(Date.now() + 60_000),
+    })
+
+    await adapter.upsertSchedule({
+      id: 'upsert-preserve-run-count',
+      name: 'TestJob',
+      payload: { version: 2 },
+      cronExpression: '*/5 * * * *',
+      timezone: 'Europe/Paris',
+    })
+
+    const schedule = await adapter.getSchedule('upsert-preserve-run-count')
+    assert.isNotNull(schedule)
+    assert.deepEqual(schedule!.payload, { version: 2 })
+    assert.equal(schedule!.cronExpression, '*/5 * * * *')
+    assert.isNull(schedule!.everyMs)
+    assert.equal(schedule!.runCount, 3)
+  })
+
   test('getSchedule should return null for non-existent schedule', async ({ assert }) => {
     const adapter = await options.createAdapter()