fix: clearer 'select a plan' error when creating a project on an unactivated org

Author: nicktrn

apps/webapp/app/models/project.server.ts

@@ -3,6 +3,7 @@ import { customAlphabet, nanoid } from "nanoid";
 import slug from "slug";
 import { $replica, prisma } from "~/db.server";
 import { projectCreated } from "~/services/projectCreated.server";
+import { ServiceValidationError } from "~/v3/services/common.server";
 import { type Organization, createEnvironment } from "./organization.server";
 export type { Project } from "@trigger.dev/database";
 
@@ -50,7 +51,10 @@ export async function createProject(
 
   if (version === "v3") {
     if (!organization.isActivated) {
-      throw new Error(`Organization can't create v3 projects.`);
+      throw new ServiceValidationError(
+        "You must select a plan for this organization before creating projects.",
+        402
+      );
     }
   }
 

apps/webapp/app/routes/api.v1.orgs.$orgParam.projects.ts

@@ -9,6 +9,7 @@ import {
   createActionPATApiRoute,
   createLoaderPATApiRoute,
 } from "~/services/routeBuilders/apiBuilder.server";
+import { ServiceValidationError } from "~/v3/services/common.server";
 import { isCuid } from "cuid";
 
 const ParamsSchema = z.object({
@@ -108,6 +109,9 @@ export const action = createActionPATApiRoute(
 
     if (error) {
       logger.error("Failed to create project", { error });
+      if (error instanceof ServiceValidationError) {
+        return json({ error: error.message }, { status: error.status ?? 400 });
+      }
       return json({ error: "Failed to create project" }, { status: 400 });
     }