From 716e705c2a1cc3b5a6ad8d5e2f5af85b6764e805 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:47:56 +0100
Subject: [PATCH] Fix: Removed legacy create project code

---
 .../src/server/routes/v1/project-router.ts    | 27 -------------------
 .../src/services/project/project-service.ts   | 17 ++++--------
 backend/src/services/project/project-types.ts |  3 +--
 3 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/backend/src/server/routes/v1/project-router.ts b/backend/src/server/routes/v1/project-router.ts
index c76504ee0..55bae1156 100644
--- a/backend/src/server/routes/v1/project-router.ts
+++ b/backend/src/server/routes/v1/project-router.ts
@@ -150,33 +150,6 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
     }
   });
 
-  server.route({
-    url: "/",
-    method: "POST",
-    schema: {
-      body: z.object({
-        workspaceName: z.string().trim(),
-        organizationId: z.string().trim()
-      }),
-      response: {
-        200: z.object({
-          workspace: projectWithEnv
-        })
-      }
-    },
-    onRequest: verifyAuth([AuthMode.JWT]),
-    handler: async (req) => {
-      const workspace = await server.services.project.createProject({
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        orgId: req.body.organizationId,
-        actorOrgId: req.permission.orgId,
-        workspaceName: req.body.workspaceName
-      });
-      return { workspace };
-    }
-  });
-
   server.route({
     url: "/:workspaceId",
     method: "DELETE",
diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts
index c19856eb9..384fd2bad 100644
--- a/backend/src/services/project/project-service.ts
+++ b/backend/src/services/project/project-service.ts
@@ -92,27 +92,20 @@ export const projectServiceFactory = ({
    * Create workspace. Make user the admin
    * */
   const createProject = async ({
-    orgId,
     orgSlug,
     actor,
     actorId,
     actorOrgId,
     workspaceName,
-    slug
+    slug: projectSlug
   }: TCreateProjectDTO) => {
-    if (orgSlug && orgId) {
+    if (!orgSlug) {
       throw new BadRequestError({
-        message: "Cannot provide both orgId and orgSlug"
+        message: "Must provide organization slug to create project"
       });
     }
 
-    if (!orgSlug && !orgId) {
-      throw new BadRequestError({
-        message: "Must provide either orgId or orgSlug"
-      });
-    }
-
-    const organization = orgSlug ? await orgDAL.findOne({ slug: orgSlug }) : await orgDAL.findOne({ id: orgId });
+    const organization = await orgDAL.findOne({ slug: orgSlug });
 
     const { permission, membership: orgMembership } = await permissionService.getOrgPermission(
       actor,
@@ -141,7 +134,7 @@ export const projectServiceFactory = ({
         {
           name: workspaceName,
           orgId: organization.id,
-          slug: slug || slugify(`${workspaceName}-${alphaNumericNanoId(4)}`),
+          slug: projectSlug || slugify(`${workspaceName}-${alphaNumericNanoId(4)}`),
           version: ProjectVersion.V2
         },
         tx
diff --git a/backend/src/services/project/project-types.ts b/backend/src/services/project/project-types.ts
index 9ce02a70f..69816882e 100644
--- a/backend/src/services/project/project-types.ts
+++ b/backend/src/services/project/project-types.ts
@@ -23,8 +23,7 @@ export type TCreateProjectDTO = {
   actor: ActorType;
   actorId: string;
   actorOrgId?: string;
-  orgId?: string;
-  orgSlug?: string;
+  orgSlug: string;
   workspaceName: string;
   slug?: string;
 };