Merge branch 'main' into mg/OPS-3003

Author: MarceloRGonc

packages/server/api/src/app/authentication/new-user/organization-assignment.ts

@@ -3,6 +3,7 @@ import { AppSystemProp, system } from '@openops/server-shared';
 import { ApplicationError, ErrorCode, isNil, User } from '@openops/shared';
 import { openopsTables } from '../../openops-tables';
 import { organizationService } from '../../organization/organization.service';
+import { projectService } from '../../project/project-service';
 import { userService } from '../../user/user-service';
 
 export async function assignDefaultOrganization(user: User): Promise<void> {
@@ -30,9 +31,21 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     organizationId: organization.id,
   });
 
+  const updatedUser = await userService.getOneOrFail({ id: user.id });
+  const project = await projectService.getOneForUser(updatedUser);
+
+  if (isNil(project)) {
+    throw new ApplicationError({
+      code: ErrorCode.ENTITY_NOT_FOUND,
+      params: {
+        message: 'No project found for user',
+      },
+    });
+  }
+
   await addUserToDefaultWorkspace({
     email: user.email,
-    workspaceId: organization.tablesWorkspaceId,
+    workspaceId: project.tablesWorkspaceId,
   });
 }
 

packages/server/api/src/app/database/migrations/1760500000000-MoveTablesWorkspaceIdFromOrganizationToProject.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class MoveTablesWorkspaceIdFromOrganizationToProject1760500000000
+  implements MigrationInterface
+{
+  name = 'MoveTablesWorkspaceIdFromOrganizationToProject1760500000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "project"
+      ADD COLUMN IF NOT EXISTS "tablesWorkspaceId" integer;
+    `);
+
+    // Migrate tablesWorkspaceId data from organization to project
+    await queryRunner.query(`
+      UPDATE "project"
+      SET "tablesWorkspaceId" = "organization"."tablesWorkspaceId"
+      FROM "organization"
+      WHERE "project"."organizationId" = "organization"."id";
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE "project"
+      ALTER COLUMN "tablesWorkspaceId" SET NOT NULL;
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE "organization"
+      DROP COLUMN IF EXISTS "tablesWorkspaceId";
+    `);
+  }
+
+  public async down(_: QueryRunner): Promise<void> {
+    throw new Error('Rollback not implemented');
+  }
+}

packages/server/api/src/app/database/postgres-connection.ts

@@ -36,6 +36,7 @@ import { RenameIsWorkflowToIsInternal1756377588949 } from './migrations/17563775
 import { AddContentTypeToFolder1757331587268 } from './migrations/1757331587268-AddContentTypeToFolder';
 import { MigrateAiConfigToAppConnection1759242268873 } from './migrations/1759242268873-MigrateAiConfigToAppConnection';
 import { AddTestRunActionLimitsToFlowVersion1760429290001 } from './migrations/1760429290001-AddTestRunActionLimitsToFlowVersion';
+import { MoveTablesWorkspaceIdFromOrganizationToProject1760500000000 } from './migrations/1760500000000-MoveTablesWorkspaceIdFromOrganizationToProject';
 
 const getSslConfig = (): boolean | TlsOptions => {
   const useSsl = system.get(AppSystemProp.POSTGRES_USE_SSL);
@@ -80,6 +81,7 @@ const getMigrations = (): (new () => MigrationInterface)[] => {
     AddContentTypeToFolder1757331587268,
     MigrateAiConfigToAppConnection1759242268873,
     AddTestRunActionLimitsToFlowVersion1760429290001,
+    MoveTablesWorkspaceIdFromOrganizationToProject1760500000000,
   ];
 };
 

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

@@ -23,9 +23,9 @@ export const upsertAdminUser = async (): Promise<void> => {
     const { workspaceId, databaseId } =
       await ensureOpenOpsTablesWorkspaceAndDatabaseExist();
 
-    await ensureOrganizationExists(user, workspaceId);
+    await ensureOrganizationExists(user);
 
-    await ensureProjectExists(user, databaseId);
+    await ensureProjectExists(user, databaseId, workspaceId);
   }
 };
 
@@ -97,10 +97,7 @@ async function ensureOpenOpsTablesWorkspaceAndDatabaseExist(): Promise<{
   return { workspaceId, databaseId };
 }
 
-async function ensureOrganizationExists(
-  user: User,
-  tablesWorkspaceId: number,
-): Promise<void> {
+async function ensureOrganizationExists(user: User): Promise<void> {
   if (user.organizationId) {
     const existingOrganization = await organizationService.getOne(
       user.organizationId,
@@ -112,19 +109,12 @@ async function ensureOrganizationExists(
       );
     }
 
-    if (existingOrganization.tablesWorkspaceId !== tablesWorkspaceId) {
-      throw new Error(
-        'User organization exists but with different tablesWorkspaceId',
-      );
-    }
-
     return;
   }
 
   const organization = await organizationService.create({
     ownerId: user.id,
     name: DEFAULT_ORGANIZATION_NAME,
-    tablesWorkspaceId,
   });
 
   user.organizationId = organization.id;
@@ -133,6 +123,7 @@ async function ensureOrganizationExists(
 async function ensureProjectExists(
   user: User,
   databaseId: number,
+  workspaceId: number,
 ): Promise<void> {
   const project = await projectService.getOneForUser(user);
   if (project) {
@@ -142,6 +133,12 @@ async function ensureProjectExists(
       );
     }
 
+    if (project.tablesWorkspaceId !== workspaceId) {
+      throw new Error(
+        'User project exists but with different tablesWorkspaceId',
+      );
+    }
+
     return;
   }
 
@@ -150,6 +147,7 @@ async function ensureProjectExists(
     ownerId: user.id,
     organizationId: user.organizationId!,
     tablesDatabaseId: databaseId,
+    tablesWorkspaceId: workspaceId,
   });
 }
 

packages/server/api/src/app/organization/organization.entity.ts

@@ -21,10 +21,6 @@ export const OrganizationEntity = new EntitySchema<OrganizationSchema>({
       type: String,
       nullable: false,
     },
-    tablesWorkspaceId: {
-      type: Number,
-      nullable: false,
-    },
   },
   indices: [],
   relations: {

packages/server/api/src/app/organization/organization.service.ts

@@ -21,13 +21,12 @@ export const organizationService = {
     return count > 0;
   },
   async create(params: AddParams): Promise<Organization> {
-    const { ownerId, name, tablesWorkspaceId } = params;
+    const { ownerId, name } = params;
 
     const newOrganization: NewOrganization = {
       id: openOpsId(),
       ownerId,
       name,
-      tablesWorkspaceId,
     };
 
     const savedOrganization = await repo().save(newOrganization);
@@ -54,7 +53,6 @@ export const organizationService = {
       ...organization,
       ...spreadIfDefined('name', params.name),
       ...spreadIfDefined('ownerId', params.ownerId),
-      ...spreadIfDefined('tablesWorkspaceId', params.tablesWorkspaceId),
     };
 
     return repo().save(updatedOrganization);
@@ -91,7 +89,6 @@ export const organizationService = {
 type AddParams = {
   ownerId: UserId;
   name: string;
-  tablesWorkspaceId: number;
 };
 
 type NewOrganization = Omit<Organization, 'created' | 'updated'>;

packages/server/api/src/app/project/project-entity.ts

@@ -42,6 +42,10 @@ export const ProjectEntity = new EntitySchema<ProjectSchema>({
       type: Number,
       nullable: false,
     },
+    tablesWorkspaceId: {
+      type: Number,
+      nullable: false,
+    },
   },
   indices: [
     {

packages/server/api/src/app/project/project-service.ts

@@ -52,6 +52,7 @@ export const projectService = {
         ...spreadIfDefined('displayName', request.displayName),
         ...spreadIfDefined('ownerId', request.ownerId),
         ...spreadIfDefined('tablesDatabaseId', request.tablesDatabaseId),
+        ...spreadIfDefined('tablesWorkspaceId', request.tablesWorkspaceId),
       },
     );
     return this.getOneOrThrow(projectId);
@@ -148,6 +149,7 @@ type UpdateParams = {
   displayName?: string;
   ownerId?: UserId;
   tablesDatabaseId?: number;
+  tablesWorkspaceId?: number;
 };
 
 type CreateParams = {
@@ -156,6 +158,7 @@ type CreateParams = {
   organizationId: string;
   externalId?: string;
   tablesDatabaseId: number;
+  tablesWorkspaceId: number;
 };
 
 type AddProjectToOrganizationParams = {

packages/server/api/test/helpers/mocks/index.ts

@@ -105,6 +105,7 @@ export const createMockProject = (project?: Partial<Project>): Project => {
     displayName: project?.displayName ?? faker.lorem.word(),
     organizationId: project?.organizationId ?? openOpsId(),
     tablesDatabaseId: project?.tablesDatabaseId ?? faker.number.int(),
+    tablesWorkspaceId: project?.tablesWorkspaceId ?? faker.number.int(),
   };
 };
 
@@ -128,7 +129,6 @@ export const createMockOrganization = (
     updated: organization?.updated ?? faker.date.recent().toISOString(),
     ownerId: organization?.ownerId ?? openOpsId(),
     name: organization?.name ?? faker.lorem.word(),
-    tablesWorkspaceId: organization?.tablesWorkspaceId ?? faker.number.int(),
   };
 };
 

packages/server/api/test/integration/cloud/organization/organization.service.test.ts

@@ -61,15 +61,13 @@ describe('Organization Service', () => {
       const result = await organizationService.create({
         ownerId: mockOrganization.ownerId,
         name: mockOrganization.name,
-        tablesWorkspaceId: 123,
       });
 
       const savedOrganization = await organizationService.getOneOrThrow(
         result.id,
       );
 
       expect(savedOrganization.id).toBe(result.id);
-      expect(savedOrganization.tablesWorkspaceId).toBe(123);
 
       const savedUser = await userService.getOneOrFail({
         id: mockOrganization.ownerId,
@@ -99,26 +97,6 @@ describe('Organization Service', () => {
       expect(savedOrganization.name).toBe('Test Org 2');
     });
 
-    it('should update the organization tablesWorkspaceId', async () => {
-      const mockOrganization = await createOrganizationInDB();
-      let savedOrganization = await organizationService.getOneOrThrow(
-        mockOrganization.id,
-      );
-      expect(savedOrganization.tablesWorkspaceId).toBe(
-        mockOrganization.tablesWorkspaceId,
-      );
-
-      await organizationService.update({
-        id: mockOrganization.id,
-        tablesWorkspaceId: 4564,
-      });
-
-      savedOrganization = await organizationService.getOneOrThrow(
-        mockOrganization.id,
-      );
-      expect(savedOrganization.tablesWorkspaceId).toBe(4564);
-    });
-
     it('should update the organization ownerId', async () => {
       const user = createMockUser();
       await databaseConnection().getRepository('user').save(user);