Merge branch 'master' of https://github.com/nestjs/mongoose

Author: kamilmysliwiec

lib/common/mongoose.decorators.ts

@@ -1,7 +1,7 @@
 import { Inject } from '@nestjs/common';
 import { getConnectionToken, getModelToken } from './mongoose.utils';
 
-export const InjectModel = (model: string) => Inject(getModelToken(model));
+export const InjectModel = (model: string, connectionName?: string) => Inject(getModelToken(model, connectionName));
 
 export const InjectConnection = (name?: string) =>
   Inject(getConnectionToken(name));

lib/common/mongoose.utils.ts

@@ -3,8 +3,11 @@ import { Observable } from 'rxjs';
 import { delay, retryWhen, scan } from 'rxjs/operators';
 import { DEFAULT_DB_CONNECTION } from '../mongoose.constants';
 
-export function getModelToken(model: string) {
-  return `${model}Model`;
+export function getModelToken(model: string, connectionName?: string) {
+  if (connectionName === undefined) {
+    return `${model}Model`;
+  }
+  return `${getConnectionToken(connectionName)}/${model}Model`;
 }
 
 export function getConnectionToken(name?: string) {

lib/mongoose.providers.ts

@@ -11,13 +11,13 @@ export function createMongooseProviders(
     (providers, option) => [
       ...providers,
       ...(option.discriminators || []).map((d) => ({
-        provide: getModelToken(d.name),
+        provide: getModelToken(d.name, connectionName),
         useFactory: (model: Model<Document>) =>
           model.discriminator(d.name, d.schema),
-        inject: [getModelToken(option.name)],
+        inject: [getModelToken(option.name, connectionName)],
       })),
       {
-        provide: getModelToken(option.name),
+        provide: getModelToken(option.name, connectionName),
         useFactory: (connection: Connection) => {
           const model = connection.model(
             option.name,
@@ -41,7 +41,7 @@ export function createMongooseAsyncProviders(
     return [
       ...providers,
       {
-        provide: getModelToken(option.name),
+        provide: getModelToken(option.name, connectionName),
         useFactory: async (connection: Connection, ...args: unknown[]) => {
           const schema = await option.useFactory(...args);
           const model = connection.model(
@@ -54,10 +54,10 @@ export function createMongooseAsyncProviders(
         inject: [getConnectionToken(connectionName), ...(option.inject || [])],
       },
       ...(option.discriminators || []).map((d) => ({
-        provide: getModelToken(d.name),
+        provide: getModelToken(d.name, connectionName),
         useFactory: (model: Model<Document>) =>
           model.discriminator(d.name, d.schema),
-        inject: [getModelToken(option.name)],
+        inject: [getModelToken(option.name, connectionName)],
       })),
     ];
   }, [] as Provider[]);