exodus-framework 2.0.995 → 2.0.997

package/lib/models/migrations/00-logs.d.ts

@@ -0,0 +1,4 @@
+import { UmzugMigration } from '../../contracts';
+export declare function up({ context }: UmzugMigration): Promise<void>;
+export declare function down({ context }: UmzugMigration): Promise<void>;
+//# sourceMappingURL=00-logs.d.ts.map

package/lib/models/migrations/00-logs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"00-logs.d.ts","sourceRoot":"","sources":["../../../src/models/migrations/00-logs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBAyDnD;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBAErD"}

package/lib/models/migrations/00-logs.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.down = down;
+exports.up = up;
+var _sequelize = require("sequelize");
+var _utils = require("../../utils");
+const tablename = 'logs';
+async function up({
+  context
+}) {
+  await context.createTable(tablename, {
+    uuid: {
+      type: _sequelize.DataTypes.UUID,
+      defaultValue: _sequelize.DataTypes.UUIDV4,
+      primaryKey: true,
+      allowNull: false,
+      autoIncrement: false
+    },
+    happenedAt: {
+      type: _sequelize.DataTypes.DATE,
+      allowNull: false
+    },
+    category: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    origin: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    action: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    comments: {
+      type: _sequelize.DataTypes.STRING(255),
+      allowNull: true
+    },
+    data: {
+      type: _sequelize.DataTypes.JSON,
+      defaultValue: {},
+      allowNull: true
+    },
+    params: {
+      type: _sequelize.DataTypes.JSON,
+      defaultValue: {},
+      allowNull: true
+    },
+    createdAt: _sequelize.DataTypes.DATE,
+    updatedAt: _sequelize.DataTypes.DATE,
+    deletedAt: _sequelize.DataTypes.DATE
+  });
+  const indexes = [{
+    fields: ['category']
+  }, {
+    fields: ['origin']
+  }, {
+    fields: ['action']
+  }];
+  await (0, _utils.InsertIndexes)(context, tablename, indexes);
+}
+async function down({
+  context
+}) {
+  await context.dropTable(tablename);
+}

package/lib/models/migrations/00-reports.d.ts

@@ -0,0 +1,4 @@
+import { UmzugMigration } from '../../contracts';
+export declare function up({ context }: UmzugMigration): Promise<void>;
+export declare function down({ context }: UmzugMigration): Promise<void>;
+//# sourceMappingURL=00-reports.d.ts.map

package/lib/models/migrations/00-reports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"00-reports.d.ts","sourceRoot":"","sources":["../../../src/models/migrations/00-reports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBAyDnD;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBAErD"}

package/lib/models/migrations/00-reports.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.down = down;
+exports.up = up;
+var _sequelize = require("sequelize");
+var _utils = require("../../utils");
+const tablename = 'reports';
+async function up({
+  context
+}) {
+  await context.createTable(tablename, {
+    uuid: {
+      type: _sequelize.DataTypes.UUID,
+      defaultValue: _sequelize.DataTypes.UUIDV4,
+      primaryKey: true,
+      allowNull: false,
+      autoIncrement: false
+    },
+    category: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    origin: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    description: {
+      type: _sequelize.DataTypes.STRING(255),
+      allowNull: true
+    },
+    file: {
+      type: _sequelize.DataTypes.STRING(255),
+      allowNull: true
+    },
+    total: {
+      type: _sequelize.DataTypes.INTEGER(),
+      allowNull: true
+    },
+    params: {
+      type: _sequelize.DataTypes.JSON,
+      defaultValue: {},
+      allowNull: true
+    },
+    status: {
+      type: _sequelize.DataTypes.ENUM('PENDING', 'COMPLETED'),
+      allowNull: false,
+      defaultValue: 'PENDING'
+    },
+    createdAt: _sequelize.DataTypes.DATE,
+    updatedAt: _sequelize.DataTypes.DATE,
+    deletedAt: _sequelize.DataTypes.DATE
+  });
+  const indexes = [{
+    fields: ['category']
+  }, {
+    fields: ['description']
+  }, {
+    fields: ['file']
+  }];
+  await (0, _utils.InsertIndexes)(context, tablename, indexes);
+}
+async function down({
+  context
+}) {
+  await context.dropTable(tablename);
+}

