Attach sbaseConfig to model.

nodeswork · May 30, 2020 · fda8776 · fda8776
1 parent e0094cf
commit fda8776
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mongoose/discriminator.ts b/src/mongoose/discriminator.ts
@@ -2,9 +2,9 @@ import * as _ from 'underscore';
 import { Document, Model as MModel } from 'mongoose';
 
 import { A7ModelType } from './a7-model';
-import { sbaseMongooseConfig } from './model-config';
-import { DocumentModel, Model, lazyFns, shareFns } from './model';
 import { ConvertModel } from './types';
+import { DocumentModel, Model, lazyFns, shareFns } from './model';
+import { SBaseMongooseConfig } from './model-config';
 
 export class Discriminator extends DocumentModel {
   public static $discriminator<
@@ -38,32 +38,42 @@ function discriminatorMultiTenancy<
   model: T,
   dm: M,
 ): ConvertModel<T & InstanceType<M> & Document, T & InstanceType<M>> & T & M {
-  if (!sbaseMongooseConfig.multiTenancy.enabled) {
-    return model.discriminator(
+  const sbaseConfig: SBaseMongooseConfig = (model as any).sbaseConfig;
+
+  if (!sbaseConfig.multiTenancy.enabled) {
+    const m = model.discriminator(
       dm.name,
       dm.$mongooseOptions().mongooseSchema,
     ) as any;
+
+    m.sbaseConfig = sbaseConfig;
+
+    return m;
   }
 
-  const tenants = ['default'].concat(sbaseMongooseConfig.multiTenancy.tenants);
+  const tenants = ['default'].concat(sbaseConfig.multiTenancy.tenants);
   const tenantMap: {
     [key: string]: MModel<Document> & T;
   } = {};
 
   const currentTenantMap = (model as any)._proxy.$tenantMap;
 
   for (const tenancy of tenants) {
-    tenantMap[tenancy] = currentTenantMap[tenancy].discriminator(
+    const m = currentTenantMap[tenancy].discriminator(
       dm.name,
-      dm.$mongooseOptions(tenancy).mongooseSchema,
+      dm.$mongooseOptions(sbaseConfig, tenancy).mongooseSchema,
     );
+
+    m.sbaseConfig = sbaseConfig;
+
+    tenantMap[tenancy] = m;
   }
 
   const proxy: any = new Proxy<MModel<Document> & T>({} as any, {
     get: (_obj: {}, prop: string) => {
       if (lazyFns.indexOf(prop) >= 0) {
-        const ret = function() {
-          const t = sbaseMongooseConfig.multiTenancy.tenancyFn(prop);
+        const ret = function () {
+          const t = sbaseConfig.multiTenancy.tenancyFn(prop);
           const m1: any = tenantMap[t];
           const actualFn = m1[prop];
 
@@ -74,15 +84,15 @@ function discriminatorMultiTenancy<
 
       if (shareFns.indexOf(prop) >= 0) {
         const ret = () => {
-          return _.map(tenants, t => {
+          return _.map(tenants, (t) => {
             const m2: any = tenantMap[t];
             return m2[prop].apply(m2, arguments);
           });
         };
         return ret;
       }
 
-      const tenancy = sbaseMongooseConfig.multiTenancy.tenancyFn(prop);
+      const tenancy = sbaseConfig.multiTenancy.tenancyFn(prop);
       const m: any = tenantMap[tenancy];
       m._proxy = proxy;
 
@@ -94,7 +104,7 @@ function discriminatorMultiTenancy<
       return _.isFunction(res) ? res.bind(m) : res;
     },
     set: (_obj: {}, prop: string, value: any) => {
-      const tenancy = sbaseMongooseConfig.multiTenancy.tenancyFn(prop);
+      const tenancy = sbaseConfig.multiTenancy.tenancyFn(prop);
       const m: any = tenantMap[tenancy];
       m[prop] = value;
       return true;

diff --git a/src/mongoose/model.ts b/src/mongoose/model.ts
@@ -273,15 +273,17 @@ export class Model {
       }
     }
 
-    const collection = _.chain([
-      tenancy === 'default'
-        ? sbaseConfig.multiTenancy.defaultCollectionNamespace
-        : tenancy,
-      mongooseOptions.config.collection,
-    ])
-      .filter((x) => !!x)
-      .join('.')
-      .value();
+    const collection =
+      mongooseOptions.config.collection &&
+      _.chain([
+        tenancy === 'default' && sbaseConfig != null
+          ? sbaseConfig.multiTenancy.defaultCollectionNamespace
+          : tenancy,
+        mongooseOptions.config.collection,
+      ])
+        .filter((x) => !!x)
+        .join('.')
+        .value();
 
     const mongooseSchema = new Schema(
       mongooseOptions.schema,
@@ -408,10 +410,14 @@ function registerMultiTenancy<T extends ModelType>(
     .sbaseConfig;
 
   if (!sbaseConfig.multiTenancy.enabled) {
-    return mongooseInstance.model(
+    const m = mongooseInstance.model(
       model.name,
       model.$mongooseOptions().mongooseSchema,
     ) as any;
+
+    m.sbaseConfig = sbaseConfig;
+
+    return m;
   }
 
   const tenants = ['default'].concat(sbaseConfig.multiTenancy.tenants);
@@ -439,6 +445,9 @@ function registerMultiTenancy<T extends ModelType>(
       model.name,
       model.$mongooseOptions(sbaseConfig, tenancy).mongooseSchema,
     ) as any;
+
+    m.sbaseConfig = sbaseConfig;
+
     tenantMap[tenancy] = m;
   }
 

diff --git a/test/benchmark/mongoose/mongoose.orig.ts b/test/benchmark/mongoose/mongoose.orig.ts
@@ -1,5 +1,5 @@
-import { Person, MongoosePerson } from './schemas/persons';
-import { Property, MongooseProperty } from './schemas/properties';
+import { MongoosePerson, Person } from './schemas/persons';
+import { MongooseProperty, Property } from './schemas/properties';
 
 describe('benchmark.mongoose', () => {
   beforeEach(async () => {
@@ -70,7 +70,7 @@ describe('benchmark.mongoose', () => {
           firstName: `foo name ${i}`,
         },
         null,
-        { populate: [{ path: 'home' }] },
+        { populate: [{ path: 'home' }] as any },
       );
     }
   });
@@ -82,7 +82,7 @@ describe('benchmark.mongoose', () => {
           firstName: `foo name ${i}`,
         },
         null,
-        { populate: [{ path: 'home' }] },
+        { populate: [{ path: 'home' }] as any },
       );
     }
   });
@@ -125,9 +125,7 @@ describe('benchmark.mongoose', () => {
 
   it(`[sbase]\t\truns ${INSERT_BATCH} synchronize persons find limit 10 using lean`, async () => {
     for (let i = 0; i < INSERT_BATCH; i++) {
-      await Person.find({}, null)
-        .skip(i)
-        .limit(10);
+      await Person.find({}, null).skip(i).limit(10);
     }
   });
 });
diff --git a/test/mongoose/data-level.ts b/test/mongoose/data-level.ts
@@ -1,6 +1,4 @@
 import * as _ from 'underscore';
-import * as mongoose from 'mongoose';
-import * as should from 'should';
 
 import {
   A7Model,
@@ -194,7 +192,7 @@ describe('NModel Data Level', () => {
 
   it('should be able to populate refs within query', async () => {
     const data = await DLRootRef.findOne({}, null, {
-      populate: [{ path: 'refs', options: { level: DataLevels.L1 } }],
+      populate: { path: 'refs', options: { level: DataLevels.L1 } },
     });
     data.refs[0]._id.toString().should.be.equal(m1._id.toString());
     _.pick(data.refs[0].toJSON(), 'f1').should.be.deepEqual(e1);