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/metadata-modules/ai/ai-chat-router/ai-chat-router.service.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { IsNull, type Repository } from 'typeorm';
import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
import { isWorkflowRelatedObject } from 'src/engine/metadata-modules/ai/ai-agent/utils/is-workflow-related-object.util';
import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-models.const';
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 { HELPER_AGENT } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-agents/agents/helper-agent';
import { AiChatRouterPlanGeneratorService } from './services/ai-chat-router-plan-generator.service';
@@ -37,7 +37,7 @@ export class AiChatRouterService {
private readonly agentRepository: Repository<AgentEntity>,
private readonly strategyDecider: AiChatRouterStrategyDeciderService,
private readonly planGenerator: AiChatRouterPlanGeneratorService,
private readonly objectMetadataService: ObjectMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
) {}
async routeMessage(
packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
+5 -5
View File
@@ -20,7 +20,7 @@ import { FieldMetadataEnumValidationService } from 'src/engine/metadata-modules/
import { FieldMetadataMorphRelationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-morph-relation.service';
import { FieldMetadataRelationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-relation.service';
import { FieldMetadataValidationService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-validation.service';
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 { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
@@ -74,7 +74,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
],
services: [
IsFieldMetadataDefaultValue,
FieldMetadataServiceV2,
FieldMetadataService,
FieldMetadataMorphRelationService,
FieldMetadataRelationService,
FieldMetadataValidationService,
@@ -86,7 +86,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
DTOClass: FieldMetadataDTO,
CreateDTOClass: CreateFieldInput,
UpdateDTOClass: UpdateFieldInput,
ServiceClass: FieldMetadataServiceV2,
ServiceClass: FieldMetadataService,
pagingStrategy: PagingStrategies.CURSOR,
read: {
defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
@@ -107,7 +107,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
providers: [
IsFieldMetadataDefaultValue,
IsFieldMetadataOptions,
FieldMetadataServiceV2,
FieldMetadataService,
FieldMetadataRelationService,
FieldMetadataMorphRelationService,
FieldMetadataValidationService,
@@ -115,7 +115,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
FieldMetadataResolver,
],
exports: [
FieldMetadataServiceV2,
FieldMetadataService,
FieldMetadataRelationService,
FieldMetadataMorphRelationService,
FieldMetadataEnumValidationService,
packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
+14 -17
View File
@@ -25,7 +25,7 @@ import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/
import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
import { RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';
import { UpdateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/update-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 { fieldMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util';
import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
@@ -40,7 +40,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
)
export class FieldMetadataResolver {
constructor(
private readonly fieldMetadataServiceV2: FieldMetadataServiceV2,
private readonly fieldMetadataService: FieldMetadataService,
private readonly i18nService: I18nService,
) {}
@@ -52,11 +52,10 @@ export class FieldMetadataResolver {
@Context() context: I18nContext,
) {
try {
const flatFieldMetadata =
await this.fieldMetadataServiceV2.createOneField({
createFieldInput: input.field,
workspaceId,
});
const flatFieldMetadata = await this.fieldMetadataService.createOneField({
createFieldInput: input.field,
workspaceId,
});
return fromFlatFieldMetadataToFieldMetadataDto(flatFieldMetadata);
} catch (error) {
@@ -75,11 +74,10 @@ export class FieldMetadataResolver {
@Context() context: I18nContext,
) {
try {
const flatFieldMetadata =
await this.fieldMetadataServiceV2.updateOneField({
updateFieldInput: { ...input.update, id: input.id },
workspaceId,
});
const flatFieldMetadata = await this.fieldMetadataService.updateOneField({
updateFieldInput: { ...input.update, id: input.id },
workspaceId,
});
return fromFlatFieldMetadataToFieldMetadataDto(flatFieldMetadata);
} catch (error) {
@@ -102,11 +100,10 @@ export class FieldMetadataResolver {
}
try {
const flatFieldMetadata =
await this.fieldMetadataServiceV2.deleteOneField({
deleteOneFieldInput,
workspaceId,
});
const flatFieldMetadata = await this.fieldMetadataService.deleteOneField({
deleteOneFieldInput,
workspaceId,
});
return fromFlatFieldMetadataToFieldMetadataDto(flatFieldMetadata);
} catch (error) {
packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2.ts → packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts
+1 -1
View File
@@ -27,7 +27,7 @@ import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manag
import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service';
@Injectable()
export class FieldMetadataServiceV2 extends TypeOrmQueryService<FieldMetadataEntity> {
export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {
constructor(
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts
+5 -5
View File
@@ -22,9 +22,9 @@ import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/d
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
import { UpdateObjectPayload } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';
import { ObjectMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/object-metadata/interceptors/object-metadata-graphql-api-exception.interceptor';
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 { ObjectMetadataResolver } from 'src/engine/metadata-modules/object-metadata/object-metadata.resolver';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { RemoteTableRelationsModule } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module';
@@ -68,7 +68,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
WorkspaceManyOrAllFlatEntityMapsCacheModule,
],
services: [
ObjectMetadataServiceV2,
ObjectMetadataService,
FlatFieldMetadataValidatorService,
FlatFieldMetadataTypeValidatorService,
],
@@ -78,7 +78,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
DTOClass: ObjectMetadataDTO,
CreateDTOClass: CreateObjectInput,
UpdateDTOClass: UpdateObjectPayload,
ServiceClass: ObjectMetadataServiceV2,
ServiceClass: ObjectMetadataService,
pagingStrategy: PagingStrategies.CURSOR,
read: {
defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
@@ -95,7 +95,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
],
}),
],
providers: [ObjectMetadataServiceV2, ObjectMetadataResolver],
exports: [ObjectMetadataServiceV2],
providers: [ObjectMetadataService, ObjectMetadataResolver],
exports: [ObjectMetadataService],
})
export class ObjectMetadataModule {}
packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts
+5 -5
View File
@@ -24,7 +24,7 @@ import { CreateOneObjectInput } from 'src/engine/metadata-modules/object-metadat
import { DeleteOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/delete-object.input';
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
import { UpdateOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';
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 { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util';
import { resolveObjectMetadataStandardOverride } from 'src/engine/metadata-modules/object-metadata/utils/resolve-object-metadata-standard-override.util';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
@@ -39,7 +39,7 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module
)
export class ObjectMetadataResolver {
constructor(
private readonly objectMetadataServiceV2: ObjectMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
private readonly i18nService: I18nService,
) {}
@@ -113,7 +113,7 @@ export class ObjectMetadataResolver {
) {
try {
const flatobjectMetadata =
await this.objectMetadataServiceV2.createOneObject({
await this.objectMetadataService.createOneObject({
createObjectInput: input.object,
workspaceId,
});
@@ -136,7 +136,7 @@ export class ObjectMetadataResolver {
) {
try {
const flatobjectMetadata =
await this.objectMetadataServiceV2.deleteOneObject({
await this.objectMetadataService.deleteOneObject({
deleteObjectInput,
workspaceId,
});
@@ -159,7 +159,7 @@ export class ObjectMetadataResolver {
) {
try {
const flatobjectMetadata =
await this.objectMetadataServiceV2.updateOneObject({
await this.objectMetadataService.updateOneObject({
updateObjectInput,
workspaceId,
});
packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata-v2.service.ts → packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+1 -1
View File
@@ -36,7 +36,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspa
import { FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-objects/favorite.workspace-entity';
@Injectable()
export class ObjectMetadataServiceV2 extends TypeOrmQueryService<ObjectMetadataEntity> {
export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntity> {
constructor(
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts
+4 -4
View File
@@ -6,9 +6,9 @@ import { plural } from 'pluralize';
import { DataSource, Repository } from 'typeorm';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
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 { FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-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 {
RemoteServerEntity,
type RemoteServerType,
@@ -55,8 +55,8 @@ export class RemoteTableService {
>,
private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
private readonly dataSourceService: DataSourceService,
private readonly objectMetadataService: ObjectMetadataServiceV2,
private readonly fieldMetadataService: FieldMetadataServiceV2,
private readonly objectMetadataService: ObjectMetadataService,
private readonly fieldMetadataService: FieldMetadataService,
private readonly distantTableService: DistantTableService,
private readonly foreignTableService: ForeignTableService,
private readonly workspaceDataSourceService: WorkspaceDataSourceService,