fix(scheduler): return TriggerDataItem

packages/backend/src/apps/scheduler/triggers/every-day/index.ts

@@ -154,23 +154,22 @@ export default {
     return cronTimes.everyDayExcludingWeekendsAt(parameters.hour as number);
   },
 
-  async run($: IGlobalVariable, startDateTime: Date) {
+  async run($: IGlobalVariable) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      dateTime
-    ) as IJSONValue;
-
-    return { data: [dateTimeObjectRepresentation] };
-  },
-
-  async testRun($: IGlobalVariable) {
     const nextCronDateTime = getNextCronDateTime(
       this.getInterval($.step.parameters)
     );
+    const dateTime = DateTime.now();
     const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      nextCronDateTime
+      $.execution.testRun ? nextCronDateTime : dateTime
     ) as IJSONValue;
 
-    return { data: [dateTimeObjectRepresentation] };
+    const dataItem = {
+      raw: dateTimeObjectRepresentation,
+      meta: {
+        internalId: dateTime.toMillis().toString(),
+      },
+    };
+
+    return { data: [dataItem] };
   },
 };

packages/backend/src/apps/scheduler/triggers/every-hour/index.ts

@@ -48,23 +48,22 @@ export default {
     return cronTimes.everyHourExcludingWeekends;
   },
 
-  async run($: IGlobalVariable, startDateTime: Date) {
+  async run($: IGlobalVariable) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      dateTime
-    ) as IJSONValue;
-
-    return { data: [dateTimeObjectRepresentation] };
-  },
-
-  async testRun($: IGlobalVariable) {
     const nextCronDateTime = getNextCronDateTime(
       this.getInterval($.step.parameters)
     );
+    const dateTime = DateTime.now();
     const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      nextCronDateTime
+      $.execution.testRun ? nextCronDateTime : dateTime
     ) as IJSONValue;
 
-    return { data: [dateTimeObjectRepresentation] };
+    const dataItem = {
+      raw: dateTimeObjectRepresentation,
+      meta: {
+        internalId: dateTime.toMillis().toString(),
+      },
+    };
+
+    return { data: [dataItem] };
   },
 };

packages/backend/src/apps/scheduler/triggers/every-month/index.ts

@@ -270,23 +270,22 @@ export default {
     return interval;
   },
 
-  async run($: IGlobalVariable, startDateTime: Date) {
+  async run($: IGlobalVariable) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      dateTime
-    ) as IJSONValue;
-
-    return { data: [dateTimeObjectRepresentation] };
-  },
-
-  async testRun($: IGlobalVariable) {
     const nextCronDateTime = getNextCronDateTime(
       this.getInterval($.step.parameters)
     );
+    const dateTime = DateTime.now();
     const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      nextCronDateTime
+      $.execution.testRun ? nextCronDateTime : dateTime
     ) as IJSONValue;
 
-    return { data: [dateTimeObjectRepresentation] };
+    const dataItem = {
+      raw: dateTimeObjectRepresentation,
+      meta: {
+        internalId: dateTime.toMillis().toString(),
+      },
+    };
+
+    return { data: [dataItem] };
   },
 };

packages/backend/src/apps/scheduler/triggers/every-week/index.ts

@@ -174,23 +174,22 @@ export default {
     return interval;
   },
 
-  async run($: IGlobalVariable, startDateTime: Date) {
+  async run($: IGlobalVariable) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      dateTime
-    ) as IJSONValue;
-
-    return { data: [dateTimeObjectRepresentation] };
-  },
-
-  async testRun($: IGlobalVariable) {
     const nextCronDateTime = getNextCronDateTime(
       this.getInterval($.step.parameters)
     );
+    const dateTime = DateTime.now();
     const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(
-      nextCronDateTime
+      $.execution.testRun ? nextCronDateTime : dateTime
     ) as IJSONValue;
 
-    return { data: [dateTimeObjectRepresentation] };
+    const dataItem = {
+      raw: dateTimeObjectRepresentation,
+      meta: {
+        internalId: dateTime.toMillis().toString(),
+      },
+    };
+
+    return { data: [dataItem] };
   },
 };