exodus-framework 2.0.700 → 2.0.701

package/lib/middlewares/access.js

@@ -55,7 +55,7 @@ class AccessMiddleware extends _controller.default {
       envUuid = account.envUuid;
     }
     req.tenant = {
-      id: envUuid || `root@${_app.Core.settings.getDatabase().service.database}`
+      id: envUuid || _app.Core.settings.getDatabase().service.database
     };
     next();
   };

package/lib/services/sequelize.d.ts

@@ -1,12 +1,14 @@
 import { Model, ModelStatic, Sequelize } from 'sequelize';
 import Service from '../app/service';
 import { IService } from '../contracts/service';
+import { EnvConnection } from '../models';
 declare class SequelizeService extends Service implements IService {
     serviceDB: Sequelize;
     masterDB: Sequelize;
     models: ModelStatic<any>[];
     connections: Map<string, Sequelize>;
     initializedModels: Map<string, typeof Model<any, any>>;
+    relations: Map<string, EnvConnection>;
     constructor();
     init(): Promise<void>;
     connectMainDatabase(): Promise<unknown>;

package/lib/services/sequelize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAchD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;IAMjD,IAAI;IAOJ,mBAAmB;IAgCzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,QAAQ,EAAE,MAAM;IAatB,MAAM,CAAC,QAAQ,EAAE,MAAM;IA4C7B,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;IAInC,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,QAAQ,EAAE,MAAM;IAwBlB,uBAAuB,CAAC,MAAM,EAAE,MAAM;;;;CAMvC;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,OAAO,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAC;AASxD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACvD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;;IAMhC,IAAI;IAOJ,mBAAmB;IAgCzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,QAAQ,EAAE,MAAM;IAwCtB,MAAM,CAAC,QAAQ,EAAE,MAAM;IA4C7B,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;IAInC,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,QAAQ,EAAE,MAAM;IAwBlB,uBAAuB,CAAC,MAAM,EAAE,MAAM;;;;CAMvC;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -26,6 +26,7 @@ class SequelizeService extends _service.default {
   models;
   connections;
   initializedModels;
+  relations;
 
   //# Initialization
   constructor() {
@@ -152,19 +153,41 @@ class SequelizeService extends _service.default {
     });
   }
   async getDB(tenantId) {
-    const {
-      con_uuid,
-      envToken
-    } = this.parseDataInfoByTenantId(tenantId);
-    if (con_uuid == _app.Core.settings.getDatabase().service.database) {
+    let relation;
+    if (tenantId == _app.Core.settings.getDatabase().service.database) {
       return _database.serviceDB;
-    } else if (con_uuid == _app.Core.settings.getDatabase().master.database) {
+    } else if (tenantId == _app.Core.settings.getDatabase().master.database) {
       return _database.masterDB;
     }
-    const dbName = `${_app.Core.settings.getDatabase().service.database}_${envToken}`; //nomeclatura padrão do banco de dados do serviço
-    const queryId = `${con_uuid}@${dbName}`;
+    if (this.relations.get(tenantId)) {
+      relation = this.relations.get(tenantId);
+    } else {
+      relation = await _models.EnvConnection.findOne({
+        where: {
+          envUuid: tenantId
+        }
+      });
+      if (!relation) {
+        new _error.ApplicationException('Não foi possível encontrar a relação env-db: tenantId=' + tenantId);
+        return false;
+      }
+      this.relations.set(tenantId, relation);
+    }
+    const dbName = `${_app.Core.settings.getDatabase().service.database}_${relation.envToken}`; //nomeclatura padrão do banco de dados do serviço
+    const queryId = `${relation.connUuid}@${dbName}`;
     return this.connections.get(queryId) || (await this.initDB(tenantId));
   }
+  /* async getDB2(tenantId: string) {
+    const { con_uuid, envToken } = this.parseDataInfoByTenantId(tenantId);
+      if (con_uuid == Core.settings.getDatabase().service.database) {
+      return serviceDB;
+    } else if (con_uuid == Core.settings.getDatabase().master.database) {
+      return masterDB;
+    }
+    const dbName = `${Core.settings.getDatabase().service.database}_${envToken}`; //nomeclatura padrão do banco de dados do serviço
+    const queryId = `${con_uuid}@${dbName}`;
+      return this.connections.get(queryId) || (await this.initDB(tenantId));
+  } */
   async initDB(tenantId) {
     const {
       con_uuid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.700",
+  "version": "2.0.701",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",