exodus-framework 2.0.842 → 2.0.845

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.
@@ -4,7 +4,7 @@ import { StaticServiceModel } from '../../contracts';
4
4
  export type TEntityConnParams<M extends Model> = Partial<InitOptions<M>>;
5
5
  export type TEntityParams<M extends Model> = ModelAttributes<M, Optional<Attributes<M>, BrandedKeysOf<Attributes<M>, typeof ForeignKeyBrand>>>;
6
6
  declare class ServiceModel<M extends Model> extends Model<InferAttributes<M>, InferCreationAttributes<M>> {
7
- static initialize<M extends ServiceModel<Model>>(this: StaticServiceModel<M>, connection: Sequelize): StaticServiceModel<M>;
7
+ static initialize<M extends ServiceModel<Model>>(this: StaticServiceModel<M>, connection: Sequelize): ModelStatic<M>;
8
8
  static associate(_models: ModelStatic<Model>[]): Promise<void>;
9
9
  static getEntityParams<M extends ServiceModel<Model>>(this: ModelStatic<M>): TEntityParams<any>;
10
10
  static getConnParams<M extends ServiceModel<Model>>(this: ModelStatic<M>): TEntityConnParams<any>;
@@ -1 +1 @@
1
- {"version":3,"file":"servicemodel.d.ts","sourceRoot":"","sources":["../../../src/app/classes/servicemodel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EACL,UAAU,EACV,eAAe,EACf,uBAAuB,EACvB,WAAW,EACX,KAAK,EACL,eAAe,EACf,WAAW,EACX,QAAQ,EACR,SAAS,EACV,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,KAAK,IAAI,eAAe,CAC1D,CAAC,EACD,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,eAAe,CAAC,CAAC,CAC9E,CAAC;AAEF,cAAM,YAAY,CAAC,CAAC,SAAS,KAAK,CAAE,SAAQ,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAC7C,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC3B,UAAU,EAAE,SAAS,GACpB,kBAAkB,CAAC,CAAC,CAAC;WAOX,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE;IAGpD,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC;IAG/F,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAChD,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,iBAAiB,CAAC,GAAG,CAAC;CAG1B;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"servicemodel.d.ts","sourceRoot":"","sources":["../../../src/app/classes/servicemodel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EACL,UAAU,EACV,eAAe,EACf,uBAAuB,EACvB,WAAW,EACX,KAAK,EACL,eAAe,EACf,WAAW,EACX,QAAQ,EACR,SAAS,EACV,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,KAAK,IAAI,eAAe,CAC1D,CAAC,EACD,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,eAAe,CAAC,CAAC,CAC9E,CAAC;AAEF,cAAM,YAAY,CAAC,CAAC,SAAS,KAAK,CAAE,SAAQ,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAC7C,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC3B,UAAU,EAAE,SAAS,GACpB,WAAW,CAAC,CAAC,CAAC;WAOJ,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE;IAGpD,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC;IAG/F,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAChD,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,iBAAiB,CAAC,GAAG,CAAC;CAG1B;AAED,eAAe,YAAY,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Dialect, Model, Sequelize } from 'sequelize';
1
+ import { Dialect, Model, ModelStatic, Sequelize } from 'sequelize';
2
2
  import { ServiceModel } from '../app';
3
3
  import Service from '../app/classes/service';
4
4
  import { EnvDBHost } from '../models';
@@ -8,7 +8,7 @@ declare class SequelizeService extends Service {
8
8
  masterDB: Sequelize;
9
9
  models: StaticServiceModel<any>[];
10
10
  connections: Map<string, Sequelize>;
11
- initializedModels: Map<string, StaticServiceModel<any>>;
11
+ initializedModels: Map<string, ModelStatic<any>>;
12
12
  relations: Map<string, EnvDBHost>;
13
13
  onServiceInit(): Promise<void>;
14
14
  connectDatabases(): Promise<unknown>;
@@ -29,7 +29,7 @@ declare class SequelizeService extends Service {
29
29
  dialect: Dialect;
30
30
  }): Promise<boolean>;
31
31
  getRelation(tenantId: string): Promise<EnvDBHost>;
32
- getModel<M extends ServiceModel<Model>>(model: StaticServiceModel<M>, tenantId: string): Promise<StaticServiceModel<M>>;
32
+ getModel<M extends ServiceModel<Model>>(model: StaticServiceModel<M>, tenantId: string): Promise<ModelStatic<M>>;
33
33
  static registerModels(models: StaticServiceModel<any>[]): void;
34
34
  }
35
35
  export default SequelizeService;
@@ -1 +1 @@
1
- {"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAsB,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAKpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUlD,cAAM,gBAAiB,SAAQ,OAAO;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAG5B,aAAa;IASb,gBAAgB;IA8BhB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAqBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAkBvB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IAkBpE,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;IA2CpD,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;IA4BK,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAC1C,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAQjC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE;CAGxD;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"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;AACnE,OAAO,EAAsB,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAKpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUlD,cAAM,gBAAiB,SAAQ,OAAO;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAG5B,aAAa;IASb,gBAAgB;IA8BhB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAqBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IA+BvB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IAkBpE,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;IA2CpD,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;IA4BK,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAC1C,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAW1B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE;CAGxD;AAED,eAAe,gBAAgB,CAAC"}
@@ -141,6 +141,18 @@ class SequelizeService extends _service.default {
141
141
  return false;
142
142
  }
143
143
  async initDB(tenantId) {
144
+ /* let connection: false | Sequelize = false;
145
+ if (tenantId == Core.settings.getDatabase().service.database) {
146
+ connection = serviceDB;
147
+ } else if (tenantId == Core.settings.getDatabase().master.database) {
148
+ connection = masterDB;
149
+ } else {
150
+ connection = await this.getDB(tenantId);
151
+ }
152
+ if (!connection) {
153
+ throw new Error('Conexão não encontrada');
154
+ } */
155
+
144
156
  const relation = await this.getRelation(tenantId);
145
157
  if (!relation) return false;
146
158
  const dbName = this.getDBName(relation.envToken);
@@ -163,8 +175,8 @@ class SequelizeService extends _service.default {
163
175
  entities.push(entity);
164
176
  this.initializedModels.set(modelKey, entity);
165
177
  }));
166
- await Promise.all(entities.map(async entity => {
167
- await entity.associate(entities);
178
+ await Promise.all(this.models.map(async model => {
179
+ model.associate(entities);
168
180
  }));
169
181
  }
170
182
  getDBName(envToken) {
@@ -266,6 +278,9 @@ class SequelizeService extends _service.default {
266
278
  async getModel(model, tenantId) {
267
279
  try {
268
280
  const modelKey = `${tenantId}#${model.name}`;
281
+ if (!this.initializedModels.has(modelKey)) {
282
+ await this.initDB(tenantId);
283
+ }
269
284
  return this.initializedModels.get(modelKey);
270
285
  } catch (error) {
271
286
  throw new _app.ErrorHandler('Erro ao obter o model', error);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exodus-framework",
3
- "version": "2.0.842",
3
+ "version": "2.0.845",
4
4
  "description": "Exodus Framework",
5
5
  "author": "jhownpaixao",
6
6
  "license": "ISC",