Don’t allow upserting schedules when archived

Author: matt-aitken

apps/webapp/app/presenters/v3/EditSchedulePresenter.server.ts

@@ -70,10 +70,6 @@ export class EditSchedulePresenter {
       throw new ServiceValidationError("No matching environment for project", 404);
     }
 
-    if (environment.archivedAt) {
-      throw new ServiceValidationError("This branch is archived", 400);
-    }
-
     //get the latest BackgroundWorker
     const latestWorker = await findCurrentWorkerFromEnvironment(environment, this.#prismaClient);
 

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

@@ -14,7 +14,7 @@ type Schedule = {
 };
 
 export class CheckScheduleService extends BaseService {
-  public async call(projectId: string, schedule: Schedule) {
+  public async call(projectId: string, schedule: Schedule, environmentIds: string[]) {
     //validate the cron expression
     try {
       CronPattern.parse(schedule.cron);
@@ -61,28 +61,34 @@ export class CheckScheduleService extends BaseService {
       );
     }
 
-    //if creating a schedule, check they're under the limits
-    if (!schedule.friendlyId) {
-      //check they're within their limit
-      const project = await this._prisma.project.findFirst({
-        where: {
-          id: projectId,
-        },
-        select: {
-          organizationId: true,
-          environments: {
-            select: {
-              id: true,
-              type: true,
-            },
+    //check they're within their limit
+    const project = await this._prisma.project.findFirst({
+      where: {
+        id: projectId,
+      },
+      select: {
+        organizationId: true,
+        environments: {
+          select: {
+            id: true,
+            type: true,
+            archivedAt: true,
           },
         },
-      });
+      },
+    });
 
-      if (!project) {
-        throw new ServiceValidationError("Project not found");
-      }
+    if (!project) {
+      throw new ServiceValidationError("Project not found");
+    }
 
+    const environments = project.environments.filter((env) => environmentIds.includes(env.id));
+    if (environments.some((env) => env.archivedAt)) {
+      throw new ServiceValidationError("Can't add or edit a schedule for an archived branch");
+    }
+
+    //if creating a schedule, check they're under the limits
+    if (!schedule.friendlyId) {
       const limit = await getLimit(project.organizationId, "schedules", 100_000_000);
       const schedulesCount = await CheckScheduleService.getUsedSchedulesCount({
         prisma: this._prisma,

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

@@ -523,12 +523,16 @@ export async function syncDeclarativeSchedules(
     );
 
     //this throws errors if the schedule is invalid
-    await checkSchedule.call(environment.projectId, {
-      cron: task.schedule.cron,
-      timezone: task.schedule.timezone,
-      taskIdentifier: task.id,
-      friendlyId: existingSchedule?.friendlyId,
-    });
+    await checkSchedule.call(
+      environment.projectId,
+      {
+        cron: task.schedule.cron,
+        timezone: task.schedule.timezone,
+        taskIdentifier: task.id,
+        friendlyId: existingSchedule?.friendlyId,
+      },
+      [environment.id]
+    );
 
     if (existingSchedule) {
       const schedule = await prisma.taskSchedule.update({

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

@@ -29,7 +29,7 @@ export class UpsertTaskScheduleService extends BaseService {
   public async call(projectId: string, schedule: UpsertTaskScheduleServiceOptions) {
     //this throws errors if the schedule is invalid
     const checkSchedule = new CheckScheduleService(this._prisma);
-    await checkSchedule.call(projectId, schedule);
+    await checkSchedule.call(projectId, schedule, schedule.environments);
 
     const deduplicationKey =
       typeof schedule.deduplicationKey === "string" && schedule.deduplicationKey !== ""