Change how we count schedules towards your limits

Author: matt-aitken

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

@@ -5,6 +5,7 @@ import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { getCurrentPlan, getLimit, getLimits } from "~/services/platform.v3.server";
 import { calculateNextScheduledTimestamp } from "~/v3/utils/calculateNextSchedule.server";
 import { BasePresenter } from "./basePresenter.server";
+import { CheckScheduleService } from "~/v3/services/checkSchedule.server";
 
 type ScheduleListOptions = {
   projectId: string;
@@ -86,10 +87,9 @@ export class ScheduleListPresenter extends BasePresenter {
       },
     });
 
-    const schedulesCount = await this._prisma.taskSchedule.count({
-      where: {
-        projectId,
-      },
+    const schedulesCount = await CheckScheduleService.getUsedSchedulesCount({
+      prisma: this._replica,
+      environments: project.environments,
     });
 
     //get all possible scheduled tasks

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

@@ -4,6 +4,7 @@ import { BaseService, ServiceValidationError } from "./baseService.server";
 import { getLimit } from "~/services/platform.v3.server";
 import { getTimezones } from "~/utils/timezones.server";
 import { env } from "~/env.server";
+import { type PrismaClientOrTransaction, type RuntimeEnvironmentType } from "@trigger.dev/database";
 
 type Schedule = {
   cron: string;
@@ -90,4 +91,27 @@ export class CheckScheduleService extends BaseService {
       }
     }
   }
+
+  static async getUsedSchedulesCount({
+    prisma,
+    environments,
+  }: {
+    prisma: PrismaClientOrTransaction;
+    environments: { id: string; type: RuntimeEnvironmentType }[];
+  }) {
+    const deployedEnvironments = environments.filter((env) => env.type !== "DEVELOPMENT");
+    const schedulesCount = await prisma.taskScheduleInstance.count({
+      where: {
+        environmentId: {
+          in: deployedEnvironments.map((env) => env.id),
+        },
+        active: true,
+        taskSchedule: {
+          active: true,
+        },
+      },
+    });
+
+    return schedulesCount;
+  }
 }