exodus-framework 2.1.1008 → 2.1.1010

package/lib/services/database.d.ts

@@ -20,6 +20,7 @@ declare class DatabaseService extends Service {
     }): Promise<boolean>;
     private createConnectionByHost;
     getTenantIds(): Promise<string[]>;
+    getAllTenants(): Promise<EnvDBHost[]>;
     getTenantInformation(tenantId: string): Promise<EnvDBHost>;
     private loadEntity;
     getEntity<M extends ServiceModel<Model>>(model: StaticServiceModel<M>, tenantId: string): Promise<ModelStatic<M>>;
@@ -27,9 +28,9 @@ 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>;
-    migrateServiceEntities(connection: Sequelize): Promise<void>;
-    migrateCoreEntities(connection: Sequelize): Promise<void>;
-    migrateMainEntities(): Promise<void>;
+    execTenantMigrates(connection: Sequelize): Promise<void>;
+    execCoreMigrates(connection: Sequelize): Promise<void>;
+    execServiceMigrate(): 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":"AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,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;IAkBP,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;IA+BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwBlC,sBAAsB,CAAC,UAAU,EAAE,SAAS;IAoB5C,mBAAmB,CAAC,UAAU,EAAE,SAAS;IAoBzC,mBAAmB;CAejC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,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;IAqCP,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,aAAa;IAKb,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;IA+BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwBlC,kBAAkB,CAAC,UAAU,EAAE,SAAS;IAoBxC,gBAAgB,CAAC,UAAU,EAAE,SAAS;IAoBtC,kBAAkB;CAehC;AAED,eAAe,eAAe,CAAC"}

package/lib/services/database.js

@@ -33,9 +33,20 @@ class DatabaseService extends _app.Service {
       await _utils.mainDb.sync({
         alter: true
       });
-      await this.migrateMainEntities(); // migrar atualizações do serviço
-      await this.migrateServiceEntities(_utils.mainDb); //migrar atualizações do tenant para o serviço principal (este ainda é usado como serviço/tenant para supersu)
+      await this.execServiceMigrate(); // migrar atualizações do serviço
+      await this.execTenantMigrates(_utils.mainDb); //migrar atualizações do tenant para o serviço principal (este ainda é usado como serviço/tenant para supersu)
       this.log('✅ Connected service database sucessfully', 'success');
+      if (process.env.DB_INIT_WITH_MIGRATE === 'true') {
+        const tenants = await this.getAllTenants();
+        this.log(`⌚ Iniciando migração de ${tenants.length} tenants...`, 'warning');
+        for (const tenant of tenants) {
+          const sequelize = await this.getConnection(tenant.envUuid);
+          if (sequelize) {
+            this.log(`⌚ Executando migração no tenant ${tenant.envToken} | ${tenant.envUuid}`, 'warning');
+            await this.execTenantMigrates(sequelize);
+          }
+        }
+      }
       return true;
     } catch (error) {
       _logger.default.logger().error(error, `Not connected Sequelize to database`);
@@ -68,8 +79,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.migrateCoreEntities(connection);
-    await this.migrateServiceEntities(connection);
+    await this.execCoreMigrates(connection);
+    await this.execTenantMigrates(connection);
     this.connections.set(tenantId, connection);
     this.log(`Conexão para o tenant ${tenantId} foi criada com sucesso`, 'success');
   }
@@ -148,6 +159,10 @@ class DatabaseService extends _app.Service {
     });
     return tenants.map(t => t.envUuid);
   }
+  async getAllTenants() {
+    const tenants = await _models.EnvDBHost.findAll();
+    return tenants;
+  }
   async getTenantInformation(tenantId) {
     const relation = await _models.EnvDBHost.findOne({
       where: {
@@ -188,8 +203,8 @@ class DatabaseService extends _app.Service {
           await connection.query(`CREATE DATABASE ${dbQueryName};`);
           this.log(`Database "${dbQueryName}" has been created.`);
           await connection.query(`USE ${dbQueryName};`);
-          await this.migrateCoreEntities(connection);
-          await this.migrateServiceEntities(connection);
+          await this.execCoreMigrates(connection);
+          await this.execTenantMigrates(connection);
           return true;
         } else {
           this.log(`Database "${dbQueryName}" already exists.`);
@@ -244,11 +259,11 @@ class DatabaseService extends _app.Service {
    * @param {Sequelize} connection
    * @memberof DatabaseService
    */
-  async migrateServiceEntities(connection) {
+  async execTenantMigrates(connection) {
     const migrations = _app.Core.settings.getDatabase().migrationsPath;
     const umzung = new _umzug.Umzug({
       migrations: {
-        glob: `${migrations}/*.js`
+        glob: `${migrations}/*.{js,ts}`
       },
       context: connection.getQueryInterface(),
       storage: new _umzug.SequelizeStorage({
@@ -265,7 +280,7 @@ class DatabaseService extends _app.Service {
    * @param {Sequelize} connection
    * @memberof DatabaseService
    */
-  async migrateCoreEntities(connection) {
+  async execCoreMigrates(connection) {
     const migrations = _path.default.resolve(__dirname, '../models/migrations');
     const umzung = new _umzug.Umzug({
       migrations: {
@@ -285,7 +300,7 @@ class DatabaseService extends _app.Service {
    *
    * @memberof DatabaseService
    */
-  async migrateMainEntities() {
+  async execServiceMigrate() {
     const path = `${_app.Core.settings.getDatabase().migrationsPath}/main`;
     (0, _fs.mkdirSync)(path, {
       recursive: true

package/package.json

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