repo add fix

Author: gallayl

service/src/app-models/stacks/actions/import-stack-action.ts

@@ -15,50 +15,55 @@ export const ImportStackAction: RequestAction<ImportStackEndpoint> = async ({ in
 
   await logger.information({ message: `Importing stack: ${stackName}` })
 
-  const addedRepoIds: string[] = []
-  const addedDepIds: string[] = []
-  const addedServiceIds: string[] = []
+  const repositories = body.repositories.map((repo) => ({
+    ...repo,
+    stackName,
+    createdAt: now,
+    updatedAt: now,
+  }))
 
-  try {
-    const stackStore = sm.getStoreFor(Stack, 'name')
-    await stackStore.add({ ...body.stack, createdAt: now, updatedAt: now })
-
-    const repoStore = sm.getStoreFor(GitHubRepository, 'id')
-    for (const repo of body.repositories) {
-      await repoStore.add({ ...repo, stackName, createdAt: now, updatedAt: now })
-      addedRepoIds.push(repo.id)
-    }
+  const dependencies = body.dependencies.map((dep) => ({
+    ...dep,
+    stackName,
+    createdAt: now,
+    updatedAt: now,
+  }))
 
-    const depStore = sm.getStoreFor(Dependency, 'id')
-    for (const dep of body.dependencies) {
-      await depStore.add({ ...dep, stackName, createdAt: now, updatedAt: now })
-      addedDepIds.push(dep.id)
-    }
+  const services = body.services.map((svc) => ({
+    ...svc,
+    stackName,
+    installStatus: 'not-installed' as const,
+    buildStatus: 'not-built' as const,
+    runStatus: 'stopped' as const,
+    createdAt: now,
+    updatedAt: now,
+  }))
 
-    const serviceStore = sm.getStoreFor(Service, 'id')
-    for (const svc of body.services) {
-      await serviceStore.add({
-        ...svc,
-        stackName,
-        installStatus: 'not-installed',
-        buildStatus: 'not-built',
-        runStatus: 'stopped',
-        createdAt: now,
-        updatedAt: now,
-      })
-      addedServiceIds.push(svc.id)
-    }
+  try {
+    await sm.getStoreFor(Stack, 'name').add({ ...body.stack, createdAt: now, updatedAt: now })
+    await sm.getStoreFor(GitHubRepository, 'id').add(...repositories)
+    await sm.getStoreFor(Dependency, 'id').add(...dependencies)
+    await sm.getStoreFor(Service, 'id').add(...services)
   } catch (error) {
     await logger.warning({ message: `Import failed for stack ${stackName}, rolling back`, data: { error } })
 
-    for (const id of addedServiceIds) {
-      await sm.getStoreFor(Service, 'id').remove(id).catch(() => {})
+    for (const svc of services) {
+      await sm
+        .getStoreFor(Service, 'id')
+        .remove(svc.id)
+        .catch(() => {})
     }
-    for (const id of addedDepIds) {
-      await sm.getStoreFor(Dependency, 'id').remove(id).catch(() => {})
+    for (const dep of dependencies) {
+      await sm
+        .getStoreFor(Dependency, 'id')
+        .remove(dep.id)
+        .catch(() => {})
     }
-    for (const id of addedRepoIds) {
-      await sm.getStoreFor(GitHubRepository, 'id').remove(id).catch(() => {})
+    for (const repo of repositories) {
+      await sm
+        .getStoreFor(GitHubRepository, 'id')
+        .remove(repo.id)
+        .catch(() => {})
     }
     await sm
       .getStoreFor(Stack, 'name')

service/src/services/process-manager.ts

@@ -179,19 +179,13 @@ export class ProcessManager {
     purpose: 'install' | 'build',
   ): Promise<void> {
     const progressStatus =
-      purpose === 'install'
-        ? ({ installStatus: 'installing' } as const)
-        : ({ buildStatus: 'building' } as const)
+      purpose === 'install' ? ({ installStatus: 'installing' } as const) : ({ buildStatus: 'building' } as const)
 
     const doneStatus =
-      purpose === 'install'
-        ? ({ installStatus: 'installed' } as const)
-        : ({ buildStatus: 'built' } as const)
+      purpose === 'install' ? ({ installStatus: 'installed' } as const) : ({ buildStatus: 'built' } as const)
 
     const failedStatus =
-      purpose === 'install'
-        ? ({ installStatus: 'failed' } as const)
-        : ({ buildStatus: 'failed' } as const)
+      purpose === 'install' ? ({ installStatus: 'failed' } as const) : ({ buildStatus: 'failed' } as const)
 
     await this.updateServiceStatus(serviceId, progressStatus)