Skip to content

The open alternative to Salesforce, designed for AI.

Provide custom workspace id while seeding (#21721)

Paul Rastoin60b559a659da
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant.ts
index 50f3c925cea..7e0f3749453 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant.ts
@@ -18,7 +18,10 @@ export type CreateWorkspaceInput = Pick<
(typeof WORKSPACE_FIELDS_TO_SEED)[number]
>;
-export const SEED_APPLE_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+const DEFAULT_SEED_APPLE_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+
+export const SEED_APPLE_WORKSPACE_ID = (process.env.E2E_SEED_WORKSPACE_ID ??
+ DEFAULT_SEED_APPLE_WORKSPACE_ID) as typeof DEFAULT_SEED_APPLE_WORKSPACE_ID;
export const SEED_YCOMBINATOR_WORKSPACE_ID =
'3b8e6458-5fc1-4e63-8563-008ccddaa6db';
export const SEED_EMPTY_WORKSPACE_3_ID = '506915ec-21ca-431b-a04a-257eb216865e';
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/generate-random-users.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/generate-random-users.util.ts
index cf07d01a14a..559a387ac85 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/generate-random-users.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/generate-random-users.util.ts
@@ -1,3 +1,5 @@
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
export type RandomUserData = {
id: string;
firstName: string;
@@ -523,7 +525,7 @@ export function generateRandomUsers(): {
userWorkspaces.push({
id: userWorkspaceId,
userId,
- workspaceId: '20202020-1c25-4d02-bf25-6aeccf7ea419', // SEED_APPLE_WORKSPACE_ID
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
});
workspaceMembers.push({
diff --git a/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts
index 7bc5083ea9b..79ab16108b8 100644
--- a/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/event-logs/object-event-write.integration-spec.ts
@@ -8,6 +8,7 @@ import {
import gql from 'graphql-tag';
import { OBJECT_RECORD_CREATED_EVENT } from 'src/engine/core-modules/event-logs/emit/events/object-event/object-record-created';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
import { PERSON_GQL_FIELDS } from 'test/integration/constants/person-gql-fields.constants';
import { createManyOperationFactory } from 'test/integration/graphql/utils/create-many-operation-factory.util';
@@ -20,7 +21,7 @@ import { deleteAllRecords } from 'test/integration/utils/delete-all-records';
describe('Object event write (integration)', () => {
let clickHouseClient: ClickHouseClient;
let personObjectMetadataId: string;
- const testWorkspaceId = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+ const testWorkspaceId = SEED_APPLE_WORKSPACE_ID;
beforeAll(async () => {
jest.useRealTimers();
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts
index 09f8c7122ae..17295e5855c 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts
@@ -8,7 +8,9 @@ import * as tar from 'tar';
import { type DataSource } from 'typeorm';
import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
const createTestTarball = async (
files: Record<string, string>,
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-public-assets-controller-download.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-public-assets-controller-download.integration-spec.ts
index e4b2c3dc607..e2077bc6080 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/failing-public-assets-controller-download.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-public-assets-controller-download.integration-spec.ts
@@ -9,8 +9,10 @@ import {
} from 'twenty-shared/testing';
import { v4 as uuidv4 } from 'uuid';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
const TEST_APP_UID = uuidv4();
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
const UNKNOWN_WORKSPACE_ID = uuidv4();
const UNKNOWN_APPLICATION_ID = uuidv4();
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts
index 16477763400..6a2532fbb36 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts
@@ -8,7 +8,9 @@ import * as tar from 'tar';
import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
import { type DataSource } from 'typeorm';
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
const MARKETPLACE_QUERY = `
query {
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-public-assets-controller-download.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-public-assets-controller-download.integration-spec.ts
index 6e4b621a81e..cd9f8d2d863 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-public-assets-controller-download.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-public-assets-controller-download.integration-spec.ts
@@ -4,8 +4,10 @@ import { setupApplicationForSync } from 'test/integration/metadata/suites/applic
import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';
import { v4 as uuidv4 } from 'uuid';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
const TEST_APP_UID = uuidv4();
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
const PUBLIC_ASSET_PATH = 'assets/logo.svg';
const PUBLIC_ASSET_CONTENT = '<svg><circle r="10" /></svg>';
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/successful-upload-application-file-svg-sanitization.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/successful-upload-application-file-svg-sanitization.integration-spec.ts
index 5ca4449cc46..9fcf1d24bb2 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/successful-upload-application-file-svg-sanitization.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/successful-upload-application-file-svg-sanitization.integration-spec.ts
@@ -6,8 +6,10 @@ import { setupApplicationForSync } from 'test/integration/metadata/suites/applic
import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';
import { v4 as uuidv4 } from 'uuid';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
const TEST_APP_ID = uuidv4();
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
const STORAGE_LOCAL_PATH = join(process.cwd(), '.local-storage');
const MALICIOUS_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" onload="alert(1)">
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts
index 87399653733..22c5a6e327c 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-for-sync.util.ts
@@ -2,7 +2,9 @@ import crypto from 'crypto';
import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
export const setupApplicationForSync = async ({
applicationUniversalIdentifier,
diff --git a/packages/twenty-server/test/integration/oauth/suites/oauth.integration-spec.ts b/packages/twenty-server/test/integration/oauth/suites/oauth.integration-spec.ts
index 2bf882ab9b9..2953f05cb67 100644
--- a/packages/twenty-server/test/integration/oauth/suites/oauth.integration-spec.ts
+++ b/packages/twenty-server/test/integration/oauth/suites/oauth.integration-spec.ts
@@ -6,9 +6,11 @@ import { base64UrlEncode } from 'twenty-shared/utils';
import { type DataSource } from 'typeorm';
import { AppTokenType } from 'src/engine/core-modules/app-token/app-token.entity';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';
-const TEST_WORKSPACE_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
-const TEST_USER_ID = '20202020-e6b5-4680-8a32-b8209737156b';
+const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
+const TEST_USER_ID = USER_DATA_SEED_IDS.JANE;
type TestRegistration = {
id: string;