Skip to content

Commit fde939a

Browse files
committed
Fixed empty strings making their way into schedule externalId
1 parent 4986bfd commit fde939a

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.changeset/strong-lemons-add.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
Make optional schedule object fields nullish

apps/webapp/app/v3/services/triggerScheduledTask.server.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export class TriggerScheduledTaskService extends BaseService {
5858
const payload = {
5959
scheduleId: instance.taskSchedule.friendlyId,
6060
timestamp: instance.nextScheduledTimestamp,
61-
lastTimestamp: instance.lastScheduledTimestamp,
62-
externalId: instance.taskSchedule.externalId,
61+
lastTimestamp: instance.lastScheduledTimestamp ?? undefined,
62+
externalId: instance.taskSchedule.externalId ?? undefined,
6363
upcoming: nextScheduledTimestamps(
6464
instance.taskSchedule.generatorExpression,
6565
instance.nextScheduledTimestamp!,

apps/webapp/app/v3/services/upsertTaskSchedule.server.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export class UpsertTaskScheduleService extends BaseService {
111111
options.deduplicationKey !== undefined && options.deduplicationKey !== "",
112112
generatorExpression: options.cron,
113113
generatorDescription: cronstrue.toString(options.cron),
114-
externalId: options.externalId,
114+
externalId: options.externalId ? options.externalId : undefined,
115115
},
116116
});
117117

@@ -160,7 +160,7 @@ export class UpsertTaskScheduleService extends BaseService {
160160
data: {
161161
generatorExpression: options.cron,
162162
generatorDescription: cronstrue.toString(options.cron),
163-
externalId: options.externalId,
163+
externalId: options.externalId ? options.externalId : null,
164164
},
165165
});
166166

packages/core/src/v3/schemas/api.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,19 @@ export const ScheduleObject = z.object({
240240
id: z.string(),
241241
task: z.string(),
242242
active: z.boolean(),
243-
deduplicationKey: z.string().optional(),
244-
externalId: z.string().optional(),
243+
deduplicationKey: z.string().nullish(),
244+
externalId: z.string().nullish(),
245245
generator: z.object({
246246
type: z.literal("CRON"),
247247
expression: z.string(),
248248
description: z.string(),
249249
}),
250-
nextRun: z.coerce.date().optional(),
250+
nextRun: z.coerce.date().nullish(),
251251
environments: z.array(
252252
z.object({
253253
id: z.string(),
254254
type: z.string(),
255-
userName: z.string().optional(),
255+
userName: z.string().nullish(),
256256
})
257257
),
258258
});

0 commit comments

Comments
 (0)