package/lib/models/migrations/00-system.d.ts

@@ -0,0 +1,4 @@
+import { UmzugMigration } from '../../contracts';
+export declare function up({ context }: UmzugMigration): Promise<void>;
+export declare function down({ context }: UmzugMigration): Promise<void>;
+//# sourceMappingURL=00-system.d.ts.map

package/lib/models/migrations/00-system.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"00-system.d.ts","sourceRoot":"","sources":["../../../src/models/migrations/00-system.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,wBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBA4CnD;AAED,wBAAsB,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,iBAErD"}

package/lib/models/migrations/00-system.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.down = down;
+exports.up = up;
+var _sequelize = require("sequelize");
+var _utils = require("../../utils");
+const tablename = 'system';
+async function up({
+  context
+}) {
+  await context.createTable(tablename, {
+    uuid: {
+      type: _sequelize.DataTypes.UUID,
+      defaultValue: _sequelize.DataTypes.UUIDV4,
+      primaryKey: true,
+      allowNull: false,
+      autoIncrement: false
+    },
+    key: {
+      type: _sequelize.DataTypes.STRING(100),
+      allowNull: false
+    },
+    value: {
+      type: _sequelize.DataTypes.STRING(255),
+      allowNull: false
+    },
+    comments: {
+      type: _sequelize.DataTypes.STRING(255),
+      allowNull: true
+    },
+    data: {
+      type: _sequelize.DataTypes.JSON,
+      defaultValue: {},
+      allowNull: true
+    },
+    createdAt: _sequelize.DataTypes.DATE,
+    updatedAt: _sequelize.DataTypes.DATE,
+    deletedAt: _sequelize.DataTypes.DATE
+  });
+  const indexes = [{
+    fields: ['key']
+  }, {
+    fields: ['value']
+  }, {
+    fields: ['comments']
+  }];
+  await (0, _utils.InsertIndexes)(context, tablename, indexes);
+}
+async function down({
+  context
+}) {
+  await context.dropTable(tablename);
+}

package/lib/services/database.d.ts

@@ -27,7 +27,8 @@ declare class DatabaseService extends Service {
     createDB(hostId: string, name: string): Promise<boolean>;
     deleteDB(hostId: string, name: string): Promise<boolean>;
     hasDB(hostId: string, name: string): Promise<boolean>;
-    migrate(connection: Sequelize): Promise<void>;
+    migrateServiceEntities(connection: Sequelize): Promise<void>;
+    migrateCoreEntities(connection: Sequelize): Promise<void>;
 }
 export default DatabaseService;
 //# sourceMappingURL=database.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAKpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAgBP,WAAW;YAMV,cAAc;IA4Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,cAAc,CAAC,IAAI,EAAE;QAChC,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;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA2BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAkBlC,OAAO,CAAC,UAAU,EAAE,SAAS;CAY3C;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAMpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAgBP,WAAW;YAMV,cAAc;IA6Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,cAAc,CAAC,IAAI,EAAE;QAChC,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;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA2BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAkBlC,sBAAsB,CAAC,UAAU,EAAE,SAAS;IAa5C,mBAAmB,CAAC,UAAU,EAAE,SAAS;CAavD;AAED,eAAe,eAAe,CAAC"}

package/lib/services/database.js

@@ -10,6 +10,7 @@ var _models = require("../models");
 var _utils = require("../utils");
 var _security = _interopRequireDefault(require("./security"));
 var _umzug = require("umzug");
