exodus-framework 2.0.724 → 2.0.726

package/lib/services/sequelize.d.ts

@@ -20,10 +20,10 @@ declare class SequelizeService extends Service implements IService {
     reconnect(db: Sequelize, attempts?: number): void;
     createConnection(hostUuid: string, database?: string): Promise<false | Sequelize>;
     testConnection(host: string, port: number, username: string, password: string): Promise<boolean>;
-    getRelation(tenantId: string): Promise<false | EnvDBHost>;
+    getRelation(tenantId: string): Promise<EnvDBHost>;
     getModel<M extends typeof Model<any, any>>(model: typeof Model<any, any> & {
         initialize: (connection: Sequelize) => M;
-    }, tenantId: string): Promise<false | M>;
+    }, tenantId: string): Promise<M>;
     registerModels(models: ModelStatic<any>[]): void;
 }
 export default SequelizeService;

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,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAcpD,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,SAAS,CAAC,CAAC;;IAM5B,IAAI;IAOJ,gBAAgB;IAgChB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAiB7B,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA6CpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA4B7E,WAAW,CAAC,QAAQ,EAAE,MAAM;IAmB5B,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;IAsBlB,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;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;AAChD,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAcpD,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,SAAS,CAAC,CAAC;;IAM5B,IAAI;IAQJ,gBAAgB;IAgChB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAiB7B,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA6CpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA4B7E,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,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;IAsBlB,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -38,6 +38,7 @@ class SequelizeService extends _service.default {
     this.masterDB = _database.masterDB;
     this.connections = new Map();
     this.initializedModels = new Map();
+    this.relations = new Map();
     await this.connectDatabases();
   }
   async connectDatabases() {
@@ -224,29 +225,30 @@ class SequelizeService extends _service.default {
           envUuid: tenantId
         }
       });
-      if (!relation) {
-        new _error.ApplicationException('Não foi possível encontrar a relação env-db: tenantId=' + tenantId);
-        return false;
+      if (relation) {
+        this.relations.set(tenantId, relation);
       }
-      this.relations.set(tenantId, relation);
     }
     return relation;
   }
 
   // #Entity
   async getModel(model, tenantId) {
-    const relation = await this.getRelation(tenantId);
-    if (!relation) return false;
-    const modelKey = `${relation.envToken}@${relation.hostUuid}#${model.name}`;
-    if (this.initializedModels.has(modelKey)) return this.initializedModels.get(modelKey);
-    const connection = await this.getDB(tenantId);
-    if (!connection) {
-      throw new _error.ApplicationException('Não foi possível obter o model espeficificado: Conexão não encontrada');
+    try {
+      const relation = await this.getRelation(tenantId);
+      const modelKey = `${relation.envToken}@${relation.hostUuid}#${model.name}`;
+      if (this.initializedModels.has(modelKey)) return this.initializedModels.get(modelKey);
+      const connection = await this.getDB(tenantId);
+      if (!connection) {
+        throw new _error.ApplicationException('Conexão não encontrada');
+      }
+      const m = model.initialize(connection);
+      await m.sync();
+      this.initializedModels.set(modelKey, m);
+      return m;
+    } catch (error) {
+      throw new _error.ApplicationException('Erro ao obter o model', error);
     }
-    const m = model.initialize(connection);
-    await m.sync();
-    this.initializedModels.set(modelKey, m);
-    return m;
   }
   registerModels(models) {
     this.models = models;

package/package.json

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