Add manifest integration tests

packages/twenty-server/src/database/commands/upgrade-version-command/1-19/1-19-upgrade-version-command.module.ts

@@ -5,6 +5,7 @@ import { AddMissingSystemFieldsToStandardObjectsCommand } from 'src/database/com
 import { BackfillMessageChannelMessageAssociationMessageFolderCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command';
 import { BackfillPageLayoutsCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command';
 import { BackfillSystemFieldsIsSystemCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-system-fields-is-system.command';
+import { FixInvalidStandardUniversalIdentifiersCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -32,12 +33,14 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
     AddMissingSystemFieldsToStandardObjectsCommand,
     BackfillMessageChannelMessageAssociationMessageFolderCommand,
     BackfillPageLayoutsCommand,
+    FixInvalidStandardUniversalIdentifiersCommand,
   ],
   exports: [
     BackfillSystemFieldsIsSystemCommand,
     AddMissingSystemFieldsToStandardObjectsCommand,
     BackfillMessageChannelMessageAssociationMessageFolderCommand,
     BackfillPageLayoutsCommand,
+    FixInvalidStandardUniversalIdentifiersCommand,
   ],
 })
 export class V1_19_UpgradeVersionCommandModule {}

packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts

@@ -30,6 +30,7 @@ import { AddMissingSystemFieldsToStandardObjectsCommand } from 'src/database/com
 import { BackfillMessageChannelMessageAssociationMessageFolderCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-message-channel-message-association-message-folder.command';
 import { BackfillPageLayoutsCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-page-layouts.command';
 import { BackfillSystemFieldsIsSystemCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-backfill-system-fields-is-system.command';
+import { FixInvalidStandardUniversalIdentifiersCommand } from 'src/database/commands/upgrade-version-command/1-19/1-19-fix-invalid-standard-universal-identifiers.command';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
@@ -75,6 +76,7 @@ export class UpgradeCommand extends UpgradeCommandRunner {
     protected readonly addMissingSystemFieldsToStandardObjectsCommand: AddMissingSystemFieldsToStandardObjectsCommand,
     protected readonly backfillMessageChannelMessageAssociationMessageFolderCommand: BackfillMessageChannelMessageAssociationMessageFolderCommand,
     protected readonly backfillPageLayoutsCommand: BackfillPageLayoutsCommand,
+    protected readonly fixRoleAndAgentUniversalIdentifiersCommand: FixInvalidStandardUniversalIdentifiersCommand,
   ) {
     super(
       workspaceRepository,
@@ -115,6 +117,7 @@ export class UpgradeCommand extends UpgradeCommandRunner {
       this.addMissingSystemFieldsToStandardObjectsCommand,
       this.backfillMessageChannelMessageAssociationMessageFolderCommand,
       this.backfillPageLayoutsCommand,
+      this.fixRoleAndAgentUniversalIdentifiersCommand,
     ];
 
     this.allCommands = {

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts

@@ -9,7 +9,7 @@ const checkUUID = (value: any): string => {
     throw new ValidationError('UUID must be a string');
   }
   if (!uuidValidate(value)) {
-    throw new ValidationError(`Invalid UUID`, {
+    throw new ValidationError(`Invalid UUID: '${value}'`, {
       value,
     });
   }

packages/twenty-server/src/engine/core-modules/application/utils/from-object-manifest-to-universal-flat-object-metadata.util.ts

@@ -31,7 +31,7 @@ export const fromObjectManifestToUniversalFlatObjectMetadata = ({
     isSearchable: false,
     duplicateCriteria: null,
     shortcut: null,
-    isLabelSyncedWithName: true,
+    isLabelSyncedWithName: false,
     fieldUniversalIdentifiers: [],
     indexMetadataUniversalIdentifiers: [],
     viewUniversalIdentifiers: [],

packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/create-field.input.ts

@@ -18,6 +18,7 @@ export class CreateFieldInput extends OmitType(
     'standardOverrides',
     'applicationId',
     'morphId',
+    'universalIdentifier',
   ] as const,
   InputType,
 ) {

packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts

@@ -64,6 +64,11 @@ export class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {
   @IDField(() => UUIDScalarType)
   id: string;
 
+  @IsUUID()
+  @IsNotEmpty()
+  @IDField(() => UUIDScalarType)
+  universalIdentifier: string;
+
   @IsEnum(FieldMetadataType)
   @IsNotEmpty()
   @Field(() => FieldMetadataType)

packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util.ts

@@ -14,6 +14,7 @@ export const fromFlatFieldMetadataToFieldMetadataDto = (
     isUnique,
     settings,
     id,
+    universalIdentifier,
     label,
     name,
     objectMetadataId,
@@ -32,6 +33,7 @@ export const fromFlatFieldMetadataToFieldMetadataDto = (
 
   return {
     id,
+    universalIdentifier,
     label,
     name,
     objectMetadataId,

packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/__tests__/are-flat-object-metadata-names-synced-with-labels.util.spec.ts

@@ -0,0 +1,143 @@
+import { areFlatObjectMetadataNamesSyncedWithLabels } from 'src/engine/metadata-modules/flat-object-metadata/utils/are-flat-object-metadata-names-synced-with-labels.util';
+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
+import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
+
+const THIRD_PARTY_BUILD_OPTIONS: WorkspaceMigrationBuilderOptions = {
+  isSystemBuild: false,
+  applicationUniversalIdentifier: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
+};
+
+const TWENTY_STANDARD_BUILD_OPTIONS: WorkspaceMigrationBuilderOptions = {
+  isSystemBuild: false,
+  applicationUniversalIdentifier:
+    TWENTY_STANDARD_APPLICATION.universalIdentifier,
+};
+
+describe('areFlatObjectMetadataNamesSyncedWithLabels', () => {
+  it('should return true when names match computed names from labels', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'ticket',
+        namePlural: 'tickets',
+        labelSingular: 'Ticket',
+        labelPlural: 'Tickets',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it('should return false when singular name does not match', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'wrongName',
+        namePlural: 'tickets',
+        labelSingular: 'Ticket',
+        labelPlural: 'Tickets',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('should return false when plural name does not match', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'ticket',
+        namePlural: 'wrongPlural',
+        labelSingular: 'Ticket',
+        labelPlural: 'Tickets',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('should apply custom suffix for reserved words when caller is a third-party app', () => {
+    // "Event" computes to "event" which is reserved, so suffix "Custom" is appended
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'eventCustom',
+        namePlural: 'eventsCustom',
+        labelSingular: 'Event',
+        labelPlural: 'Events',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it('should return false for reserved words without custom suffix when caller is a third-party app', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'event',
+        namePlural: 'events',
+        labelSingular: 'Event',
+        labelPlural: 'Events',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('should not apply custom suffix for reserved words when caller is the Twenty Standard app', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'event',
+        namePlural: 'events',
+        labelSingular: 'Event',
+        labelPlural: 'Events',
+      },
+      buildOptions: TWENTY_STANDARD_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it('should handle multi-word labels by computing camelCase names', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'supportTicket',
+        namePlural: 'supportTickets',
+        labelSingular: 'Support Ticket',
+        labelPlural: 'Support Tickets',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it('should return false when both names do not match', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'foo',
+        namePlural: 'bar',
+        labelSingular: 'Ticket',
+        labelPlural: 'Tickets',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it('should return true with complex labels', () => {
+    const result = areFlatObjectMetadataNamesSyncedWithLabels({
+      flatObjectMetadata: {
+        nameSingular: 'wrongCreatedAtObject',
+        namePlural: 'wrongCreatedAtObjects',
+        labelSingular: 'Wrong CreatedAt Object',
+        labelPlural: 'Wrong CreatedAt Objects',
+      },
+      buildOptions: THIRD_PARTY_BUILD_OPTIONS,
+    });
+
+    expect(result).toBe(true);
+  });
+});

packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/are-flat-object-metadata-names-synced-with-labels.util.ts

@@ -5,18 +5,18 @@ import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/w
 import { type WorkspaceMigrationBuilderOptions } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-builder-options.type';
 
 export const areFlatObjectMetadataNamesSyncedWithLabels = ({
-  flatObjectdMetadata,
+  flatObjectMetadata,
   buildOptions,
 }: {
   buildOptions: WorkspaceMigrationBuilderOptions;
-  flatObjectdMetadata: Pick<
+  flatObjectMetadata: Pick<
     UniversalFlatObjectMetadata,
     'namePlural' | 'nameSingular' | 'labelPlural' | 'labelSingular'
   >;
 }) => {
   const [computedSingularName, computedPluralName] = [
-    flatObjectdMetadata.labelSingular,
-    flatObjectdMetadata.labelPlural,
+    flatObjectMetadata.labelSingular,
+    flatObjectMetadata.labelPlural,
   ].map((label) =>
     computeMetadataNameFromLabel({
       label,
@@ -25,7 +25,7 @@ export const areFlatObjectMetadataNamesSyncedWithLabels = ({
   );
 
   return (
-    flatObjectdMetadata.nameSingular === computedSingularName &&
-    flatObjectdMetadata.namePlural === computedPluralName
+    flatObjectMetadata.nameSingular === computedSingularName &&
+    flatObjectMetadata.namePlural === computedPluralName
   );
 };

packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util.ts

@@ -13,6 +13,7 @@ export const fromFlatObjectMetadataToObjectMetadataDto = (
     shortcut,
     duplicateCriteria,
     id,
+    universalIdentifier,
     isActive,
     isCustom,
     isLabelSyncedWithName,
@@ -32,6 +33,7 @@ export const fromFlatObjectMetadataToObjectMetadataDto = (
 
   return {
     id,
+    universalIdentifier,
     isActive,
     isCustom,
     isLabelSyncedWithName,

packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/validators/utils/validate-flat-object-metadata-name-and-labels.util.ts

@@ -66,7 +66,7 @@ export const validateFlatObjectMetadataNameAndLabels = ({
   if (
     universalFlatObjectMetadataToValidate.isLabelSyncedWithName &&
     !areFlatObjectMetadataNamesSyncedWithLabels({
-      flatObjectdMetadata: universalFlatObjectMetadataToValidate,
+      flatObjectMetadata: universalFlatObjectMetadataToValidate,
       buildOptions,
     })
   ) {

packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts

@@ -32,6 +32,9 @@ export class ObjectMetadataDTO {
   @IDField(() => UUIDScalarType)
   id: string;
 
+  @IDField(() => UUIDScalarType)
+  universalIdentifier: string;
+
   @Field()
   nameSingular: string;
 

packages/twenty-server/src/engine/metadata-modules/role/utils/fromRoleEntityToRoleDto.util.ts

@@ -5,6 +5,7 @@ export const fromRoleEntityToRoleDto = (role: RoleEntity): RoleDTO => {
   return {
     id: role.id,
     label: role.label,
+    universalIdentifier: role.universalIdentifier,
     canUpdateAllSettings: role.canUpdateAllSettings,
     canAccessAllTools: role.canAccessAllTools,
     description: role.description ?? undefined,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-agent.constant.ts

@@ -1,6 +1,6 @@
 export const STANDARD_AGENT = {
   helper: {
-    universalIdentifier: '20202020-0002-0001-0001-000000000004',
+    universalIdentifier: '20202020-c7ab-4065-b822-0ca1d5de60a9',
   },
 } as const satisfies Record<
   string,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-role.constant.ts

@@ -1,3 +1,3 @@
 export const STANDARD_ROLE = {
-  admin: { universalIdentifier: '20202020-0001-0001-0001-000000000001' },
+  admin: { universalIdentifier: '20202020-02c2-43f2-b94d-cab1f2b532eb' },
 } as const satisfies Record<string, { universalIdentifier: string }>;

packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type.ts

@@ -1,8 +1,8 @@
 import { type MessageDescriptor } from '@lingui/core';
 import { type AllMetadataName } from 'twenty-shared/metadata';
 
-import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
 import { type WorkspaceMigrationActionType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/workspace-migration-action-common';
+import { type MetadataFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity.type';
 
 export type FlatEntityValidationError<TCode extends string = string> = {
   code: TCode;
@@ -13,9 +13,9 @@ export type FlatEntityValidationError<TCode extends string = string> = {
 
 export type FailedFlatEntityValidation<
   TMetadataName extends AllMetadataName,
-  TAcionType extends WorkspaceMigrationActionType,
+  TActionType extends WorkspaceMigrationActionType,
 > = {
-  type: TAcionType;
+  type: TActionType;
   metadataName: TMetadataName;
   errors: FlatEntityValidationError[];
   flatEntityMinimalInformation: Partial<MetadataFlatEntity<TMetadataName>>;