Refactor admin seeding: remove user mutation in ensureOrganizationExists and return Organization/Project values (#1746)

Part of OPS-3216, OPS-3009.

Author: cezudas

packages/server/api/src/app/database/seeds/seed-admin.ts

@@ -3,7 +3,13 @@ import {
   resetUserPassword,
 } from '@openops/common';
 import { AppSystemProp, logger, system } from '@openops/server-shared';
-import { OrganizationRole, Provider, User } from '@openops/shared';
+import {
+  Organization,
+  OrganizationRole,
+  Project,
+  Provider,
+  User,
+} from '@openops/shared';
 import { authenticationService } from '../../authentication/basic/authentication-service';
 import { openopsTables } from '../../openops-tables';
 import { authenticateAdminUserInOpenOpsTables } from '../../openops-tables/auth-admin-tables';
@@ -27,9 +33,19 @@ export const upsertAdminUser = async (): Promise<void> => {
     const { workspaceId, databaseId, databaseToken } =
       await ensureOpenOpsTablesWorkspaceAndDatabaseExist();
 
-    await ensureOrganizationExists(user);
+    const organization = await ensureOrganizationExists(user);
+
+    const userWithOrganization = {
+      ...user,
+      organizationId: organization.id,
+    };
 
-    await ensureProjectExists(user, databaseId, workspaceId, databaseToken);
+    await ensureProjectExists(
+      userWithOrganization,
+      databaseId,
+      workspaceId,
+      databaseToken,
+    );
   }
 };
 
@@ -107,7 +123,7 @@ async function ensureOpenOpsTablesWorkspaceAndDatabaseExist(): Promise<{
   return { workspaceId, databaseId, databaseToken };
 }
 
-async function ensureOrganizationExists(user: User): Promise<void> {
+async function ensureOrganizationExists(user: User): Promise<Organization> {
   if (user.organizationId) {
     const existingOrganization = await organizationService.getOne(
       user.organizationId,
@@ -119,23 +135,25 @@ async function ensureOrganizationExists(user: User): Promise<void> {
       );
     }
 
-    return;
+    return existingOrganization;
   }
 
-  const organization = await organizationService.create({
+  return organizationService.create({
     ownerId: user.id,
     name: DEFAULT_ORGANIZATION_NAME,
   });
-
-  user.organizationId = organization.id;
 }
 
+type UserWithOrganization = User & {
+  organizationId: string;
+};
+
 async function ensureProjectExists(
-  user: User,
+  user: UserWithOrganization,
   databaseId: number,
   workspaceId: number,
   databaseToken: string,
-): Promise<void> {
+): Promise<Project> {
   const project = await projectService.getOneForUser(user);
   if (project) {
     if (project.tablesDatabaseId !== databaseId) {
@@ -150,13 +168,13 @@ async function ensureProjectExists(
       );
     }
 
-    return;
+    return project;
   }
 
-  await projectService.create({
+  return projectService.create({
     displayName: `${user.firstName}'s Project`,
     ownerId: user.id,
-    organizationId: user.organizationId!,
+    organizationId: user.organizationId,
     tablesDatabaseId: databaseId,
     tablesWorkspaceId: workspaceId,
     tablesDatabaseToken: databaseToken,