Revert "Convert metadata tables to camelCase" (#2419)

Revert "Convert metadata tables to camelCase (#2400)"

This reverts commit 1cf08c797f.

server/src/tenant/resolver-builder/factories/create-many-resolver.factory.ts

@@ -7,8 +7,8 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
 
 @Injectable()
 export class CreateManyResolverFactory
@@ -16,15 +16,13 @@ export class CreateManyResolverFactory
 {
   public static methodName = 'createMany' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<CreateManyResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,

server/src/tenant/resolver-builder/factories/create-one-resolver.factory.ts

@@ -7,9 +7,9 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 
 @Injectable()
 export class CreateOneResolverFactory
@@ -17,20 +17,18 @@ export class CreateOneResolverFactory
 {
   public static methodName = 'createOne' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<CreateOneResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,
         fieldMetadataCollection:
-          internalContext.fieldMetadataCollection as FieldMetadataEntity[],
+          internalContext.fieldMetadataCollection as FieldMetadata[],
       });
 
       return runner.createOne(args);

server/src/tenant/resolver-builder/factories/delete-one-resolver.factory.ts

@@ -7,9 +7,9 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 
 @Injectable()
 export class DeleteOneResolverFactory
@@ -17,20 +17,18 @@ export class DeleteOneResolverFactory
 {
   public static methodName = 'deleteOne' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<DeleteOneResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,
         fieldMetadataCollection:
-          internalContext.fieldMetadataCollection as FieldMetadataEntity[],
+          internalContext.fieldMetadataCollection as FieldMetadata[],
       });
 
       return runner.deleteOne(args);

server/src/tenant/resolver-builder/factories/find-many-resolver.factory.ts

@@ -7,8 +7,8 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
 
 @Injectable()
 export class FindManyResolverFactory
@@ -16,15 +16,13 @@ export class FindManyResolverFactory
 {
   public static methodName = 'findMany' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<FindManyResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,

server/src/tenant/resolver-builder/factories/find-one-resolver.factory.ts

@@ -7,28 +7,26 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 
 @Injectable()
 export class FindOneResolverFactory implements ResolverBuilderFactoryInterface {
   public static methodName = 'findOne' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<FindOneResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,
         fieldMetadataCollection:
-          internalContext.fieldMetadataCollection as FieldMetadataEntity[],
+          internalContext.fieldMetadataCollection as FieldMetadata[],
       });
 
       return runner.findOne(args);

server/src/tenant/resolver-builder/factories/update-one-resolver.factory.ts

