houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Field and object metadata naming does not refer to v2 (#16187)

Browse Source 
Related https://github.com/twentyhq/core-team-issues/issues/1911
This commit is contained in:
Paul Rastoin
2025-11-28 18:06:44 +01:00
committed by GitHub
parent ea3c5d2d45
commit 9f62188ba6
18 changed files with 81 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts
+6 -6
View File
@@ -12,8 +12,8 @@ import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-s
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
@@ -34,7 +34,7 @@ describe('WorkspaceManagerService', () => {
let roleTargetsRepository: Repository<RoleTargetsEntity>;
let roleRepository: Repository<RoleEntity>;
let mockDataSource: jest.Mocked<DataSource>;
let objectMetadataServiceV2: ObjectMetadataServiceV2;
let objectMetadataService: ObjectMetadataService;
beforeEach(async () => {
mockDataSource = {
@@ -125,7 +125,7 @@ describe('WorkspaceManagerService', () => {
useValue: {},
},
{
provide: ObjectMetadataServiceV2,
provide: ObjectMetadataService,
useValue: {
deleteWorkspaceAllObjectMetadata: jest.fn(),
},
@@ -171,8 +171,8 @@ describe('WorkspaceManagerService', () => {
roleRepository = module.get<Repository<RoleEntity>>(
getRepositoryToken(RoleEntity),
);
objectMetadataServiceV2 = module.get<ObjectMetadataServiceV2>(
ObjectMetadataServiceV2,
objectMetadataService = module.get<ObjectMetadataService>(
ObjectMetadataService,
);
});
@@ -184,7 +184,7 @@ describe('WorkspaceManagerService', () => {
it('should delete all the workspace metadata tables and workspace schema', async () => {
await service.delete('workspace-id');
expect(
objectMetadataServiceV2.deleteWorkspaceAllObjectMetadata,
objectMetadataService.deleteWorkspaceAllObjectMetadata,
).toHaveBeenCalled();
expect(workspaceMigrationRepository.delete).toHaveBeenCalledWith({
workspaceId: 'workspace-id',
packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts
+2 -2
View File
@@ -10,7 +10,7 @@ import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/featu
import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';
import { computeTableName } from 'src/engine/utils/compute-table-name.util';
import {
@@ -266,7 +266,7 @@ export class DevSeederDataService {
constructor(
@InjectDataSource()
private readonly coreDataSource: DataSource,
private readonly objectMetadataService: ObjectMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
private readonly timelineActivitySeederService: TimelineActivitySeederService,
private readonly fileStorageService: FileStorageService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts
+2 -4
View File
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import chunk from 'lodash.chunk';
import { ObjectRecord } from 'twenty-shared/types';
import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';
import { CALENDAR_EVENT_DATA_SEEDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/calendar-event-data-seeds.constant';
import {
@@ -107,9 +107,7 @@ export class TimelineActivitySeederService {
'message',
]);
constructor(
private readonly objectMetadataService: ObjectMetadataServiceV2,
) {}
constructor(private readonly objectMetadataService: ObjectMetadataService) {}
private getLinkedActivityName(activityType: string): string {
// Notes and tasks use the legacy format: linked-{type}.created
packages/twenty-server/src/engine/workspace-manager/dev-seeder/metadata/services/dev-seeder-metadata.service.ts
+8 -8
View File
@@ -7,10 +7,10 @@ import { DataSource } from 'typeorm';
import { FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
import { FieldMetadataServiceV2 } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2';
import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';
import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import {
SEED_APPLE_WORKSPACE_ID,
SEED_YCOMBINATOR_WORKSPACE_ID,
@@ -30,8 +30,8 @@ import { prefillCoreViews } from 'src/engine/workspace-manager/standard-objects-
@Injectable()
export class DevSeederMetadataService {
constructor(
private readonly objectMetadataServiceV2: ObjectMetadataServiceV2,
private readonly fieldMetadataServiceV2: FieldMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
private readonly fieldMetadataService: FieldMetadataService,
private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
@InjectDataSource()
private readonly coreDataSource: DataSource,
@@ -143,7 +143,7 @@ export class DevSeederMetadataService {
workspaceId: string;
objectMetadataSeed: ObjectMetadataSeed;
}): Promise<void> {
await this.objectMetadataServiceV2.createOneObject({
await this.objectMetadataService.createOneObject({
createObjectInput: {
...objectMetadataSeed,
dataSourceId,
@@ -162,7 +162,7 @@ export class DevSeederMetadataService {
fieldMetadataSeeds: FieldMetadataSeed[];
}): Promise<void> {
const objectMetadata =
await this.objectMetadataServiceV2.findOneWithinWorkspace(workspaceId, {
await this.objectMetadataService.findOneWithinWorkspace(workspaceId, {
where: { nameSingular: objectMetadataNameSingular },
});
@@ -176,7 +176,7 @@ export class DevSeederMetadataService {
objectMetadataId: objectMetadata.id,
}));
await this.fieldMetadataServiceV2.createManyFields({
await this.fieldMetadataService.createManyFields({
createFieldInputs,
workspaceId,
});
@@ -259,7 +259,7 @@ export class DevSeederMetadataService {
objectIdByNameSingular,
});
await this.fieldMetadataServiceV2.createManyFields({
await this.fieldMetadataService.createManyFields({
createFieldInputs,
workspaceId,
});
packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { type DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { RoleTargetsEntity } from 'src/engine/metadata-modules/role/role-targets.entity';
import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { RoleService } from 'src/engine/metadata-modules/role/role.service';
@@ -33,7 +33,7 @@ export class WorkspaceManagerService {
private readonly coreDataSource: DataSource,
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
private readonly workspaceMigrationService: WorkspaceMigrationService,
private readonly objectMetadataServiceV2: ObjectMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
private readonly dataSourceService: DataSourceService,
private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService,
@InjectRepository(UserWorkspaceEntity)
@@ -171,7 +171,7 @@ export class WorkspaceManagerService {
workspaceId,
});
await this.objectMetadataServiceV2.deleteWorkspaceAllObjectMetadata({
await this.objectMetadataService.deleteWorkspaceAllObjectMetadata({
workspaceId,
});