+var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class DatabaseService extends _app.Service {
   entities;
@@ -63,7 +64,8 @@ class DatabaseService extends _app.Service {
     }
     const password = data.payload;
     const connection = await this.createConnection(address, port, database, dbHost.username, password, dbHost.dialect);
-    await this.migrate(connection);
+    await this.migrateCoreEntities(connection);
+    await this.migrateServiceEntities(connection);
     this.connections.set(tenantId, connection);
     this.log(`Conexão para o tenant ${tenantId} foi criada com sucesso`, 'success');
   }
@@ -228,7 +230,7 @@ class DatabaseService extends _app.Service {
       return false;
     }
   }
-  async migrate(connection) {
+  async migrateServiceEntities(connection) {
     const umzung = new _umzug.Umzug({
       migrations: {
         glob: `${_app.Core.settings.getDatabase().migrationsPath}/*.js`
@@ -241,5 +243,19 @@ class DatabaseService extends _app.Service {
     });
     await umzung.up();
   }
+  async migrateCoreEntities(connection) {
+    const migrations = _path.default.resolve(__dirname, '../models/migrations');
+    const umzung = new _umzug.Umzug({
+      migrations: {
+        glob: `${migrations}/*.js`
+      },
+      context: connection.getQueryInterface(),
+      storage: new _umzug.SequelizeStorage({
+        sequelize: connection
+      }),
+      logger: console
+    });
+    await umzung.up();
+  }
 }
 var _default = exports.default = DatabaseService;

package/lib/utils/database.d.ts

@@ -1,5 +1,9 @@
 import { Sequelize, WhereOptions } from 'sequelize';
-import { IRequestFilterCondition, LogicalCondition } from '../contracts';
+import { IRequestFilterCondition, LogicalCondition, UmzugMigration } from '../contracts';
 export declare const mainDb: Sequelize;
 export declare function processFilters<D>(filters?: Partial<Record<keyof D, IRequestFilterCondition<D>> | LogicalCondition<D>>): WhereOptions<D>;
+export declare function InsertIndexes(context: UmzugMigration['context'], tableName: string, indexes: {
+    fields: string[];
+    unique?: boolean;
+}[]): Promise<void>;
 //# sourceMappingURL=database.d.ts.map

package/lib/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEzE,eAAO,MAAM,MAAM,WASjB,CAAC;AA8FH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGzF,eAAO,MAAM,MAAM,WASjB,CAAC;AAgFH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,iBAalD"}

package/lib/utils/database.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.InsertIndexes = InsertIndexes;
 exports.mainDb = void 0;
 exports.processFilters = processFilters;
 var _sequelize = require("sequelize");
 var _core = _interopRequireDefault(require("../app/core"));
+var _error = require("../app/error");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mainDb = exports.mainDb = new _sequelize.Sequelize({
   database: _core.default.settings.getDatabase().main.database,
@@ -20,21 +22,6 @@ const mainDb = exports.mainDb = new _sequelize.Sequelize({
   timezone: '-03:00',
   logging: _core.default.settings.getDatabase().service.log
 });
-
-//!nunca foi usado
-/* export const masterDB = new Sequelize({
-  database: Core.settings.getDatabase().master.database,
-  dialect: Core.settings.getDatabase().master.dialect,
-  username: Core.settings.getDatabase().master.username,
-  password: Core.settings.getDatabase().master.password,
-  pool: Core.settings.getDatabase().master.pool,
-  define: {
-    timestamps: true
-  },
-  timezone: '-03:00',
-  logging: Core.settings.getDatabase().service.log
-}); */
-
 function processCondition(cond) {
   if ('or' in cond) {
     return {
@@ -154,4 +141,17 @@ function processFilters(filters) {
     }
   });
   return where;
+}
+async function InsertIndexes(context, tableName, indexes) {
+  for (const index of indexes) {
+    try {
+      await context.addIndex(tableName, index.fields, {
+        name: `${tableName}_${index.fields.join('_')}`,
+        unique: index.unique
+      });
+    } catch (error) {
+      new _error.ErrorHandler('tentativa de adicionar index falhou', error);
+      console.log('tentativa de adicionar index falhou');
+    }
+  }
 }

package/package.json

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