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>
2023-11-09 20:06:10 +01:00
parent 5622f42e7a
commit 1cf08c797f
238 changed files with 1851 additions and 2252 deletions
--- a/server/src/metadata/relation-metadata/dtos/create-relation.input.ts
+++ b/server/src/metadata/relation-metadata/dtos/create-relation.input.ts
@ -1,4 +1,4 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { Field, HideField, InputType } from '@nestjs/graphql';

 import { BeforeCreateOne } from '@ptc-org/nestjs-query-graphql';
 import {
@ -9,9 +9,10 @@ import {
  IsUUID,
 } from 'class-validator';

-import { RelationType } from 'src/metadata/relation-metadata/relation-metadata.entity';
 import { BeforeCreateOneRelation } from 'src/metadata/relation-metadata/hooks/before-create-one-relation.hook';

+import { RelationType } from './relation-metadata.dto';
+
@InputType()
@BeforeCreateOne(BeforeCreateOneRelation)
 export class CreateRelationInput {
@ -50,5 +51,6 @@ export class CreateRelationInput {
  @Field({ nullable: true })
  icon?: string;

+  @HideField()
  workspaceId: string;
 }
--- a/server/src/metadata/relation-metadata/dtos/relation-metadata.dto.ts
+++ b/server/src/metadata/relation-metadata/dtos/relation-metadata.dto.ts
@ -0,0 +1,62 @@
+import { ObjectType, ID, Field, HideField } from '@nestjs/graphql';
+
+import { CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import {
+  Authorize,
+  IDField,
+  QueryOptions,
+  Relation,
+} from '@ptc-org/nestjs-query-graphql';
+
+import { ObjectMetadataDTO } from 'src/metadata/object-metadata/dtos/object-metadata.dto';
+
+export enum RelationType {
+  ONE_TO_ONE = 'ONE_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  MANY_TO_MANY = 'MANY_TO_MANY',
+}
+
+@ObjectType('relation')
+@Authorize({
+  authorize: (context: any) => ({
+    workspaceId: { eq: context?.req?.user?.workspace?.id },
+  }),
+})
+@QueryOptions({
+  defaultResultSize: 10,
+  disableFilter: true,
+  disableSort: true,
+  maxResultsSize: 1000,
+})
+@Relation('fromObjectMetadata', () => ObjectMetadataDTO)
+@Relation('toObjectMetadata', () => ObjectMetadataDTO)
+export class RelationMetadataDTO {
+  @IDField(() => ID)
+  id: string;
+
+  @Field()
+  relationType: RelationType;
+
+  @Field()
+  fromObjectMetadataId: string;
+
+  @Field()
+  toObjectMetadataId: string;
+
+  @Field()
+  fromFieldMetadataId: string;
+
+  @Field()
+  toFieldMetadataId: string;
+
+  @HideField()
+  workspaceId: string;
+
+  @Field()
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @Field()
+  @UpdateDateColumn()
+  updatedAt: Date;
+}
--- a/server/src/metadata/relation-metadata/relation-metadata.auto-resolver-opts.ts
+++ b/server/src/metadata/relation-metadata/relation-metadata.auto-resolver-opts.ts
@ -1,35 +0,0 @@
-import {
-  AutoResolverOpts,
-  PagingStrategies,
-  ReadResolverOpts,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-
-import { RelationMetadata } from './relation-metadata.entity';
-
-import { RelationMetadataService } from './services/relation-metadata.service';
-import { CreateRelationInput } from './dtos/create-relation.input';
-
-export const relationMetadataAutoResolverOpts: AutoResolverOpts<
-  any,
-  any,
-  unknown,
-  unknown,
-  ReadResolverOpts<any>,
-  PagingStrategies
->[] = [
-  {
-    EntityClass: RelationMetadata,
-    DTOClass: RelationMetadata,
-    ServiceClass: RelationMetadataService,
-    CreateDTOClass: CreateRelationInput,
-    enableTotalCount: true,
-    pagingStrategy: PagingStrategies.CURSOR,
-    read: { many: { disabled: true } },
-    create: { many: { disabled: true } },
-    update: { disabled: true },
-    delete: { disabled: true },
-    guards: [JwtAuthGuard],
-  },
-];
--- a/server/src/metadata/relation-metadata/relation-metadata.entity.ts
+++ b/server/src/metadata/relation-metadata/relation-metadata.entity.ts
@ -1,93 +0,0 @@
-import { ObjectType, ID, Field } from '@nestjs/graphql';
-
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
-import {
-  Authorize,
-  IDField,
-  QueryOptions,
-  Relation,
-} from '@ptc-org/nestjs-query-graphql';
-
-import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadata } from 'src/metadata/object-metadata/object-metadata.entity';
-
-export enum RelationType {
-  ONE_TO_ONE = 'ONE_TO_ONE',
-  ONE_TO_MANY = 'ONE_TO_MANY',
-  MANY_TO_MANY = 'MANY_TO_MANY',
-}
-
-@Entity('relationMetadata')
-@ObjectType('relation')
-@Authorize({
-  authorize: (context: any) => ({
-    workspaceId: { eq: context?.req?.user?.workspace?.id },
-  }),
-})
-@QueryOptions({
-  defaultResultSize: 10,
-  disableFilter: true,
-  disableSort: true,
-  maxResultsSize: 1000,
-})
-@Relation('fromObjectMetadata', () => ObjectMetadata)
-@Relation('toObjectMetadata', () => ObjectMetadata)
-export class RelationMetadata {
-  @IDField(() => ID)
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @Field()
-  @Column({ nullable: false })
-  relationType: RelationType;
-
-  @Field()
-  @Column({ nullable: false, type: 'uuid' })
-  fromObjectMetadataId: string;
-
-  @Field()
-  @Column({ nullable: false, type: 'uuid' })
-  toObjectMetadataId: string;
-
-  @Field()
-  @Column({ nullable: false, type: 'uuid' })
-  fromFieldMetadataId: string;
-
-  @Field()
-  @Column({ nullable: false, type: 'uuid' })
-  toFieldMetadataId: string;
-
-  @Column({ nullable: false })
-  workspaceId: string;
-
-  @ManyToOne(() => ObjectMetadata, (object) => object.fromRelations)
-  fromObjectMetadata: ObjectMetadata;
-
-  @ManyToOne(() => ObjectMetadata, (object) => object.toRelations)
-  toObjectMetadata: ObjectMetadata;
-
-  @OneToOne(() => FieldMetadata, (field) => field.fromRelationMetadata)
-  @JoinColumn()
-  fromFieldMetadata: FieldMetadata;
-
-  @OneToOne(() => FieldMetadata, (field) => field.toRelationMetadata)
-  @JoinColumn()
-  toFieldMetadata: FieldMetadata;
-
-  @Field()
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @Field()
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
--- a/server/src/metadata/relation-metadata/relation-metadata.module.ts
+++ b/server/src/metadata/relation-metadata/relation-metadata.module.ts
@ -1,30 +1,52 @@
 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 { FieldMetadataModule } from 'src/metadata/field-metadata/field-metadata.module';
 import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
-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 { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
+import { RelationMetadataEntity } from 'src/database/typeorm/metadata/entities/relation-metadata.entity';

-import { RelationMetadata } from './relation-metadata.entity';
-import { relationMetadataAutoResolverOpts } from './relation-metadata.auto-resolver-opts';
+import { RelationMetadataService } from './relation-metadata.service';

-import { RelationMetadataService } from './services/relation-metadata.service';
+import { CreateRelationInput } from './dtos/create-relation.input';
+import { RelationMetadataDTO } from './dtos/relation-metadata.dto';

@Module({
  imports: [
    NestjsQueryGraphQLModule.forFeature({
      imports: [
-        NestjsQueryTypeOrmModule.forFeature([RelationMetadata], 'metadata'),
+        NestjsQueryTypeOrmModule.forFeature(
+          [RelationMetadataEntity],
+          'metadata',
+        ),
        ObjectMetadataModule,
        FieldMetadataModule,
-        MigrationRunnerModule,
+        TenantMigrationRunnerModule,
        TenantMigrationModule,
      ],
      services: [RelationMetadataService],
-      resolvers: relationMetadataAutoResolverOpts,
+      resolvers: [
+        {
+          EntityClass: RelationMetadataEntity,
+          DTOClass: RelationMetadataDTO,
+          ServiceClass: RelationMetadataService,
+          CreateDTOClass: CreateRelationInput,
+          enableTotalCount: true,
+          pagingStrategy: PagingStrategies.CURSOR,
+          read: { many: { disabled: true } },
+          create: { many: { disabled: true } },
+          update: { disabled: true },
+          delete: { disabled: true },
+          guards: [JwtAuthGuard],
+        },
+      ],
    }),
  ],
  providers: [RelationMetadataService],
--- a/server/src/metadata/relation-metadata/services/relation-metadata.service.ts
+++ b/server/src/metadata/relation-metadata/services/relation-metadata.service.ts
@ -8,34 +8,34 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import { Repository } from 'typeorm';

-import {
-  RelationMetadata,
-  RelationType,
-} from 'src/metadata/relation-metadata/relation-metadata.entity';
-import { ObjectMetadataService } from 'src/metadata/object-metadata/services/object-metadata.service';
-import { FieldMetadataService } from 'src/metadata/field-metadata/services/field-metadata.service';
-import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
+import { FieldMetadataService } from 'src/metadata/field-metadata/field-metadata.service';
 import { CreateRelationInput } from 'src/metadata/relation-metadata/dtos/create-relation.input';
-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 { TenantMigrationColumnActionType } from 'src/metadata/tenant-migration/tenant-migration.entity';
+import {
+  RelationMetadataEntity,
+  RelationType,
+} from 'src/database/typeorm/metadata/entities/relation-metadata.entity';
+import { FieldMetadataType } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+import { TenantMigrationColumnActionType } from 'src/database/typeorm/metadata/entities/tenant-migration.entity';

@Injectable()
-export class RelationMetadataService extends TypeOrmQueryService<RelationMetadata> {
+export class RelationMetadataService extends TypeOrmQueryService<RelationMetadataEntity> {
  constructor(
-    @InjectRepository(RelationMetadata, 'metadata')
-    private readonly relationMetadataRepository: Repository<RelationMetadata>,
+    @InjectRepository(RelationMetadataEntity, 'metadata')
+    private readonly relationMetadataRepository: Repository<RelationMetadataEntity>,
    private readonly objectMetadataService: ObjectMetadataService,
    private readonly fieldMetadataService: FieldMetadataService,
    private readonly tenantMigrationService: TenantMigrationService,
-    private readonly migrationRunnerService: MigrationRunnerService,
+    private readonly migrationRunnerService: TenantMigrationRunnerService,
  ) {
    super(relationMetadataRepository);
  }

  override async createOne(
    record: CreateRelationInput,
-  ): Promise<RelationMetadata> {
+  ): Promise<RelationMetadataEntity> {
    if (record.relationType === RelationType.MANY_TO_MANY) {
      throw new BadRequestException(
        'Many to many relations are not supported yet',
@ -72,7 +72,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
        targetColumnMap: {},
        isActive: true,
        type: FieldMetadataType.RELATION,
-        objectId: record.fromObjectMetadataId,
+        objectMetadataId: record.fromObjectMetadataId,
        workspaceId: record.workspaceId,
      },
      // NOTE: Since we have to create the field-metadata for the user, we need to use the toObjectMetadata info.
@ -87,13 +87,13 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
        targetColumnMap: {},
        isActive: true,
        type: FieldMetadataType.RELATION,
-        objectId: record.toObjectMetadataId,
+        objectMetadataId: record.toObjectMetadataId,
        workspaceId: record.workspaceId,
      },
    ]);

    const createdFieldMap = createdFields.reduce((acc, curr) => {
-      acc[curr.objectId] = curr;
+      acc[curr.objectMetadataId] = curr;
      return acc;
    }, {});