diff --git a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts index b92de092..1946925a 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts +++ b/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) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: 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] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts index b0c11cd8..2d08dee3 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-hour/index.ts @@ -48,23 +48,22 @@ export default { return cronTimes.everyHourExcludingWeekends; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: 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] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts index 5850503b..f2a40d8c 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-month/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-month/index.ts @@ -270,23 +270,22 @@ export default { return interval; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: 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] }; }, }; diff --git a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts index 878b005b..7204eebc 100644 --- a/packages/backend/src/apps/scheduler/triggers/every-week/index.ts +++ b/packages/backend/src/apps/scheduler/triggers/every-week/index.ts @@ -174,23 +174,22 @@ export default { return interval; }, - async run($: IGlobalVariable, startDateTime: Date) { - const dateTime = DateTime.fromJSDate(startDateTime); - const dateTimeObjectRepresentation = getDateTimeObjectRepresentation( - dateTime - ) as IJSONValue; - - return { data: [dateTimeObjectRepresentation] }; - }, - - async testRun($: IGlobalVariable) { + async run($: 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] }; }, };