Check schedule limit properly. Improve some structure

Author: matt-aitken

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

@@ -11,6 +11,7 @@ import { createRedisRateLimitClient, type Duration } from "~/services/rateLimite
 import { BasePresenter } from "./basePresenter.server";
 import { singleton } from "~/utils/singleton";
 import { logger } from "~/services/logger.server";
+import { CheckScheduleService } from "~/v3/services/checkSchedule.server";
 
 // Create a singleton Redis client for rate limit queries
 const rateLimitRedisClient = singleton("rateLimitQueryRedisClient", () =>
@@ -64,13 +65,10 @@ export type LimitsResult = {
     branches: QuotaInfo | null;
     logRetentionDays: QuotaInfo | null;
     realtimeConnections: QuotaInfo | null;
+    batchProcessingConcurrency: QuotaInfo;
     devQueueSize: QuotaInfo;
     deployedQueueSize: QuotaInfo;
   };
-  batchConcurrency: {
-    limit: number;
-    source: "default" | "override";
-  };
   features: {
     hasStagingEnvironment: FeatureInfo;
     support: FeatureInfo;
@@ -131,14 +129,10 @@ export class LimitsPresenter extends BasePresenter {
       ? "override"
       : "default";
 
-    // Get schedule count for this org (via project relation which has an index)
-    //TODO we should change the way we count these and use the ScheduleListPresenter method
-    const scheduleCount = await this._replica.taskSchedule.count({
-      where: {
-        project: {
-          organizationId,
-        },
-      },
+    // Get schedule count for this org
+    const scheduleCount = await CheckScheduleService.getUsedSchedulesCount({
+      prisma: this._replica,
+      projectId,
     });
 
     // Get alert channel count for this org
@@ -277,6 +271,15 @@ export class LimitsPresenter extends BasePresenter {
                 isUpgradable: true,
               }
             : null,
+        batchProcessingConcurrency: {
+          name: "Batch processing concurrency",
+          description: "Controls how many batch items can be processed simultaneously.",
+          limit: batchConcurrencyConfig.processingConcurrency,
+          currentUsage: 0,
+          source: batchConcurrencySource,
+          canExceed: true,
+          isUpgradable: true,
+        },
         devQueueSize: {
           name: "Dev queue size",
           description: "Maximum pending runs in development environments",
@@ -292,10 +295,6 @@ export class LimitsPresenter extends BasePresenter {
           source: organization.maximumDeployedQueueSize ? "override" : "default",
         },
       },
-      batchConcurrency: {
-        limit: batchConcurrencyConfig.processingConcurrency,
-        source: batchConcurrencySource,
-      },
       features: {
         hasStagingEnvironment: {
           name: "Staging environment",

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx

@@ -161,7 +161,6 @@ export default function Page() {
             {/* Quotas Section */}
             <QuotasSection
               quotas={data.quotas}
-              batchConcurrency={data.batchConcurrency}
               isOnTopPlan={data.isOnTopPlan}
               billingPath={organizationBillingPath(organization)}
             />
@@ -483,12 +482,10 @@ function RateLimitConfigDisplay({ config }: { config: RateLimitInfo["config"] })
 
 function QuotasSection({
   quotas,
-  batchConcurrency,
   isOnTopPlan,
   billingPath,
 }: {
   quotas: LimitsResult["quotas"];
-  batchConcurrency: LimitsResult["batchConcurrency"];
   isOnTopPlan: boolean;
   billingPath: string;
 }) {
@@ -506,16 +503,8 @@ function QuotasSection({
   if (quotas.realtimeConnections) quotaRows.push(quotas.realtimeConnections);
   if (quotas.logRetentionDays) quotaRows.push(quotas.logRetentionDays);
 
-  // Include batch processing concurrency as a quota row
-  quotaRows.push({
-    name: "Batch processing concurrency",
-    description: "Controls how many batch items can be processed simultaneously.",
-    limit: batchConcurrency.limit,
-    currentUsage: 0,
-    source: batchConcurrency.source,
-    canExceed: true, // Allow contact us on top plan, view plans otherwise
-    isUpgradable: true,
-  });
+  // Include batch processing concurrency
+  quotaRows.push(quotas.batchProcessingConcurrency);
 
   // Add queue size quotas if set
   if (quotas.devQueueSize.limit !== null) quotaRows.push(quotas.devQueueSize);

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

@@ -92,7 +92,7 @@ export class CheckScheduleService extends BaseService {
       const limit = await getLimit(project.organizationId, "schedules", 100_000_000);
       const schedulesCount = await CheckScheduleService.getUsedSchedulesCount({
         prisma: this._prisma,
-        environments: project.environments,
+        projectId,
       });
 
       if (schedulesCount >= limit) {
@@ -105,26 +105,21 @@ export class CheckScheduleService extends BaseService {
 
   static async getUsedSchedulesCount({
     prisma,
-    environments,
+    projectId,
   }: {
     prisma: PrismaClientOrTransaction;
-    environments: { id: string; type: RuntimeEnvironmentType; archivedAt: Date | null }[];
+    projectId: string;
   }) {
-    const deployedEnvironments = environments.filter(
-      (env) => env.type !== "DEVELOPMENT" && !env.archivedAt
-    );
-    const schedulesCount = await prisma.taskScheduleInstance.count({
+    return await prisma.taskScheduleInstance.count({
       where: {
-        environmentId: {
-          in: deployedEnvironments.map((env) => env.id),
+        projectId,
+        environment: {
+          type: {
+            not: "DEVELOPMENT",
+          },
         },
         active: true,
-        taskSchedule: {
-          active: true,
-        },
       },
     });
-
-    return schedulesCount;
   }
 }