If an org already had any deleted projects it couldn’t be deleted…

Author: matt-aitken

apps/webapp/app/services/deleteOrganization.server.ts

@@ -1,15 +1,9 @@
+import { DateFormatter } from "@internationalized/date";
 import { PrismaClient } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
-import { DisableJobService } from "./jobs/disableJob.server";
-import { AuthenticatedEnvironment } from "./apiAuth.server";
-import { DeleteJobService } from "./jobs/deleteJob.server";
-import { DeleteEndpointService } from "./endpoints/deleteEndpointService";
-import { logger } from "./logger.server";
-import { DisableScheduleSourceService } from "./schedules/disableScheduleSource.server";
 import { featuresForRequest } from "~/features.server";
-import { DeleteProjectService } from "./deleteProject.server";
 import { BillingService } from "./billing.server";
-import { DateFormatter } from "@internationalized/date";
+import { DeleteProjectService } from "./deleteProject.server";
 
 export class DeleteOrganizationService {
   #prismaClient: PrismaClient;
@@ -76,7 +70,7 @@ export class DeleteOrganizationService {
     // loop through the projects and delete them
     const projectDeleteService = new DeleteProjectService();
     for (const project of organization.projects) {
-      await projectDeleteService.call({ projectId: project.id, userId });
+      await projectDeleteService.call({ projectId: project.id, userId, ignoreDeleted: true });
     }
 
     //set all the integrations to disabled

apps/webapp/app/services/deleteProject.server.ts

@@ -1,13 +1,13 @@
 import { PrismaClient } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
-import { DisableJobService } from "./jobs/disableJob.server";
-import { AuthenticatedEnvironment } from "./apiAuth.server";
-import { DeleteJobService } from "./jobs/deleteJob.server";
 import { DeleteEndpointService } from "./endpoints/deleteEndpointService";
 import { logger } from "./logger.server";
 import { DisableScheduleSourceService } from "./schedules/disableScheduleSource.server";
 
-type Options = { projectId: string; userId: string } | { projectSlug: string; userId: string };
+type Options = ({ projectId: string } | { projectSlug: string }) & {
+  userId: string;
+  ignoreDeleted: boolean;
+};
 
 export class DeleteProjectService {
   #prismaClient: PrismaClient;
@@ -52,6 +52,9 @@ export class DeleteProjectService {
     }
 
     if (project.deletedAt) {
+      if (options.ignoreDeleted) {
+        return;
+      }
       throw new Error("Project already deleted");
     }