Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ export async function syncDeclarativeSchedules(
create: [
{
environmentId: environment.id,
projectId: environment.projectId,
},
],
},
Expand Down
2 changes: 2 additions & 0 deletions apps/webapp/app/v3/services/upsertTaskSchedule.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export class UpsertTaskScheduleService extends BaseService {
data: {
taskScheduleId: scheduleRecord.id,
environmentId,
projectId,
},
include: {
environment: {
Expand Down Expand Up @@ -183,6 +184,7 @@ export class UpsertTaskScheduleService extends BaseService {
data: {
taskScheduleId: scheduleRecord.id,
environmentId,
projectId: existingSchedule.projectId,
},
include: {
environment: {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-- AlterTable
ALTER TABLE "public"."TaskScheduleInstance"
ADD COLUMN IF NOT EXISTS "projectId" TEXT;

-- AddForeignKey
DO $$
BEGIN
IF NOT EXISTS (
SELECT 1 FROM pg_constraint WHERE conname = 'TaskScheduleInstance_projectId_fkey'
) THEN
ALTER TABLE "public"."TaskScheduleInstance"
ADD CONSTRAINT "TaskScheduleInstance_projectId_fkey"
FOREIGN KEY ("projectId") REFERENCES "public"."Project" ("id")
ON DELETE CASCADE ON UPDATE CASCADE;
END IF;
END $$;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- CreateIndex
CREATE INDEX CONCURRENTLY IF NOT EXISTS "TaskScheduleInstance_environmentId_idx" ON "public"."TaskScheduleInstance" ("environmentId");
9 changes: 7 additions & 2 deletions internal-packages/database/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@ model Project {
connectedGithubRepository ConnectedGithubRepository?
customerQueries CustomerQuery[]

buildSettings Json?
buildSettings Json?
taskScheduleInstances TaskScheduleInstance[]
}

enum ProjectVersion {
Expand Down Expand Up @@ -589,7 +590,7 @@ model TaskRun {
/// Debounce options: { key: string, delay: string, createdAt: Date }
debounce Json?

taskIdentifier String
taskIdentifier String

isTest Boolean @default(false)

Expand Down Expand Up @@ -1945,6 +1946,9 @@ model TaskScheduleInstance {
environment RuntimeEnvironment @relation(fields: [environmentId], references: [id], onDelete: Cascade, onUpdate: Cascade)
environmentId String

project Project? @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
projectId String?

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand All @@ -1955,6 +1959,7 @@ model TaskScheduleInstance {

//you can only have a schedule attached to each environment once
@@unique([taskScheduleId, environmentId])
@@index([environmentId])
}

model RuntimeEnvironmentSession {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ describe("ScheduleEngine Integration", () => {
data: {
taskScheduleId: taskSchedule.id,
environmentId: environment.id,
projectId: project.id,
active: true,
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ describe("Schedule Recovery", () => {
data: {
taskScheduleId: taskSchedule.id,
environmentId: environment.id,
projectId: project.id,
active: true,
},
});
Expand Down Expand Up @@ -184,6 +185,7 @@ describe("Schedule Recovery", () => {
data: {
taskScheduleId: taskSchedule.id,
environmentId: environment.id,
projectId: project.id,
active: true,
},
});
Expand Down Expand Up @@ -293,6 +295,7 @@ describe("Schedule Recovery", () => {
data: {
taskScheduleId: taskSchedule.id,
environmentId: environment.id,
projectId: project.id,
active: true,
},
});
Expand Down