Skip to content

Commit 4bb7220

Browse files
committed
Fix the environment type
1 parent de96ace commit 4bb7220

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

apps/webapp/app/v3/scheduleEngine.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ScheduleEngine, TriggerScheduledTaskCallback } from "@internal/schedule-engine";
1+
import { ScheduleEngine } from "@internal/schedule-engine";
22
import { stringifyIO } from "@trigger.dev/core/v3";
33
import { prisma } from "~/db.server";
44
import { env } from "~/env.server";

internal-packages/schedule-engine/src/engine/index.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import { Counter, getMeter, Histogram, Meter, startSpan, Tracer } from "@internal/tracing";
1+
import {
2+
Counter,
3+
getMeter,
4+
getTracer,
5+
Histogram,
6+
Meter,
7+
startSpan,
8+
Tracer,
9+
} from "@internal/tracing";
210
import { Logger } from "@trigger.dev/core/logger";
311
import { PrismaClient } from "@trigger.dev/database";
412
import { Worker, type JobHandlerParams } from "@trigger.dev/redis-worker";
@@ -39,7 +47,7 @@ export class ScheduleEngine {
3947
this.distributionWindowSeconds = options.distributionWindow?.seconds ?? 30;
4048
this.onTriggerScheduledTask = options.onTriggerScheduledTask;
4149

42-
this.tracer = options.tracer ?? (startSpan as any).tracer;
50+
this.tracer = options.tracer ?? getTracer("schedule-engine");
4351
this.meter = options.meter ?? getMeter("schedule-engine");
4452

4553
// Initialize metrics
@@ -258,6 +266,7 @@ export class ScheduleEngine {
258266
include: {
259267
project: true,
260268
organization: true,
269+
orgMember: true,
261270
},
262271
},
263272
},

internal-packages/schedule-engine/src/engine/types.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
import { Logger } from "@trigger.dev/core/logger";
22
import { Meter, Tracer } from "@internal/tracing";
3-
import { PrismaClient } from "@trigger.dev/database";
3+
import { Prisma, PrismaClient } from "@trigger.dev/database";
44
import { RedisOptions } from "@internal/redis";
55

6+
export type SchedulingEnvironment = Prisma.RuntimeEnvironmentGetPayload<{
7+
include: { project: true; organization: true; orgMember: true };
8+
}>;
9+
610
export type TriggerScheduledTaskParams = {
711
taskIdentifier: string;
8-
environment: any; // The full environment object from the database with all relationships
12+
environment: SchedulingEnvironment;
913
payload: {
1014
scheduleId: string;
1115
type: "DECLARATIVE" | "IMPERATIVE";

0 commit comments

Comments
 (0)