exodus-framework 2.0.727 → 2.0.730

package/lib/controllers/messaging/database.js

@@ -15,10 +15,11 @@ class DatabaseController extends _app.MessagingController {
         (0, _utils.logger)().error(data, 'Não foi possível criar o banco de dados');
         return this.log('Não foi possível criar um banco de dados', 'danger');
       }
-      ack();
     } catch (error) {
       (0, _utils.logger)().error(error);
       this.log('Houve um erro ao tentar criar um banco de dados, check o log...', 'danger');
+    } finally {
+      ack();
     }
   };
   update = async (data, ack) => {
@@ -29,10 +30,11 @@ class DatabaseController extends _app.MessagingController {
         return this.log('Não foi possível atualizar um banco de dados. Banco não encontrado', 'danger');
       }
       await host.update(data.updated);
-      ack();
     } catch (error) {
       (0, _utils.logger)().error(error);
       this.log('Houve um erro ao tentar atualizar um banco de dados, check o log...', 'danger');
+    } finally {
+      ack();
     }
   };
   delete = async (data, ack) => {
@@ -43,10 +45,11 @@ class DatabaseController extends _app.MessagingController {
         return this.log('Não foi possível excluír um banco de dados. Banco não encontrado', 'danger');
       }
       await host.destroy();
-      ack();
     } catch (error) {
       (0, _utils.logger)().error(error);
       this.log('Houve um erro ao tentar excluír um banco de dados, check o log...', 'danger');
+    } finally {
+      ack();
     }
   };
 }

package/lib/controllers/messaging/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAI1E,cAAM,qBAAsB,SAAQ,mBAAmB;IACrD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAuBjE;IAEF,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAmBjE;IASF,eAAe,EAAE,sBAAsB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAwBjF;CACH;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAI1E,cAAM,qBAAsB,SAAQ,mBAAmB;IACrD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAkBjE;IAEF,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAoBjE;IAEF,eAAe,EAAE,sBAAsB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAyBjF;CACH;AAED,eAAe,qBAAqB,CAAC"}

package/lib/controllers/messaging/environment.js

@@ -11,20 +11,19 @@ class EnvironmentController extends _app.MessagingController {
   created = async (data, ack) => {
     const db = data.database;
     const token = data.envToken;
-    _services.SequelizeService.singleton().createDB(db, token).then(() => {
-      _models.EnvDBHost.create({
+    try {
+      await _services.SequelizeService.singleton().createDB(db, token);
+      await _models.EnvDBHost.create({
         envUuid: data.uuid,
         hostUuid: data.database,
         envToken: data.envToken
-      }).then(() => {
-        this.log(`New database created sucessfuly: ${db}`);
-        ack();
-      }).catch(error => {
-        new _services.ApplicationException('Erro ao criar a relação env-db', error);
       });
-    }).catch(error => {
-      new _services.ApplicationException('Erro ao criar o novo banco de dados', error);
-    });
+      this.log(`New database created successfully: ${db}`);
+    } catch (error) {
+      throw new _services.ApplicationException('Erro ao criar o novo banco de dados', error);
+    } finally {
+      ack();
+    }
   };
   deleted = async (data, ack) => {
     // const uuid = data.uuid;
@@ -39,19 +38,12 @@ class EnvironmentController extends _app.MessagingController {
       });
       if (relation) await relation.destroy();
       this.log(`Database deleted successfully: ${token}`);
-      ack();
     } catch (error) {
       throw new _services.ApplicationException('Erro ao deletar a relação env-db ou não foi possível encontrá-la', error);
+    } finally {
+      ack();
     }
   };
-
-  /* updatedToken: TMessagingQueueHandler<EMessagingQueue.environmentUpdatedToken> = async (
-    data,
-    ack
-  ) => {
-    //TODO: need implement
-  }; */
-
   updatedDatabase = async (data, ack) => {
     try {
       const relation = await _models.EnvDBHost.findOne({
@@ -66,9 +58,10 @@ class EnvironmentController extends _app.MessagingController {
         hostUuid: data.database
       });
       this.log(`A relação para o ambiente ${data.envUuid} foi atualizada, a migração deverá ser realizada de forma manual`);
-      ack();
     } catch (error) {
       new _services.ApplicationException('Erro ao atualizar a relação EDB', error);
+    } finally {
+      ack();
     }
   };
 }

package/lib/models/Application.js

@@ -11,7 +11,7 @@ exports.Application = Application;
 Application.init({
   uuid: {
     type: _sequelize.DataTypes.UUID,
-    defaultValue: _sequelize.DataTypes.UUIDV4,
+    // defaultValue: DataTypes.UUIDV4, //pode ser arbritário
     primaryKey: true,
     allowNull: false,
     autoIncrement: false

package/lib/models/DatabaseHost.js

@@ -11,7 +11,7 @@ exports.DatabaseHost = DatabaseHost;
 DatabaseHost.init({
   uuid: {
     type: _sequelize.DataTypes.UUID,
-    defaultValue: _sequelize.DataTypes.UUIDV4,
+    // defaultValue: DataTypes.UUIDV4,//pode ser arbritário
     primaryKey: true,
     allowNull: false,
     autoIncrement: false
@@ -53,6 +53,10 @@ DatabaseHost.init({
   tableName: 'database_hosts',
   sequelize: _database.serviceDB,
   indexes: [{
-    fields: ['name']
+    fields: ['name'],
+    unique: true
+  }, {
+    fields: ['host'],
+    unique: true
   }]
 });

package/lib/models/EnvConnection.js

@@ -11,7 +11,7 @@ exports.EnvDBHost = EnvDBHost;
 EnvDBHost.init({
   uuid: {
     type: _sequelize.DataTypes.UUID,
-    defaultValue: _sequelize.DataTypes.UUIDV4,
+    // defaultValue: DataTypes.UUIDV4,//pode ser arbritário
     primaryKey: true,
     allowNull: false,
     autoIncrement: false

package/lib/services/sequelize.d.ts

@@ -1,4 +1,4 @@
-import { Model, ModelStatic, Sequelize } from 'sequelize';
+import { Dialect, Model, ModelStatic, Sequelize } from 'sequelize';
 import Service from '../app/service';
 import { IService } from '../contracts/service';
 import { EnvDBHost } from '../models';
@@ -19,7 +19,13 @@ declare class SequelizeService extends Service implements IService {
     getDBName(envToken: string): string;
     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>;
+    testConnection(data: {
+        host: string;
+        port: number;
+        username: string;
+        password: string;
+        dialect: Dialect;
+    }): Promise<boolean>;
     getRelation(tenantId: string): Promise<EnvDBHost>;
     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;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;IA2BlB,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,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,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;QACzB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;IA6BK,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;IA2BlB,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -190,12 +190,13 @@ class SequelizeService extends _service.default {
       });
     });
   }
-  async testConnection(host, port, username, password) {
+  async testConnection(data) {
     const sequelize = new _sequelize.Sequelize({
-      host,
-      port,
-      username,
-      password,
+      host: data.host,
+      port: data.port,
+      username: data.username,
+      password: data.password,
+      dialect: data.dialect,
       timezone: '-03:00',
       logging(sql, timing) {
         (0, _logger.default)().trace('DATABASE', sql, timing);

package/package.json

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