Bug fixes

Avoid cloning functions with structuredClone
Create app group after validating apps, avoiding empty app groups when apps are invalid

Author: skkra0

backend/src/db/repo/appGroup.ts

@@ -30,6 +30,15 @@ export class AppGroupRepo {
     }
   }
 
+  async delete(appGroupId: number) {
+    if (
+      (await this.client.app.count({ where: { appGroupId: appGroupId } })) > 0
+    ) {
+      throw new Error("App group is not empty");
+    }
+    await this.client.appGroup.delete({ where: { id: appGroupId } });
+  }
+
   async getById(appGroupId: number): Promise<AppGroup> {
     return await this.client.appGroup.findUnique({
       where: { id: appGroupId },

backend/src/db/repo/deployment.ts

@@ -288,11 +288,9 @@ export class DeploymentRepo {
     if (config === null) {
       return null;
     }
-    const newConfig = structuredClone(config);
+    const { getEnv, displayEnv, asGitConfig, ...clonable } = config;
+    const newConfig = structuredClone(clonable);
     const env = config.getEnv();
-    delete newConfig.displayEnv;
-    delete newConfig.getEnv;
-
     return { ...newConfig, env };
   }
 

backend/src/service/createApp.ts

@@ -26,6 +26,14 @@ export async function createApp(appData: NewApp, userId: number) {
   }
 
   let app: App;
+
+  let { config, commitMessage } = (
+    await appService.prepareMetadataForApps(organization, user, {
+      type: "create",
+      ...appData,
+    })
+  )[0];
+
   let appGroupId: number;
 
   switch (appData.appGroup.type) {
@@ -59,13 +67,6 @@ export async function createApp(appData: NewApp, userId: number) {
     }
   }
 
-  let { config, commitMessage } = (
-    await appService.prepareMetadataForApps(organization, user, {
-      type: "create",
-      ...appData,
-    })
-  )[0];
-
   try {
     app = await db.app.create({
       orgId: appData.orgId,

backend/src/service/createAppGroup.ts

@@ -19,25 +19,12 @@ export async function createAppGroup(
   appData: NewAppWithoutGroup[],
 ) {
   appService.validateAppGroupName(groupName);
-  const groupId = await db.appGroup.create(orgId, groupName, false);
-  // let groupId: number;
-  // try {
-  //   groupId = await db.appGroup.create(orgId, groupName, false);
-  // } catch (e) {
-  //   if (e instanceof ConflictError) {
-  //     throw new ValidationError(
-  //       "An app group already exists with the same name.",
-  //     );
-  //   }
-  //   throw e;
-  // }
-  const appsWithGroups = appData.map(
+  const apps = appData.map(
     (app) =>
       ({
         ...app,
         orgId: orgId,
-        appGroup: { type: "add-to", id: groupId },
-      }) satisfies NewApp,
+      }) satisfies Omit<NewApp, "appGroup">,
   );
 
   const [organization, user] = await Promise.all([
@@ -59,11 +46,24 @@ export async function createAppGroup(
     })),
   );
 
-  const appsWithMetadata = appsWithGroups.map((app, idx) => ({
+  const appsWithMetadata = apps.map((app, idx) => ({
     appData: app,
     metadata: validationResults[idx],
   }));
 
+  const groupId = await db.appGroup.create(orgId, groupName, false);
+  // let groupId: number;
+  // try {
+  //   groupId = await db.appGroup.create(orgId, groupName, false);
+  // } catch (e) {
+  //   if (e instanceof ConflictError) {
+  //     throw new ValidationError(
+  //       "An app group already exists with the same name.",
+  //     );
+  //   }
+  //   throw e;
+  // }
+
   for (const { appData, metadata } of appsWithMetadata) {
     let { config, commitMessage } = metadata;
     let app: App;