Merge branch 'Paul0523-feature/fix-custom-repository-nometadata-error'

Author: kamilmysliwiec

lib/helpers/get-custom-repository-entity.ts

@@ -0,0 +1,39 @@
+import {
+  AbstractRepository,
+  getMetadataArgsStorage,
+  Repository,
+} from 'typeorm';
+import { EntityClassOrSchema } from '../interfaces/entity-class-or-schema.type';
+
+export function getCustomRepositoryEntity(
+  entities: EntityClassOrSchema[],
+): Array<EntityClassOrSchema> {
+  const customRepositoryEntities = new Array<EntityClassOrSchema>();
+  const typeormEntityRepositories = getMetadataArgsStorage().entityRepositories;
+
+  for (const entity of entities) {
+    const isCustomRepository =
+      entity instanceof Function &&
+      (entity.prototype instanceof Repository ||
+        entity.prototype instanceof AbstractRepository);
+    if (isCustomRepository) {
+      const entityRepositoryMetadataArgs = typeormEntityRepositories.find(
+        (repository) => {
+          return (
+            repository.target ===
+            (entity instanceof Function ? entity : (entity as any)?.constructor)
+          );
+        },
+      );
+      if (entityRepositoryMetadataArgs) {
+        const targetEntity = entityRepositoryMetadataArgs.entity as EntityClassOrSchema;
+        const isEntityRegisteredAlready = entities.indexOf(targetEntity) !== -1;
+
+        if (!isEntityRegisteredAlready) {
+          customRepositoryEntities.push(targetEntity);
+        }
+      }
+    }
+  }
+  return customRepositoryEntities;
+}

lib/helpers/index.ts

@@ -0,0 +1 @@
+export * from './get-custom-repository-entity';

lib/typeorm.module.ts

@@ -1,6 +1,7 @@
 import { DynamicModule, Module } from '@nestjs/common';
-import { Connection, ConnectionOptions, EntitySchema } from 'typeorm';
+import { Connection, ConnectionOptions } from 'typeorm';
 import { EntitiesMetadataStorage } from './entities-metadata.storage';
+import { getCustomRepositoryEntity } from './helpers/get-custom-repository-entity';
 import { EntityClassOrSchema } from './interfaces/entity-class-or-schema.type';
 import {
   TypeOrmModuleAsyncOptions,
@@ -27,7 +28,11 @@ export class TypeOrmModule {
       | string = DEFAULT_CONNECTION_NAME,
   ): DynamicModule {
     const providers = createTypeOrmProviders(entities, connection);
-    EntitiesMetadataStorage.addEntitiesByConnection(connection, entities);
+    const customRepositoryEntities = getCustomRepositoryEntity(entities);
+    EntitiesMetadataStorage.addEntitiesByConnection(connection, [
+      ...entities,
+      ...customRepositoryEntities,
+    ]);
     return {
       module: TypeOrmModule,
       providers: providers,