Convert metadata tables to camelCase (#2400)

* Convert metadata tables to camelCase

* datasourcemetadataid to datasourceid

* refactor metadata folders

* fix command

* move commands out of metadata

* fix seed

* rename objectId and fieldId in objectMetadataId and fieldMetadataId in FE

* fix field-metadata

* Fix

* Fix

* remove logs

---------

Co-authored-by: Charles Bochet <charles@twenty.com>

server/src/metadata/field-metadata/dtos/create-field.input.ts

@@ -1,5 +1,6 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { Field, HideField, InputType } from '@nestjs/graphql';
 
+import { BeforeCreateOne } from '@ptc-org/nestjs-query-graphql';
 import {
   IsEnum,
   IsNotEmpty,
@@ -8,9 +9,13 @@ import {
   IsUUID,
 } from 'class-validator';
 
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataTargetColumnMap } from 'src/tenant/schema-builder/interfaces/field-metadata-target-column-map.interface';
+
+import { FieldMetadataType } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+import { BeforeCreateOneField } from 'src/metadata/field-metadata/hooks/before-create-one-field.hook';
 
 @InputType()
+@BeforeCreateOne(BeforeCreateOneField)
 export class CreateFieldInput {
   @IsString()
   @IsNotEmpty()
@@ -29,7 +34,7 @@ export class CreateFieldInput {
 
   @IsUUID()
   @Field()
-  objectId: string;
+  objectMetadataId: string;
 
   @IsString()
   @IsOptional()
@@ -40,4 +45,10 @@ export class CreateFieldInput {
   @IsOptional()
   @Field({ nullable: true })
   icon?: string;
+
+  @HideField()
+  targetColumnMap: FieldMetadataTargetColumnMap;
+
+  @HideField()
+  workspaceId: string;
 }

server/src/metadata/field-metadata/dtos/field-metadata.dto.ts

@@ -0,0 +1,81 @@
+import {
+  Field,
+  HideField,
+  ID,
+  ObjectType,
+  registerEnumType,
+} from '@nestjs/graphql';
+
+import {
+  Authorize,
+  IDField,
+  QueryOptions,
+  Relation,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { FieldMetadataType } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+import { RelationMetadataDTO } from 'src/metadata/relation-metadata/dtos/relation-metadata.dto';
+
+registerEnumType(FieldMetadataType, {
+  name: 'FieldMetadataType',
+  description: 'Type of the field',
+});
+
+@ObjectType('field')
+@Authorize({
+  authorize: (context: any) => ({
+    workspaceId: { eq: context?.req?.user?.workspace?.id },
+  }),
+})
+@QueryOptions({
+  defaultResultSize: 10,
+  disableFilter: true,
+  disableSort: true,
+  maxResultsSize: 1000,
+})
+@Relation('toRelationMetadata', () => RelationMetadataDTO, {
+  nullable: true,
+})
+@Relation('fromRelationMetadata', () => RelationMetadataDTO, {
+  nullable: true,
+})
+export class FieldMetadataDTO {
+  @IDField(() => ID)
+  id: string;
+
+  @Field(() => FieldMetadataType)
+  type: FieldMetadataType;
+
+  @Field()
+  name: string;
+
+  @Field()
+  label: string;
+
+  @Field({ nullable: true })
+  description: string;
+
+  @Field({ nullable: true })
+  icon: string;
+
+  @Field({ nullable: true, deprecationReason: 'Use label name instead' })
+  placeholder?: string;
+
+  @Field()
+  isCustom: boolean;
+
+  @Field()
+  isActive: boolean;
+
+  @Field()
+  isNullable: boolean;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field()
+  createdAt: Date;
+
+  @Field()
+  updatedAt: Date;
+}

server/src/metadata/field-metadata/field-metadata.auto-resolver-opts.ts

@@ -1,44 +0,0 @@
-import { SortDirection } from '@ptc-org/nestjs-query-core';
-import {
-  AutoResolverOpts,
-  PagingStrategies,
-  ReadResolverOpts,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-
-import { FieldMetadata } from './field-metadata.entity';
-
-import { FieldMetadataService } from './services/field-metadata.service';
-import { CreateFieldInput } from './dtos/create-field.input';
-import { UpdateFieldInput } from './dtos/update-field.input';
-
-export const fieldMetadataAutoResolverOpts: AutoResolverOpts<
-  any,
-  any,
-  unknown,
-  unknown,
-  ReadResolverOpts<any>,
-  PagingStrategies
->[] = [
-  {
-    EntityClass: FieldMetadata,
-    DTOClass: FieldMetadata,
-    CreateDTOClass: CreateFieldInput,
-    UpdateDTOClass: UpdateFieldInput,
-    ServiceClass: FieldMetadataService,
-    enableTotalCount: true,
-    pagingStrategy: PagingStrategies.CURSOR,
-    read: {
-      defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
-    },
-    create: {
-      many: { disabled: true },
-    },
-    update: {
-      many: { disabled: true },
-    },
-    delete: { many: { disabled: true } },
-    guards: [JwtAuthGuard],
-  },
-];

server/src/metadata/field-metadata/field-metadata.entity.ts

@@ -1,141 +0,0 @@
-import { Field, ID, ObjectType, registerEnumType } from '@nestjs/graphql';
-
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  Unique,
-  UpdateDateColumn,
-} from 'typeorm';
-import {
-  Authorize,
-  BeforeCreateOne,
-  IDField,
-  QueryOptions,
-  Relation,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { FieldMetadataInterface } from 'src/tenant/schema-builder/interfaces/field-metadata.interface';
-
-import { ObjectMetadata } from 'src/metadata/object-metadata/object-metadata.entity';
-import { RelationMetadata } from 'src/metadata/relation-metadata/relation-metadata.entity';
-
-import { BeforeCreateOneField } from './hooks/before-create-one-field.hook';
-import { FieldMetadataTargetColumnMap } from './interfaces/field-metadata-target-column-map.interface';
-
-export enum FieldMetadataType {
-  UUID = 'uuid',
-  TEXT = 'TEXT',
-  PHONE = 'PHONE',
-  EMAIL = 'EMAIL',
-  DATE = 'DATE',
-  BOOLEAN = 'BOOLEAN',
-  NUMBER = 'NUMBER',
-  ENUM = 'ENUM',
-  URL = 'URL',
-  MONEY = 'MONEY',
-  RELATION = 'RELATION',
-}
-
-registerEnumType(FieldMetadataType, {
-  name: 'FieldMetadataType',
-  description: 'Type of the field',
-});
-
-@Entity('field_metadata')
-@ObjectType('field')
-@BeforeCreateOne(BeforeCreateOneField)
-@Authorize({
-  authorize: (context: any) => ({
-    workspaceId: { eq: context?.req?.user?.workspace?.id },
-  }),
-})
-@QueryOptions({
-  defaultResultSize: 10,
-  disableFilter: true,
-  disableSort: true,
-  maxResultsSize: 1000,
-})
-@Unique('IndexOnNameObjectIdAndWorkspaceIdUnique', [
-  'name',
-  'objectId',
-  'workspaceId',
-])
-@Relation('toRelationMetadata', () => RelationMetadata, { nullable: true })
-@Relation('fromRelationMetadata', () => RelationMetadata, { nullable: true })
-export class FieldMetadata implements FieldMetadataInterface {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Column({ nullable: false, name: 'object_id' })
-  objectId: string;
-
-  @Field(() => FieldMetadataType)
-  @Column({ nullable: false })
-  type: FieldMetadataType;
-
-  @Field()
-  @Column({ nullable: false })
-  name: string;
-
-  @Field()
-  @Column({ nullable: false })
-  label: string;
-
-  @Column({ nullable: false, name: 'target_column_map', type: 'jsonb' })
-  targetColumnMap: FieldMetadataTargetColumnMap;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true, name: 'description', type: 'text' })
-  description: string;
-
-  @Field({ nullable: true })
-  @Column({ nullable: true, name: 'icon' })
-  icon: string;
-
-  @Field({ nullable: true, deprecationReason: 'Use label name instead' })
-  placeholder: string;
-
-  @Column('text', { nullable: true, array: true })
-  enums: string[];
-
-  @Field()
-  @Column({ default: false, name: 'is_custom' })
-  isCustom: boolean;
-
-  @Field()
-  @Column({ default: false, name: 'is_active' })
-  isActive: boolean;
-
-  @Field()
-  @Column({ nullable: true, default: true, name: 'is_nullable' })
-  isNullable: boolean;
-
-  @Column({ nullable: false, name: 'workspace_id' })
-  workspaceId: string;
-
-  @ManyToOne(() => ObjectMetadata, (object) => object.fields, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn({ name: 'object_id' })
-  object: ObjectMetadata;
-
-  @OneToOne(() => RelationMetadata, (relation) => relation.fromFieldMetadata)
-  fromRelationMetadata: RelationMetadata;
-
-  @OneToOne(() => RelationMetadata, (relation) => relation.toFieldMetadata)
-  toRelationMetadata: RelationMetadata;
-
-  @Field()
-  @CreateDateColumn({ name: 'created_at' })
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn({ name: 'updated_at' })
-  updatedAt: Date;
-}

server/src/metadata/field-metadata/field-metadata.module.ts

@@ -1,28 +1,56 @@
 import { Module } from '@nestjs/common';
 
-import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
+import {
+  NestjsQueryGraphQLModule,
+  PagingStrategies,
+} from '@ptc-org/nestjs-query-graphql';
 import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+import { SortDirection } from '@ptc-org/nestjs-query-core';
 
-import { MigrationRunnerModule } from 'src/metadata/migration-runner/migration-runner.module';
+import { TenantMigrationRunnerModule } from 'src/tenant-migration-runner/tenant-migration-runner.module';
 import { TenantMigrationModule } from 'src/metadata/tenant-migration/tenant-migration.module';
 import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
+import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
 
-import { FieldMetadata } from './field-metadata.entity';
-import { fieldMetadataAutoResolverOpts } from './field-metadata.auto-resolver-opts';
+import { FieldMetadataService } from './field-metadata.service';
 
-import { FieldMetadataService } from './services/field-metadata.service';
+import { CreateFieldInput } from './dtos/create-field.input';
+import { FieldMetadataDTO } from './dtos/field-metadata.dto';
+import { UpdateFieldInput } from './dtos/update-field.input';
 
 @Module({
   imports: [
     NestjsQueryGraphQLModule.forFeature({
       imports: [
-        NestjsQueryTypeOrmModule.forFeature([FieldMetadata], 'metadata'),
+        NestjsQueryTypeOrmModule.forFeature([FieldMetadataEntity], 'metadata'),
         TenantMigrationModule,
-        MigrationRunnerModule,
+        TenantMigrationRunnerModule,
         ObjectMetadataModule,
       ],
       services: [FieldMetadataService],
-      resolvers: fieldMetadataAutoResolverOpts,
+      resolvers: [
+        {
+          EntityClass: FieldMetadataEntity,
+          DTOClass: FieldMetadataDTO,
+          CreateDTOClass: CreateFieldInput,
+          UpdateDTOClass: UpdateFieldInput,
+          ServiceClass: FieldMetadataService,
+          enableTotalCount: true,
+          pagingStrategy: PagingStrategies.CURSOR,
+          read: {
+            defaultSort: [{ field: 'id', direction: SortDirection.DESC }],
+          },
+          create: {
+            many: { disabled: true },
+          },
+          update: {
+            many: { disabled: true },
+          },
+          delete: { many: { disabled: true } },
+          guards: [JwtAuthGuard],
+        },
+      ],
     }),
   ],
   providers: [FieldMetadataService],

server/src/metadata/field-metadata/field-metadata.service.ts

@@ -10,37 +10,38 @@ import { Repository } from 'typeorm';
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import { DeleteOneOptions } from '@ptc-org/nestjs-query-core';
 
-import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 import {
   convertFieldMetadataToColumnActions,
   generateTargetColumnMap,
 } from 'src/metadata/field-metadata/utils/field-metadata.util';
-import { MigrationRunnerService } from 'src/metadata/migration-runner/migration-runner.service';
+import { TenantMigrationRunnerService } from 'src/tenant-migration-runner/tenant-migration-runner.service';
 import { TenantMigrationService } from 'src/metadata/tenant-migration/tenant-migration.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/services/object-metadata.service';
-import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
+import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+import { FieldMetadataDTO } from 'src/metadata/field-metadata/dtos/field-metadata.dto';
+import { CreateFieldInput } from 'src/metadata/field-metadata/dtos/create-field.input';
+import { TenantMigrationTableAction } from 'src/database/typeorm/metadata/entities/tenant-migration.entity';
 
 @Injectable()
-export class FieldMetadataService extends TypeOrmQueryService<FieldMetadata> {
+export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {
   constructor(
-    @InjectRepository(FieldMetadata, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadata>,
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
 
     private readonly objectMetadataService: ObjectMetadataService,
     private readonly tenantMigrationService: TenantMigrationService,
-    private readonly migrationRunnerService: MigrationRunnerService,
+    private readonly migrationRunnerService: TenantMigrationRunnerService,
   ) {
     super(fieldMetadataRepository);
   }
 
   override async deleteOne(
     id: string,
-    opts?: DeleteOneOptions<FieldMetadata> | undefined,
-  ): Promise<FieldMetadata> {
+    opts?: DeleteOneOptions<FieldMetadataDTO> | undefined,
+  ): Promise<FieldMetadataEntity> {
     const fieldMetadata = await this.fieldMetadataRepository.findOne({
       where: { id },
     });
-
     if (!fieldMetadata) {
       throw new NotFoundException('Field does not exist');
     }
@@ -58,10 +59,12 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadata> {
     return super.deleteOne(id, opts);
   }
 
-  override async createOne(record: FieldMetadata): Promise<FieldMetadata> {
+  override async createOne(
+    record: CreateFieldInput,
+  ): Promise<FieldMetadataEntity> {
     const objectMetadata =
       await this.objectMetadataService.findOneWithinWorkspace(
-        record.objectId,
+        record.objectMetadataId,
         record.workspaceId,
       );
 
@@ -72,7 +75,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadata> {
     const fieldAlreadyExists = await this.fieldMetadataRepository.findOne({
       where: {
         name: record.name,
-        objectId: record.objectId,
+        objectMetadataId: record.objectMetadataId,
         workspaceId: record.workspaceId,
       },
     });
@@ -83,11 +86,9 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadata> {
 
     const createdFieldMetadata = await super.createOne({
       ...record,
-      targetColumnMap: generateTargetColumnMap(
-        record.type,
-        record.isCustom,
-        record.name,
-      ),
+      targetColumnMap: generateTargetColumnMap(record.type, true, record.name),
+      isActive: true,
+      isCustom: true,
     });
 
     await this.tenantMigrationService.createCustomMigration(

server/src/metadata/field-metadata/hooks/before-create-one-field.hook.ts

@@ -5,10 +5,10 @@ import {
   CreateOneInputType,
 } from '@ptc-org/nestjs-query-graphql';
 
-import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
+import { CreateFieldInput } from 'src/metadata/field-metadata/dtos/create-field.input';
 
 @Injectable()
-export class BeforeCreateOneField<T extends FieldMetadata>
+export class BeforeCreateOneField<T extends CreateFieldInput>
   implements BeforeCreateOneHook<T, any>
 {
   async run(
@@ -22,8 +22,6 @@ export class BeforeCreateOneField<T extends FieldMetadata>
     }
 
     instance.input.workspaceId = workspaceId;
-    instance.input.isActive = true;
-    instance.input.isCustom = true;
     return instance;
   }
 }

server/src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface.ts

@@ -1,35 +0,0 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
-
-export interface FieldMetadataTargetColumnMapValue {
-  value: string;
-}
-
-export interface FieldMetadataTargetColumnMapUrl {
-  text: string;
-  link: string;
-}
-
-export interface FieldMetadataTargetColumnMapMoney {
-  amount: number;
-  currency: string;
-}
-
-type AllFieldMetadataTypes = {
-  [key: string]: any;
-};
-
-type FieldMetadataTypeMapping = {
-  [FieldMetadataType.URL]: FieldMetadataTargetColumnMapUrl;
-  [FieldMetadataType.MONEY]: FieldMetadataTargetColumnMapMoney;
-};
-
-type TypeByFieldMetadata<T extends FieldMetadataType | 'default'> =
-  T extends keyof FieldMetadataTypeMapping
-    ? FieldMetadataTypeMapping[T]
-    : T extends 'default'
-    ? AllFieldMetadataTypes
-    : FieldMetadataTargetColumnMapValue;
-
-export type FieldMetadataTargetColumnMap<
-  T extends FieldMetadataType | 'default' = 'default',
-> = TypeByFieldMetadata<T>;

server/src/metadata/field-metadata/services/field-metadata.service.spec.ts

@@ -1,43 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
-import { MigrationRunnerService } from 'src/metadata/migration-runner/migration-runner.service';
-import { TenantMigrationService } from 'src/metadata/tenant-migration/tenant-migration.service';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/services/object-metadata.service';
-
-import { FieldMetadataService } from './field-metadata.service';
-
-describe('FieldMetadataService', () => {
-  let service: FieldMetadataService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        FieldMetadataService,
-        {
-          provide: getRepositoryToken(FieldMetadata, 'metadata'),
-          useValue: {},
-        },
-        {
-          provide: ObjectMetadataService,
-          useValue: {},
-        },
-        {
-          provide: TenantMigrationService,
-          useValue: {},
-        },
-        {
-          provide: MigrationRunnerService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<FieldMetadataService>(FieldMetadataService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});

server/src/metadata/field-metadata/utils/field-metadata.util.spec.ts

@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
 
 import {
   generateTargetColumnMap,

server/src/metadata/field-metadata/utils/field-metadata.util.ts

@@ -1,13 +1,13 @@
-import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
+import { FieldMetadataTargetColumnMap } from 'src/tenant/schema-builder/interfaces/field-metadata-target-column-map.interface';
 
 import {
-  FieldMetadata,
+  FieldMetadataEntity,
   FieldMetadataType,
-} from 'src/metadata/field-metadata/field-metadata.entity';
+} from 'src/database/typeorm/metadata/entities/field-metadata.entity';
 import {
   TenantMigrationColumnAction,
   TenantMigrationColumnActionType,
-} from 'src/metadata/tenant-migration/tenant-migration.entity';
+} from 'src/database/typeorm/metadata/entities/tenant-migration.entity';
 
 /**
  * Generate a target column map for a given type, this is used to map the field to the correct column(s) in the database.
@@ -49,7 +49,7 @@ export function generateTargetColumnMap(
 }
 
 export function convertFieldMetadataToColumnActions(
-  fieldMetadata: FieldMetadata,
+  fieldMetadata: FieldMetadataEntity,
 ): TenantMigrationColumnAction[] {
   switch (fieldMetadata.type) {
     case FieldMetadataType.TEXT: