fix(json-api-nestjs): get DataSource by name in ajv factory

Alexander Kharkovey · Alexander Kharkovey · commit e72d3e3b8a29 · 2022-10-09T15:23:50.000+06:00
diff --git a/libs/json-api-nestjs/src/lib/constants/reflection.ts b/libs/json-api-nestjs/src/lib/constants/reflection.ts
@@ -1,14 +1,14 @@
 export const JSON_API_DECORATOR_ENTITY = Symbol('JSON_API_ENTITY');
 export const JSON_API_DECORATOR_OPTIONS = Symbol('JSON_API_OPTIONS');
+export const GLOBAL_MODULE_OPTIONS_TOKEN = Symbol('GLOBAL_MODULE_OPTIONS');
+export const CURRENT_DATA_SOURCE_TOKEN = Symbol('CURRENT_DATA_SOURCE_TOKEN');
 
 export const PARAMS_RESOURCE_ID = 'id';
 export const PARAMS_RELATION_ID = 'relId';
 export const PARAMS_RELATION_NAME = 'relName';
 
 export const JSON_API_CONFIG = 'JSON_API_CONFIG';
 
-export const GLOBAL_MODULE_OPTIONS_TOKEN = Symbol('GLOBAL_MODULE_OPTIONS');
-
 export const JSON_API_SERVICE_POSTFIX = 'JsonApiService';
 export const CONFIG_PARAM_POSTFIX = 'JsonApiConfigParam';
 export const JSON_API_CONTROLLER_POSTFIX = 'JsonApiController';
diff --git a/libs/json-api-nestjs/src/lib/factory/ajv/ajv.factory.ts b/libs/json-api-nestjs/src/lib/factory/ajv/ajv.factory.ts
@@ -1,11 +1,14 @@
 import AjvCall from 'ajv';
 import { FactoryProvider } from '@nestjs/common/interfaces/modules/provider.interface';
-import { getDataSourceToken } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
 import { plainToClass } from 'class-transformer';
 
 import { ModuleOptions } from '../../types';
-import { GLOBAL_MODULE_OPTIONS_TOKEN } from '../../constants';
+import {
+  CURRENT_DATA_SOURCE_TOKEN,
+  GLOBAL_MODULE_OPTIONS_TOKEN,
+} from '../../constants';
+
 import {
   inputQuerySchema,
   inputBodyPostSchema,
@@ -141,7 +144,10 @@ export const ajvFactory: FactoryProvider<AjvCall> = {
   provide: AjvCall,
   useFactory: AjvCallFactory,
   inject: [
-    getDataSourceToken(),
+    {
+      token: CURRENT_DATA_SOURCE_TOKEN,
+      optional: false,
+    },
     {
       token: GLOBAL_MODULE_OPTIONS_TOKEN,
       optional: false,
diff --git a/libs/json-api-nestjs/src/lib/json-api-nestjs-common.module.ts b/libs/json-api-nestjs/src/lib/json-api-nestjs-common.module.ts
@@ -1,8 +1,12 @@
 import { DynamicModule, Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
+import { getDataSourceToken, TypeOrmModule } from '@nestjs/typeorm';
+import { DataSource } from 'typeorm';
 
 import { ModuleOptions } from '../lib/types';
-import { GLOBAL_MODULE_OPTIONS_TOKEN } from './constants';
+import {
+  CURRENT_DATA_SOURCE_TOKEN,
+  GLOBAL_MODULE_OPTIONS_TOKEN,
+} from './constants';
 import { ajvFactory } from './factory';
 import { ErrorInterceptors } from './mixin/interceptors';
 
@@ -14,6 +18,12 @@ export class JsonApiNestJsCommonModule {
       useValue: options,
     };
 
+    const currentDataSourceProvider = {
+      provide: CURRENT_DATA_SOURCE_TOKEN,
+      useFactory: (dataSource: DataSource) => dataSource,
+      inject: [getDataSourceToken(options.connectionName)],
+    };
+
     const typeOrmModule = TypeOrmModule.forFeature(
       options.entities,
       options.connectionName
@@ -25,6 +35,7 @@ export class JsonApiNestJsCommonModule {
         ...(options.providers || []),
         ajvFactory,
         optionProvider,
+        currentDataSourceProvider,
         ErrorInterceptors,
       ],
       exports: [
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/body-input-patch/body-input-patch.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/body-input-patch/body-input-patch.pipe.spec.ts
@@ -3,6 +3,7 @@ import { getDataSourceToken, getRepositoryToken } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
 
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
@@ -35,12 +36,22 @@ describe('BodyInputPatchPipe', () => {
             connectionName: DEFAULT_CONNECTION_NAME,
           },
         },
+        {
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(mockConnectionName)],
+        },
         {
           provide: getRepositoryToken(Users, mockConnectionName),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/body-input-post/body-input-post.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/body-input-post/body-input-post.pipe.spec.ts
@@ -3,6 +3,7 @@ import { getDataSourceToken, getRepositoryToken } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
 
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
@@ -29,15 +30,25 @@ describe('BodyInputPostPipe', () => {
           provide: GLOBAL_MODULE_OPTIONS_TOKEN,
           useValue: {
             entities: entities,
-            connectionName: DEFAULT_CONNECTION_NAME,
+            connectionName: mockConnectionName,
           },
         },
+        {
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(mockConnectionName)],
+        },
         {
           provide: getRepositoryToken(Users, mockConnectionName),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/body-relationship-patch/body-relationship-patch.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/body-relationship-patch/body-relationship-patch.pipe.spec.ts
@@ -4,10 +4,13 @@ import { ajvFactory } from '../../../factory';
 import { entities, mockDBTestModule, Users } from '../../../mock-utils';
 import { BodyRelationshipPatchPipe } from './body-relationship-patch.pipe';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
 import { BadRequestException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { getDataSourceToken, getRepositoryToken } from '@nestjs/typeorm';
 
 describe('BodyRelationshipPatchPipe', () => {
   let pipe: BodyRelationshipPatchPipe<Users>;
@@ -25,6 +28,23 @@ describe('BodyRelationshipPatchPipe', () => {
             connectionName: DEFAULT_CONNECTION_NAME,
           },
         },
+        {
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
+          useFactory(dataSource: DataSource) {
+            return dataSource.getRepository<Users>(Users);
+          },
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
+        },
       ],
     }).compile();
 
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/body-relationship/body-relationship.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/body-relationship/body-relationship.pipe.spec.ts
@@ -5,9 +5,12 @@ import { BodyRelationshipPipe } from './body-relationship.pipe';
 import { ajvFactory } from '../../../factory';
 import { entities, mockDBTestModule, Users } from '../../../mock-utils';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
+import { DataSource } from 'typeorm';
+import { getDataSourceToken, getRepositoryToken } from '@nestjs/typeorm';
 
 describe('BodyRelationshipPipe', () => {
   let pipe: BodyRelationshipPipe<Users>;
@@ -25,6 +28,23 @@ describe('BodyRelationshipPipe', () => {
             connectionName: DEFAULT_CONNECTION_NAME,
           },
         },
+        {
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
+          useFactory(dataSource: DataSource) {
+            return dataSource.getRepository<Users>(Users);
+          },
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
+        },
       ],
     }).compile();
 
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/parse-relationship-name/parse-relationship-name.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/parse-relationship-name/parse-relationship-name.pipe.spec.ts
@@ -5,6 +5,7 @@ import { BadRequestException } from '@nestjs/common';
 
 import { entities, mockDBTestModule, Users } from '../../../mock-utils';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
@@ -34,11 +35,21 @@ describe('ParseRelationshipNamePipe', () => {
           },
         },
         {
-          provide: getRepositoryToken(Users, mockConnectionName),
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/query-filed-in-include/query-filed-in-include.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/query-filed-in-include/query-filed-in-include.pipe.spec.ts
@@ -10,6 +10,7 @@ import {
   QueryParams,
 } from '../../../types';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   DEFAULT_PAGE_SIZE,
   DEFAULT_QUERY_PAGE,
@@ -45,11 +46,21 @@ describe('QueryFiledInIncludePipe', () => {
       providers: [
         querySchemaMixinPip,
         {
-          provide: getRepositoryToken(Users, mockConnectionName),
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/query-schema/query-schema.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/query-schema/query-schema.pipe.spec.ts
@@ -10,6 +10,7 @@ import { querySchemaMixin } from '../';
 import { QuerySchemaTypes } from '../../../types';
 import { mockDBTestModule, entities, Users } from '../../../mock-utils';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   GLOBAL_MODULE_OPTIONS_TOKEN,
 } from '../../../constants';
@@ -33,11 +34,21 @@ describe('QuerySchema', () => {
           },
         },
         {
-          provide: getRepositoryToken(Users, mockConnectionName),
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/query-transform-schema/query-transform-schema.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/query-transform-schema/query-transform-schema.pipe.spec.ts
@@ -13,6 +13,7 @@ import {
 } from '../../../types';
 import { BadRequestException } from '@nestjs/common';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   DEFAULT_PAGE_SIZE,
   DEFAULT_QUERY_PAGE,
@@ -57,11 +58,21 @@ describe('QueryTransformSchema', () => {
           },
         },
         {
-          provide: getRepositoryToken(Users, mockConnectionName),
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
diff --git a/libs/json-api-nestjs/src/lib/mixin/pipes/query-transform/query-transform.pipe.spec.ts b/libs/json-api-nestjs/src/lib/mixin/pipes/query-transform/query-transform.pipe.spec.ts
@@ -13,6 +13,7 @@ import {
   QueryParams,
 } from '../../../types';
 import {
+  CURRENT_DATA_SOURCE_TOKEN,
   DEFAULT_CONNECTION_NAME,
   DEFAULT_PAGE_SIZE,
   DEFAULT_QUERY_PAGE,
@@ -54,11 +55,21 @@ describe('QueryTransformPipe', () => {
           },
         },
         {
-          provide: getRepositoryToken(Users, mockConnectionName),
+          provide: CURRENT_DATA_SOURCE_TOKEN,
+          useFactory: (dataSource: DataSource) => dataSource,
+          inject: [getDataSourceToken(DEFAULT_CONNECTION_NAME)],
+        },
+        {
+          provide: getRepositoryToken(Users, DEFAULT_CONNECTION_NAME),
           useFactory(dataSource: DataSource) {
             return dataSource.getRepository<Users>(Users);
           },
-          inject: [getDataSourceToken()],
+          inject: [
+            {
+              token: CURRENT_DATA_SOURCE_TOKEN,
+              optional: false,
+            },
+          ],
         },
       ],
     }).compile();
