exodus-framework 2.1.1009 → 2.1.1011
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -20,6 +20,7 @@ declare class DatabaseService extends Service {
|
|
20
20
|
}): Promise<boolean>;
|
21
21
|
private createConnectionByHost;
|
22
22
|
getTenantIds(): Promise<string[]>;
|
23
|
+
getAllTenants(): Promise<EnvDBHost[]>;
|
23
24
|
getTenantInformation(tenantId: string): Promise<EnvDBHost>;
|
24
25
|
private loadEntity;
|
25
26
|
getEntity<M extends ServiceModel<Model>>(model: StaticServiceModel<M>, tenantId: string): Promise<ModelStatic<M>>;
|
@@ -1 +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;
|
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;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
CHANGED
@@ -37,12 +37,12 @@ class DatabaseService extends _app.Service {
|
|
37
37
|
await this.execTenantMigrates(_utils.mainDb); //migrar atualizações do tenant para o serviço principal (este ainda é usado como serviço/tenant para supersu)
|
38
38
|
this.log('✅ Connected service database sucessfully', 'success');
|
39
39
|
if (process.env.DB_INIT_WITH_MIGRATE === 'true') {
|
40
|
-
|
41
|
-
|
42
|
-
for (const
|
43
|
-
const sequelize = await this.getConnection(
|
40
|
+
const tenants = await this.getAllTenants();
|
41
|
+
this.log(`⌚ Iniciando migração de ${tenants.length} tenants...`, 'warning');
|
42
|
+
for (const tenant of tenants) {
|
43
|
+
const sequelize = await this.getConnection(tenant.envUuid);
|
44
44
|
if (sequelize) {
|
45
|
-
this.log(`⌚
|
45
|
+
this.log(`⌚ Executando migração no tenant ${tenant.envToken} | ${tenant.envUuid}`, 'warning');
|
46
46
|
await this.execTenantMigrates(sequelize);
|
47
47
|
}
|
48
48
|
}
|
@@ -159,6 +159,10 @@ class DatabaseService extends _app.Service {
|
|
159
159
|
});
|
160
160
|
return tenants.map(t => t.envUuid);
|
161
161
|
}
|
162
|
+
async getAllTenants() {
|
163
|
+
const tenants = await _models.EnvDBHost.findAll();
|
164
|
+
return tenants;
|
165
|
+
}
|
162
166
|
async getTenantInformation(tenantId) {
|
163
167
|
const relation = await _models.EnvDBHost.findOne({
|
164
168
|
where: {
|
@@ -259,7 +263,7 @@ class DatabaseService extends _app.Service {
|
|
259
263
|
const migrations = _app.Core.settings.getDatabase().migrationsPath;
|
260
264
|
const umzung = new _umzug.Umzug({
|
261
265
|
migrations: {
|
262
|
-
glob: `${migrations}/*.js`
|
266
|
+
glob: `${migrations}/*.js` //! se incluir .ts vai duplicar na db pois ele salva com o formato tbm.
|
263
267
|
},
|
264
268
|
context: connection.getQueryInterface(),
|
265
269
|
storage: new _umzug.SequelizeStorage({
|