Fixes #611: intervalTriggers of >10 never starting

Author: ericallam

apps/webapp/app/services/schedules/nextScheduledEvent.server.ts

@@ -36,7 +36,7 @@ export class NextScheduledEventService {
 
       const scheduleTime = calculateNextScheduledEvent(
         schedule.data,
-        scheduleSource.lastEventTimestamp
+        scheduleSource.lastEventTimestamp ?? scheduleSource.createdAt
       );
 
       logger.debug("enqueuing scheduled event", {
@@ -67,6 +67,7 @@ export class NextScheduledEventService {
         },
         data: {
           workerJobId: workerJob.id,
+          nextEventTimestamp: scheduleTime,
         },
       });
 

packages/database/prisma/migrations/20231013083144_add_next_event_timestamp_to_schedule_source/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "ScheduleSource" ADD COLUMN     "nextEventTimestamp" TIMESTAMP(3);

packages/database/prisma/schema.prisma

@@ -1049,6 +1049,7 @@ model ScheduleSource {
   dispatcherId String
 
   lastEventTimestamp DateTime?
+  nextEventTimestamp DateTime?
 
   workerJobId String?
 

references/job-catalog/src/schedules.ts

@@ -31,6 +31,27 @@ client.defineJob({
   },
 });
 
+client.defineJob({
+  id: "schedule-example-2",
+  name: "Schedule Example 2",
+  version: "1.0.0",
+  enabled: true,
+  trigger: intervalTrigger({
+    seconds: 60 * 30, // 30 minutes
+  }),
+  run: async (payload, io, ctx) => {
+    await io.runTask("task-example-1", async () => {
+      return {
+        message: "Hello World",
+      };
+    });
+
+    await io.wait("wait-1", 1);
+
+    await io.logger.info("Hello World", { ctx });
+  },
+});
+
 const resend = new Resend({
   id: "resend-client",
   apiKey: process.env.RESEND_API_KEY!,