Merge branch 'main' into impersonation-log

Author: D-K-P

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

@@ -593,6 +593,7 @@ export async function syncDeclarativeSchedules(
             create: [
               {
                 environmentId: environment.id,
+                projectId: environment.projectId,
               },
             ],
           },

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

@@ -109,6 +109,7 @@ export class UpsertTaskScheduleService extends BaseService {
         data: {
           taskScheduleId: scheduleRecord.id,
           environmentId,
+          projectId,
         },
         include: {
           environment: {
@@ -183,6 +184,7 @@ export class UpsertTaskScheduleService extends BaseService {
           data: {
             taskScheduleId: scheduleRecord.id,
             environmentId,
+            projectId: existingSchedule.projectId,
           },
           include: {
             environment: {

internal-packages/database/prisma/migrations/20260115125846_add_project_id_to_task_schedule_instance/migration.sql

@@ -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 $$;

internal-packages/database/prisma/migrations/20260115130417_taskscheduleinstance_environmentid_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "TaskScheduleInstance_environmentId_idx" ON "public"."TaskScheduleInstance" ("environmentId");

internal-packages/database/prisma/schema.prisma

@@ -407,7 +407,8 @@ model Project {
   connectedGithubRepository ConnectedGithubRepository?
   customerQueries           CustomerQuery[]
 
-  buildSettings Json?
+  buildSettings         Json?
+  taskScheduleInstances TaskScheduleInstance[]
 }
 
 enum ProjectVersion {
@@ -592,7 +593,7 @@ model TaskRun {
   /// Debounce options: { key: string, delay: string, createdAt: Date }
   debounce Json?
 
-  taskIdentifier          String
+  taskIdentifier String
 
   isTest Boolean @default(false)
 
@@ -1948,6 +1949,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
 
@@ -1958,6 +1962,7 @@ model TaskScheduleInstance {
 
   //you can only have a schedule attached to each environment once
   @@unique([taskScheduleId, environmentId])
+  @@index([environmentId])
 }
 
 model RuntimeEnvironmentSession {

internal-packages/schedule-engine/test/scheduleEngine.test.ts

@@ -93,6 +93,7 @@ describe("ScheduleEngine Integration", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });

internal-packages/schedule-engine/test/scheduleRecovery.test.ts

@@ -79,6 +79,7 @@ describe("Schedule Recovery", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });
@@ -184,6 +185,7 @@ describe("Schedule Recovery", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });
@@ -293,6 +295,7 @@ describe("Schedule Recovery", () => {
             data: {
               taskScheduleId: taskSchedule.id,
               environmentId: environment.id,
+              projectId: project.id,
               active: true,
             },
           });