@@ -7,9 +7,9 @@ import {
 import { SchemaBuilderContext } from 'src/tenant/schema-builder/interfaces/schema-builder-context.interface';
 import { ResolverBuilderFactoryInterface } from 'src/tenant/resolver-builder/interfaces/resolver-builder-factory.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { PGGraphQLQueryRunner } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 
 @Injectable()
 export class UpdateOneResolverFactory
@@ -17,20 +17,18 @@ export class UpdateOneResolverFactory
 {
   public static methodName = 'updateOne' as const;
 
-  constructor(
-    private readonly tenantDataSourceService: TenantDataSourceService,
-  ) {}
+  constructor(private readonly dataSourceService: DataSourceService) {}
 
   create(context: SchemaBuilderContext): Resolver<UpdateOneResolverArgs> {
     const internalContext = context;
 
     return (_source, args, context, info) => {
-      const runner = new PGGraphQLQueryRunner(this.tenantDataSourceService, {
+      const runner = new PGGraphQLQueryRunner(this.dataSourceService, {
         targetTableName: internalContext.targetTableName,
         workspaceId: internalContext.workspaceId,
         info,
         fieldMetadataCollection:
-          internalContext.fieldMetadataCollection as FieldMetadataEntity[],
+          internalContext.fieldMetadataCollection as FieldMetadata[],
       });
 
       return runner.updateOne(args);

server/src/tenant/resolver-builder/pg-graphql/__tests__/pg-graphql-query-builder.spec.ts

@@ -1,12 +1,12 @@
 import { GraphQLResolveInfo } from 'graphql';
 
-import { FieldMetadataTargetColumnMap } from 'src/tenant/schema-builder/interfaces/field-metadata-target-column-map.interface';
+import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
 
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 import {
   PGGraphQLQueryBuilder,
   PGGraphQLQueryBuilderOptions,
 } from 'src/tenant/resolver-builder/pg-graphql/pg-graphql-query-builder';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
 
 const testUUID = '123e4567-e89b-12d3-a456-426614174001';
 
@@ -53,7 +53,7 @@ describe('PGGraphQLQueryBuilder', () => {
           subField2: 'column_subField2',
         } as FieldMetadataTargetColumnMap,
       },
-    ] as FieldMetadataEntity[];
+    ] as FieldMetadata[];
 
     mockOptions = {
       targetTableName: 'TestTable',

server/src/tenant/resolver-builder/pg-graphql/pg-graphql-query-runner.ts

@@ -22,8 +22,8 @@ import {
   PGGraphQLResult,
 } from 'src/tenant/resolver-builder/interfaces/pg-graphql.interface';
 
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { parseResult } from 'src/tenant/resolver-builder/utils/parse-result.util';
-import { TenantDataSourceService } from 'src/tenant-datasource/tenant-datasource.service';
 
 import { PGGraphQLQueryBuilder } from './pg-graphql-query-builder';
 
@@ -43,7 +43,7 @@ export class PGGraphQLQueryRunner<
   private options: QueryRunnerOptions;
 
   constructor(
-    private tenantDataSourceService: TenantDataSourceService,
+    private dataSourceService: DataSourceService,
     options: QueryRunnerOptions,
   ) {
     this.queryBuilder = new PGGraphQLQueryBuilder({
@@ -59,14 +59,10 @@ export class PGGraphQLQueryRunner<
     workspaceId: string,
   ): Promise<PGGraphQLResult | undefined> {
     const workspaceDataSource =
-      await this.tenantDataSourceService.connectToWorkspaceDataSource(
-        workspaceId,
-      );
+      await this.dataSourceService.connectToWorkspaceDataSource(workspaceId);
 
     await workspaceDataSource?.query(`
-      SET search_path TO ${this.tenantDataSourceService.getSchemaName(
-        workspaceId,
-      )};
+      SET search_path TO ${this.dataSourceService.getSchemaName(workspaceId)};
     `);
 
     return workspaceDataSource?.query<PGGraphQLResult>(`

server/src/tenant/resolver-builder/resolver-builder.module.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 
-import { TenantDataSourceModule } from 'src/tenant-datasource/tenant-datasource.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 
 import { ResolverFactory } from './resolver.factory';
 
 import { resolverBuilderFactories } from './factories/factories';
 
 @Module({
-  imports: [TenantDataSourceModule],
+  imports: [DataSourceModule],
   providers: [...resolverBuilderFactories, ResolverFactory],
   exports: [ResolverFactory],
 })

server/src/tenant/resolver-builder/utils/__tests__/convert-arguments.spec.ts

@@ -1,9 +1,9 @@
-import { FieldMetadataTargetColumnMap } from 'src/tenant/schema-builder/interfaces/field-metadata-target-column-map.interface';
+import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
 
 import {
-  FieldMetadataEntity,
+  FieldMetadata,
   FieldMetadataType,
-} from 'src/database/typeorm/metadata/entities/field-metadata.entity';
+} from 'src/metadata/field-metadata/field-metadata.entity';
 import { convertArguments } from 'src/tenant/resolver-builder/utils/convert-arguments.util';
 
 describe('convertArguments', () => {
@@ -33,7 +33,7 @@ describe('convertArguments', () => {
         } as FieldMetadataTargetColumnMap,
         type: FieldMetadataType.URL,
       },
-    ] as FieldMetadataEntity[];
+    ] as FieldMetadata[];
   });
 
   test('should handle non-array arguments', () => {

server/src/tenant/resolver-builder/utils/__tests__/convert-fields-to-graphql.spec.ts

@@ -1,7 +1,7 @@
-import { FieldMetadataTargetColumnMap } from 'src/tenant/schema-builder/interfaces/field-metadata-target-column-map.interface';
+import { FieldMetadataTargetColumnMap } from 'src/metadata/field-metadata/interfaces/field-metadata-target-column-map.interface';
 
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 import { convertFieldsToGraphQL } from 'src/tenant/resolver-builder/utils/convert-fields-to-graphql.util';
-import { FieldMetadataEntity } from 'src/database/typeorm/metadata/entities/field-metadata.entity';
 
 const normalizeWhitespace = (str) => str.replace(/\s+/g, ' ').trim();
 
@@ -23,7 +23,7 @@ describe('convertFieldsToGraphQL', () => {
           text: 'column_RANDOMSTRING3',
         } as FieldMetadataTargetColumnMap,
       },
-    ] as FieldMetadataEntity[];
+    ] as FieldMetadata[];
   });
 
   test('should handle simple fields correctly', () => {
@@ -75,7 +75,7 @@ describe('convertFieldsToGraphQL', () => {
     const emptyField = {
       name: 'emptyField',
       targetColumnMap: {},
-    } as FieldMetadataEntity;
+    } as FieldMetadata;
 
     fields.push(emptyField);