exodus-framework 2.0.691 → 2.0.693

package/lib/middlewares/access.js

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

package/lib/services/sequelize.d.ts

@@ -14,8 +14,8 @@ declare class SequelizeService extends Service implements IService {
     getMasterConnection(): Sequelize;
     createDB(connection_uuid: string, name: string): Promise<boolean>;
     deleteDB(connection_uuid: string, name: string): Promise<boolean>;
-    getDB(tenantId: string): Promise<Sequelize>;
-    initDB(tenantId: string): Promise<unknown>;
+    getDB(tenantId: string): Promise<false | Sequelize>;
+    initDB(tenantId: string): Promise<false | Sequelize>;
     registerModels(models: ModelStatic<any>[]): void;
     getModel<M extends typeof Model<any, any>>(model: typeof Model<any, any> & {
         initialize: (connection: Sequelize) => M;

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;AAahD,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;IA4BzB,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;IAYtB,MAAM,CAAC,QAAQ,EAAE,MAAM;IA+C7B,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;IAmBlB,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;AAahD,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;IA4BzB,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"}

package/lib/services/sequelize.js

@@ -157,27 +157,27 @@ class SequelizeService extends _service.default {
     } else if (con_uuid == _app.Core.settings.getDatabase().master.database) {
       return _database.masterDB;
     }
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${envToken}`;
-    const queryId = `${con_uuid}@${dbQueryName}`;
-    return this.connections.get(queryId);
+    const dbName = `${_app.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,
       envToken
     } = this.parseDataInfoByTenantId(tenantId);
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${envToken}`;
-    const queryId = `${con_uuid}@${dbQueryName}`;
+    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.connections.get(queryId)) {
-      return false;
+      return this.connections.get(queryId);
     }
     const connData = await _Connection.Connection.findByPk(con_uuid);
     if (!connData) {
-      this.log('Connection data not found: ' + con_uuid);
+      this.log('Error on init connection, data not found! uuid: ' + con_uuid, 'danger');
       return false;
     }
     const conn = new _sequelize.Sequelize({
-      database: dbQueryName,
+      database: dbName,
       dialect: connData.dialect,
       username: connData.username,
       password: connData.password,
@@ -193,13 +193,13 @@ class SequelizeService extends _service.default {
       conn.sync({
         force: false
       }).then(() => {
-        this.log(`✅ Connected ${dbQueryName} database sucessfully`, 'success');
+        this.log(`✅ Connected ${dbName} database sucessfully`, 'success');
         this.connections.set(queryId, conn);
-        resolve(true);
+        resolve(conn);
       }).catch(reason => {
-        this.log(`error trying to connect: ${dbQueryName}, UUID: ${con_uuid}`);
+        this.log(`error trying to connect: ${dbName}, UUID: ${con_uuid}`);
         reject(reason);
-        new _error.ApplicationException(`error trying to connect: ${dbQueryName}, UUID: ${con_uuid}`, reason);
+        new _error.ApplicationException(`error trying to connect: ${dbName}, UUID: ${con_uuid}`, reason);
       });
     });
   }
@@ -211,18 +211,19 @@ class SequelizeService extends _service.default {
       con_uuid,
       envToken
     } = this.parseDataInfoByTenantId(tenantId);
-    const query = `${envToken}@${con_uuid}`;
-    const cache = this.initializedModels.get(query);
+    const modelInitID = `${envToken}@${con_uuid}#${model.name}`;
+    const cache = this.initializedModels.get(modelInitID);
     if (cache) {
       return cache;
     }
     const connection = await this.getDB(tenantId);
-    if (connection) {
-      const m = model.initialize(connection);
-      this.initializedModels.set(query, m);
-      return m;
+    if (!connection) {
+      throw new _error.ApplicationException('Não foi possível obter o model espeficificado: Conexão não encontrada');
     }
-    return null;
+    const m = model.initialize(connection);
+    await m.sync();
+    this.initializedModels.set(modelInitID, m);
+    return m;
   }
   parseDataInfoByTenantId(tenant) {
     const e = tenant.split('@');

package/package.json

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