@puca/puca-core 11.8.22 → 12.0.1

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.
Files changed (167) hide show
  1. package/dist/core/services/auth.service.d.ts +1 -0
  2. package/dist/core/services/auth.service.js +7 -1
  3. package/dist/core/services/auth.service.js.map +1 -1
  4. package/dist/core/services/bootstrap-commands.js +61 -0
  5. package/dist/core/services/bootstrap-commands.js.map +1 -1
  6. package/dist/core/services/comunication/comunication-http.service.js +5 -0
  7. package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
  8. package/dist/core/services/comunication/comunication.service.d.ts +1 -3
  9. package/dist/core/services/comunication/comunication.service.js +2 -3
  10. package/dist/core/services/comunication/comunication.service.js.map +1 -1
  11. package/dist/core/services/crud-base-testable.service.d.ts +10 -4
  12. package/dist/core/services/crud-base-testable.service.js +19 -11
  13. package/dist/core/services/crud-base-testable.service.js.map +1 -1
  14. package/dist/core/services/crud-base.controller.d.ts +5 -4
  15. package/dist/core/services/crud-base.controller.js +44 -23
  16. package/dist/core/services/crud-base.controller.js.map +1 -1
  17. package/dist/core/services/crud-base.service.d.ts +1 -1
  18. package/dist/core/services/crud-base.service.js +1 -1
  19. package/dist/core/services/crud-base.service.js.map +1 -1
  20. package/dist/core/services/crud-front-base.service.d.ts +36 -11
  21. package/dist/core/services/crud-front-base.service.js +71 -52
  22. package/dist/core/services/crud-front-base.service.js.map +1 -1
  23. package/dist/core/services/{life-cycle.service.d.ts → domain-life-cycle.service.d.ts} +5 -19
  24. package/dist/core/services/{life-cycle.service.js → domain-life-cycle.service.js} +35 -82
  25. package/dist/core/services/domain-life-cycle.service.js.map +1 -0
  26. package/dist/core/services/eval.service.d.ts +2 -1
  27. package/dist/core/services/eval.service.js +10 -7
  28. package/dist/core/services/eval.service.js.map +1 -1
  29. package/dist/core/services/incremental-search.service.d.ts +4 -1
  30. package/dist/core/services/incremental-search.service.js +8 -2
  31. package/dist/core/services/incremental-search.service.js.map +1 -1
  32. package/dist/core/services/index.d.ts +33 -32
  33. package/dist/core/services/index.js +42 -37
  34. package/dist/core/services/index.js.map +1 -1
  35. package/dist/core/services/install.service.d.ts +7 -9
  36. package/dist/core/services/install.service.js +11 -13
  37. package/dist/core/services/install.service.js.map +1 -1
  38. package/dist/core/services/job/job.client.d.ts +1 -0
  39. package/dist/core/services/job/job.client.js +8 -2
  40. package/dist/core/services/job/job.client.js.map +1 -1
  41. package/dist/core/services/job/job.service.d.ts +1 -0
  42. package/dist/core/services/job/job.service.js +3 -0
  43. package/dist/core/services/job/job.service.js.map +1 -1
  44. package/dist/core/services/job-executor/job-executor.service.d.ts +10 -7
  45. package/dist/core/services/job-executor/job-executor.service.js +65 -30
  46. package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
  47. package/dist/core/services/link-builder.d.ts +3 -3
  48. package/dist/core/services/link-builder.js +5 -4
  49. package/dist/core/services/link-builder.js.map +1 -1
  50. package/dist/core/services/migration/migration.service.d.ts +7 -7
  51. package/dist/core/services/migration/migration.service.js +31 -89
  52. package/dist/core/services/migration/migration.service.js.map +1 -1
  53. package/dist/core/services/module-especification.service.d.ts +3 -3
  54. package/dist/core/services/module-especification.service.js +6 -6
  55. package/dist/core/services/module-especification.service.js.map +1 -1
  56. package/dist/core/services/monitor.js +1 -1
  57. package/dist/core/services/monitor.js.map +1 -1
  58. package/dist/core/services/mq/mq.service.d.ts +3 -1
  59. package/dist/core/services/mq/mq.service.js +12 -5
  60. package/dist/core/services/mq/mq.service.js.map +1 -1
  61. package/dist/core/services/plugin.service.d.ts +7 -1
  62. package/dist/core/services/plugin.service.js +11 -10
  63. package/dist/core/services/plugin.service.js.map +1 -1
  64. package/dist/core/services/report.service.d.ts +3 -1
  65. package/dist/core/services/report.service.js +21 -51
  66. package/dist/core/services/report.service.js.map +1 -1
  67. package/dist/core/services/server-life-cycle.service.d.ts +23 -0
  68. package/dist/core/services/server-life-cycle.service.js +81 -0
  69. package/dist/core/services/server-life-cycle.service.js.map +1 -0
  70. package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -5
  71. package/dist/core/services/storage/implementation/s3-client.service.js +4 -7
  72. package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
  73. package/dist/core/services/storage/storage.service.d.ts +3 -3
  74. package/dist/core/services/storage/storage.service.js +4 -5
  75. package/dist/core/services/storage/storage.service.js.map +1 -1
  76. package/dist/core/services/system-parameters-envs.service.d.ts +1 -0
  77. package/dist/core/services/system-parameters-envs.service.js +4 -1
  78. package/dist/core/services/system-parameters-envs.service.js.map +1 -1
  79. package/dist/core/services/table-permission.service.d.ts +1 -3
  80. package/dist/core/services/table-permission.service.js +1 -2
  81. package/dist/core/services/table-permission.service.js.map +1 -1
  82. package/dist/core/services/web-socket.service.d.ts +6 -9
  83. package/dist/core/services/web-socket.service.js +26 -20
  84. package/dist/core/services/web-socket.service.js.map +1 -1
  85. package/dist/essential/config.service.d.ts +5 -0
  86. package/dist/essential/config.service.js +27 -5
  87. package/dist/essential/config.service.js.map +1 -1
  88. package/dist/essential/envs-config.service.d.ts +1 -0
  89. package/dist/essential/envs-config.service.js +9 -6
  90. package/dist/essential/envs-config.service.js.map +1 -1
  91. package/dist/essential/index.d.ts +3 -4
  92. package/dist/essential/index.js +5 -6
  93. package/dist/essential/index.js.map +1 -1
  94. package/dist/essential/module-config.service.d.ts +3 -3
  95. package/dist/essential/module-config.service.js +4 -4
  96. package/dist/essential/module-config.service.js.map +1 -1
  97. package/dist/functions/index.d.ts +2 -1
  98. package/dist/functions/index.js +2 -1
  99. package/dist/functions/index.js.map +1 -1
  100. package/dist/models/secret.d.ts +1 -0
  101. package/dist/orm/cases/bo/ddl.service.js.map +1 -1
  102. package/dist/orm/cases/vanilla/sql-builder/select.service.d.ts +2 -1
  103. package/dist/orm/cases/vanilla/sql-builder/select.service.js +31 -10
  104. package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
  105. package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
  106. package/dist/orm/services/cache-repository/cache-repository-redis.js +7 -3
  107. package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
  108. package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
  109. package/dist/orm/services/cache-repository/cache-repository.js +3 -3
  110. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  111. package/dist/orm/services/cache.service.d.ts +5 -5
  112. package/dist/orm/services/cache.service.js +11 -15
  113. package/dist/orm/services/cache.service.js.map +1 -1
  114. package/dist/orm/services/index.d.ts +8 -7
  115. package/dist/orm/services/index.js +11 -8
  116. package/dist/orm/services/index.js.map +1 -1
  117. package/dist/orm/services/managers/database-manager.service.js +2 -2
  118. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  119. package/dist/orm/services/managers/puca-orm-client.service.d.ts +1 -0
  120. package/dist/orm/services/managers/puca-orm-client.service.js +3 -0
  121. package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
  122. package/dist/orm/services/repository-factory.d.ts +3 -3
  123. package/dist/orm/services/repository-factory.js +4 -4
  124. package/dist/orm/services/repository-factory.js.map +1 -1
  125. package/dist/orm/services/repository.d.ts +3 -3
  126. package/dist/orm/services/repository.js +5 -5
  127. package/dist/orm/services/repository.js.map +1 -1
  128. package/dist/orm/services/secundary-database/secundary-database.service.d.ts +23 -0
  129. package/dist/orm/services/secundary-database/secundary-database.service.js +66 -0
  130. package/dist/orm/services/secundary-database/secundary-database.service.js.map +1 -0
  131. package/dist/orm/services/sql-executor.js +3 -3
  132. package/dist/orm/services/sql-executor.js.map +1 -1
  133. package/dist/orm/services/transaction.d.ts +2 -5
  134. package/dist/orm/services/transaction.js +4 -6
  135. package/dist/orm/services/transaction.js.map +1 -1
  136. package/dist/plugins/file-system/file-system.service.d.ts +6 -3
  137. package/dist/plugins/file-system/file-system.service.js +12 -5
  138. package/dist/plugins/file-system/file-system.service.js.map +1 -1
  139. package/dist/plugins/file-system/shared-file-system.service.d.ts +25 -0
  140. package/dist/plugins/file-system/shared-file-system.service.js +121 -0
  141. package/dist/plugins/file-system/shared-file-system.service.js.map +1 -0
  142. package/dist/plugins/index.d.ts +4 -1
  143. package/dist/plugins/index.js +5 -2
  144. package/dist/plugins/index.js.map +1 -1
  145. package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +14 -0
  146. package/dist/plugins/multi-tenant/multi-tentant.adapter.js +58 -0
  147. package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -0
  148. package/dist/plugins/multi-tenant/puca-hub.service.d.ts +54 -0
  149. package/dist/plugins/multi-tenant/puca-hub.service.js +210 -0
  150. package/dist/plugins/multi-tenant/puca-hub.service.js.map +1 -0
  151. package/dist/plugins/nestjs/puca-auth.decorators.js +1 -1
  152. package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
  153. package/dist/plugins/nestjs/puca-auth.guard.js +4 -1
  154. package/dist/plugins/nestjs/puca-auth.guard.js.map +1 -1
  155. package/dist/tsconfig.tsbuildinfo +1 -1
  156. package/get-view-dependencies.sql +18 -3
  157. package/package.json +1 -2
  158. package/dist/core/services/life-cycle.service.js.map +0 -1
  159. package/dist/core/services/single-instance-ensure.service.d.ts +0 -8
  160. package/dist/core/services/single-instance-ensure.service.js +0 -23
  161. package/dist/core/services/single-instance-ensure.service.js.map +0 -1
  162. package/dist/essential/audit.service.d.ts +0 -22
  163. package/dist/essential/audit.service.js +0 -52
  164. package/dist/essential/audit.service.js.map +0 -1
  165. package/dist/orm/services/managers/redis-manager.service.d.ts +0 -6
  166. package/dist/orm/services/managers/redis-manager.service.js +0 -16
  167. package/dist/orm/services/managers/redis-manager.service.js.map +0 -1
@@ -20,4 +20,5 @@ export declare class JobService {
20
20
  nextDate(args: Args): Promise<{
21
21
  nextDate: Date;
22
22
  }>;
23
+ destroy(): Promise<void>;
23
24
  }
@@ -34,6 +34,9 @@ class JobService {
34
34
  const jobClient = await this.jobClientManager.get();
35
35
  return await jobClient.nextDate(args);
36
36
  }
37
+ async destroy() {
38
+ await this.jobClientManager.destroy();
39
+ }
37
40
  }
38
41
  exports.JobService = JobService;
39
42
  //# sourceMappingURL=job.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAa5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA4B,EAC5B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAA;QACjC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;QAC1E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EACxE,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AAxCD,gCAwCC"}
1
+ {"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAa5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA4B,EAC5B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAA;QACjC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;QAC1E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EACxE,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAA;IACvC,CAAC;CACF;AA5CD,gCA4CC"}
@@ -3,17 +3,20 @@ import { RedisConfig } from "../../../models/redis-config";
3
3
  import { ConfigService } from '../../../essential/config.service';
4
4
  import { EnvConfigService } from "../../../essential/envs-config.service";
5
5
  import { UuidService } from '../../../plugins/uuid/uuid.service';
6
- import { AuditService } from '../../../essential/audit.service';
7
6
  export declare class JobExecutor<T> {
7
+ private readonly domain;
8
8
  private readonly envConfigService;
9
9
  private readonly uuidService;
10
- private readonly auditService;
11
10
  private readonly logger;
12
- private static instances;
11
+ private static jobInstances;
13
12
  private listenerIsActive;
14
13
  private static readonly DEFAULT_OPT;
15
14
  private readonly bull;
16
- constructor(redisConfig: RedisConfig, envConfigService: EnvConfigService, uuidService: UuidService, queueName: string, auditService: AuditService);
15
+ private handleActive;
16
+ private handleError;
17
+ private handleStalled;
18
+ private handleFailed;
19
+ constructor(domain: string, redisConfig: RedisConfig, envConfigService: EnvConfigService, uuidService: UuidService, queueName: string);
17
20
  process(concurrency: number, callback: Bull.ProcessPromiseFunction<T>): any;
18
21
  process(callback: Bull.ProcessPromiseFunction<T>): any;
19
22
  add(data: T, opts?: {
@@ -33,15 +36,15 @@ export declare class JobExecutor<T> {
33
36
  };
34
37
  }): Promise<void>;
35
38
  shutdown(immediate: boolean): Promise<void>;
36
- static shutdown(immediate: boolean): Promise<void>;
39
+ static shutdown(domain: any, immediate: boolean): Promise<void>;
37
40
  }
38
41
  export declare class JobExecutorFactory {
42
+ private readonly domain;
39
43
  private readonly configService;
40
44
  private readonly envConfigService;
41
45
  private readonly uuidService;
42
- private readonly auditService;
43
46
  private redisConfig;
44
- constructor(configService: ConfigService, envConfigService: EnvConfigService, uuidService: UuidService, auditService: AuditService);
47
+ constructor(domain: string, configService: ConfigService, envConfigService: EnvConfigService, uuidService: UuidService);
45
48
  prepare(): Promise<void>;
46
49
  get<T>(queueName: string): JobExecutor<T>;
47
50
  }
@@ -4,26 +4,62 @@ exports.JobExecutorFactory = exports.JobExecutor = void 0;
4
4
  const _ = require("lodash");
5
5
  const Bull = require("bull");
6
6
  const logger_1 = require("../logger");
7
+ class JobInstances {
8
+ constructor() {
9
+ this.instances = new Map();
10
+ }
11
+ splice(domain, i, arg1) {
12
+ if (!this.instances.has(domain)) {
13
+ return;
14
+ }
15
+ this.instances.get(domain).splice(i, arg1);
16
+ }
17
+ push(domain, je) {
18
+ if (!this.instances.has(domain)) {
19
+ this.instances.set(domain, []);
20
+ }
21
+ this.instances.get(domain).push(je);
22
+ }
23
+ indexOf(domain, je) {
24
+ if (!this.instances.has(domain)) {
25
+ return -1;
26
+ }
27
+ return this.instances.get(domain).indexOf(je);
28
+ }
29
+ getLength(domain) {
30
+ if (!this.instances.has(domain)) {
31
+ return 0;
32
+ }
33
+ return this.instances.get(domain).length;
34
+ }
35
+ getInstanceByIndex(domain, i) {
36
+ if (!this.instances.has(domain)) {
37
+ return null;
38
+ }
39
+ return this.instances.get(domain)[i];
40
+ }
41
+ }
7
42
  class JobExecutor {
8
- constructor(redisConfig, envConfigService, uuidService, queueName, auditService) {
43
+ constructor(domain, redisConfig, envConfigService, uuidService, queueName) {
44
+ this.domain = domain;
9
45
  this.envConfigService = envConfigService;
10
46
  this.uuidService = uuidService;
11
- this.auditService = auditService;
12
47
  this.logger = new logger_1.Logger('JobExecutor');
13
48
  this.listenerIsActive = false;
14
49
  this.bull = new Bull(queueName, {
15
50
  redis: redisConfig,
16
- prefix: 'bull',
51
+ prefix: `bull-${domain}`,
17
52
  defaultJobOptions: JobExecutor.DEFAULT_OPT,
18
53
  });
19
- this.bull.on('active', job => {
54
+ this.handleActive = job => {
20
55
  this.logger.debug('active', queueName, job.data, job.opts);
21
- });
22
- this.bull.on('error', (error) => {
56
+ };
57
+ this.bull.on('active', this.handleActive);
58
+ this.handleError = error => {
23
59
  this.logger.error('error', queueName, error);
24
- this.auditService.captureException(error);
25
- });
26
- this.bull.on('stalled', (job) => {
60
+ };
61
+ this.bull.on('error', this.handleError);
62
+ this.handleStalled = job => {
27
63
  const data = {
28
64
  error: 'stalled',
29
65
  queueName,
@@ -33,9 +69,9 @@ class JobExecutor {
33
69
  stacktrace: job.stacktrace[0],
34
70
  };
35
71
  this.logger.error(data);
36
- this.auditService.captureException(new Error(`Job stalled: ${JSON.stringify(data)}`));
37
- });
38
- this.bull.on('failed', (job) => {
72
+ };
73
+ this.bull.on('stalled', this.handleStalled);
74
+ this.handleFailed = job => {
39
75
  const data = {
40
76
  error: 'failed',
41
77
  queueName,
@@ -45,27 +81,22 @@ class JobExecutor {
45
81
  stacktrace: job.stacktrace[0],
46
82
  };
47
83
  this.logger.error(data);
48
- this.auditService.captureException(new Error(`Job failed: ${JSON.stringify(data)}`));
49
- });
84
+ };
85
+ this.bull.on('failed', this.handleFailed);
50
86
  }
51
87
  async process(arg1, arg2 = null) {
52
88
  const concurrency = typeof arg1 === 'number' ? arg1 : 0;
53
89
  const callback = arg2 || arg1;
54
90
  const callbackHook = async (job) => {
55
- const transaction = this.auditService.startTransaction(`JobExecutor: ${job.queue.name}`);
56
91
  try {
57
92
  return await callback(job);
58
93
  }
59
94
  catch (error) {
60
- this.auditService.captureException(error);
61
95
  throw error;
62
96
  }
63
- finally {
64
- transaction.finish();
65
- }
66
97
  };
67
98
  if (!this.listenerIsActive) {
68
- JobExecutor.instances.push(this);
99
+ JobExecutor.jobInstances.push(this.domain, this);
69
100
  }
70
101
  this.listenerIsActive = true;
71
102
  if (concurrency) {
@@ -76,7 +107,7 @@ class JobExecutor {
76
107
  }
77
108
  }
78
109
  async add(data, opts) {
79
- const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
110
+ const environment = process.env.ENVIRONMENT.toUpperCase();
80
111
  if (_.get(opts, 'repeat')) {
81
112
  if (!_.get(opts, 'key')) {
82
113
  throw new Error('repeat jobs must have a key');
@@ -86,21 +117,25 @@ class JobExecutor {
86
117
  await this.bull.add(data, bullAddOptions);
87
118
  }
88
119
  async shutdown(immediate) {
120
+ this.bull.off('active', this.handleActive);
121
+ this.bull.off('error', this.handleError);
122
+ this.bull.off('stalled', this.handleStalled);
123
+ this.bull.off('failed', this.handleFailed);
89
124
  await this.bull.close(immediate);
90
- const i = JobExecutor.instances.indexOf(this);
125
+ const i = JobExecutor.jobInstances.indexOf(this.domain, this);
91
126
  if (i !== -1) {
92
- JobExecutor.instances.splice(i, 1);
127
+ JobExecutor.jobInstances.splice(this.domain, i, 1);
93
128
  }
94
129
  }
95
- static async shutdown(immediate) {
96
- while (JobExecutor.instances.length) {
97
- const je = JobExecutor.instances[0];
130
+ static async shutdown(domain, immediate) {
131
+ while (JobExecutor.jobInstances.getLength(domain)) {
132
+ const je = JobExecutor.jobInstances.getInstanceByIndex(domain, 0);
98
133
  await je.shutdown(immediate);
99
134
  }
100
135
  }
101
136
  }
102
137
  exports.JobExecutor = JobExecutor;
103
- JobExecutor.instances = [];
138
+ JobExecutor.jobInstances = new JobInstances();
104
139
  JobExecutor.DEFAULT_OPT = {
105
140
  removeOnComplete: true,
106
141
  removeOnFail: false,
@@ -112,11 +147,11 @@ JobExecutor.DEFAULT_OPT = {
112
147
  attempts: 15,
113
148
  };
114
149
  class JobExecutorFactory {
115
- constructor(configService, envConfigService, uuidService, auditService) {
150
+ constructor(domain, configService, envConfigService, uuidService) {
151
+ this.domain = domain;
116
152
  this.configService = configService;
117
153
  this.envConfigService = envConfigService;
118
154
  this.uuidService = uuidService;
119
- this.auditService = auditService;
120
155
  }
121
156
  async prepare() {
122
157
  this.redisConfig = (await this.configService.getSecret()).redisConfig;
@@ -125,7 +160,7 @@ class JobExecutorFactory {
125
160
  if (!this.redisConfig) {
126
161
  throw new Error('not ready');
127
162
  }
128
- const je = new JobExecutor(this.redisConfig, this.envConfigService, this.uuidService, queueName, this.auditService);
163
+ const je = new JobExecutor(this.domain, this.redisConfig, this.envConfigService, this.uuidService, queueName);
129
164
  return je;
130
165
  }
131
166
  }
@@ -1 +1 @@
1
- {"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
- import { EnvConfigService } from "../../essential/envs-config.service";
1
+ import { ConfigService } from "../../essential/config.service";
2
2
  export declare class LinkBuilder {
3
- private readonly envConfigService;
4
- constructor(envConfigService: EnvConfigService);
3
+ private readonly configService;
4
+ constructor(configService: ConfigService);
5
5
  build(path?: string): Promise<string>;
6
6
  }
@@ -2,12 +2,13 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LinkBuilder = void 0;
4
4
  class LinkBuilder {
5
- constructor(envConfigService) {
6
- this.envConfigService = envConfigService;
5
+ constructor(configService) {
6
+ this.configService = configService;
7
7
  }
8
8
  async build(path) {
9
- const protocol = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT') === 'DEVELOPMENT' ? 'http' : 'https';
10
- const domain = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
9
+ const protocol = process.env.ENVIRONMENT.toUpperCase()
10
+ === 'DEVELOPMENT' ? 'http' : 'https';
11
+ const { namespace: domain } = await this.configService.getSecret();
11
12
  return `${protocol}://${[
12
13
  domain,
13
14
  path
@@ -1 +1 @@
1
- {"version":3,"file":"link-builder.js","sourceRoot":"","sources":["../../../src/core/services/link-builder.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IACtB,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAC/D,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAa;QACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CACvD,aAAa,EACb,aAAa,CACd,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;QACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CACrD,aAAa,EACb,gBAAgB,CACjB,CAAA;QAED,OAAO,GAAG,QAAQ,MAAM;YACtB,MAAM;YACN,IAAI;SACL;aACE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACf;YACD,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;aACnB;YACD,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,IAAI,CAAC,GAAG,CACT,EAAE,CAAA;IACN,CAAC;CACF;AAhCD,kCAgCC"}
1
+ {"version":3,"file":"link-builder.js","sourceRoot":"","sources":["../../../src/core/services/link-builder.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IACtB,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IACzD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAa;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE;gBACjD,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;QACrC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QAElE,OAAO,GAAG,QAAQ,MAAM;YACtB,MAAM;YACN,IAAI;SACL;aACE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACf;YACD,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;aACnB;YACD,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,IAAI,CAAC,GAAG,CACT,EAAE,CAAA;IACN,CAAC;CACF;AA3BD,kCA2BC"}
@@ -2,10 +2,10 @@ import { User } from '../../../models/user';
2
2
  import { AlterTableAddColumn, CreateTable } from '../../../orm/cases/bo/interfaces';
3
3
  import { RepositoryFactory } from '../../../orm/services/repository-factory';
4
4
  import { ModuleConfigService } from '../../../essential/module-config.service';
5
- import { RedisManagerService } from '../../../orm/services/managers/redis-manager.service';
6
5
  import { Transaction, TransactionFactory } from '../../../orm/services/transaction';
7
6
  import { EnvConfigService } from '../../../essential/envs-config.service';
8
- import { FileSystemService } from '../../../plugins/file-system/file-system.service';
7
+ import { SharedFileSystemService } from '../../../plugins/file-system/shared-file-system.service';
8
+ import { SecundaryDatabase } from '../../../orm/services/secundary-database/secundary-database.service';
9
9
  export declare type TypeDDlCommand = {
10
10
  method: string;
11
11
  id: string;
@@ -15,17 +15,19 @@ export declare class MigrationService {
15
15
  private readonly transactionFactory;
16
16
  private readonly repositoryFactory;
17
17
  private readonly moduleConfigService;
18
- private readonly redisManagerService;
18
+ private readonly secundaryDataBase;
19
19
  private readonly envConfigService;
20
- private readonly fileSystemService;
20
+ private readonly sharedFileSystemService;
21
21
  private readonly logger;
22
- constructor(transactionFactory: TransactionFactory, repositoryFactory: RepositoryFactory, moduleConfigService: ModuleConfigService, redisManagerService: RedisManagerService, envConfigService: EnvConfigService, fileSystemService: FileSystemService);
22
+ private interval;
23
+ constructor(transactionFactory: TransactionFactory, repositoryFactory: RepositoryFactory, moduleConfigService: ModuleConfigService, secundaryDataBase: SecundaryDatabase, envConfigService: EnvConfigService, sharedFileSystemService: SharedFileSystemService);
23
24
  install({ ddlCommands, user, moduleName, notThrowErrors }: {
24
25
  ddlCommands: TypeDDlCommand[];
25
26
  user: User;
26
27
  moduleName?: string;
27
28
  notThrowErrors?: boolean;
28
29
  }): Promise<void>;
30
+ destroy(): Promise<void>;
29
31
  executeSql(command: {
30
32
  sql: string;
31
33
  }, user: User): Promise<void>;
@@ -53,8 +55,6 @@ export declare class MigrationService {
53
55
  }): Promise<void>;
54
56
  private _dropTable;
55
57
  private _createIndex;
56
- private shallowComputeDeps;
57
- private computeDeps;
58
58
  ensureDatabaseDependenciesIntegrity(c: {
59
59
  ddlMigration: () => Promise<void>;
60
60
  object_name: string;
@@ -4,15 +4,14 @@ exports.MigrationService = void 0;
4
4
  const cases_1 = require("../../../orm/cases");
5
5
  const interfaces_1 = require("../../../orm/cases/bo/interfaces");
6
6
  const logger_1 = require("../logger");
7
- const _ = require("lodash");
8
7
  class MigrationService {
9
- constructor(transactionFactory, repositoryFactory, moduleConfigService, redisManagerService, envConfigService, fileSystemService) {
8
+ constructor(transactionFactory, repositoryFactory, moduleConfigService, secundaryDataBase, envConfigService, sharedFileSystemService) {
10
9
  this.transactionFactory = transactionFactory;
11
10
  this.repositoryFactory = repositoryFactory;
12
11
  this.moduleConfigService = moduleConfigService;
13
- this.redisManagerService = redisManagerService;
12
+ this.secundaryDataBase = secundaryDataBase;
14
13
  this.envConfigService = envConfigService;
15
- this.fileSystemService = fileSystemService;
14
+ this.sharedFileSystemService = sharedFileSystemService;
16
15
  this.logger = new logger_1.Logger('MigrationService');
17
16
  }
18
17
  async install({ ddlCommands, user, moduleName, notThrowErrors }) {
@@ -97,7 +96,7 @@ class MigrationService {
97
96
  }
98
97
  }
99
98
  if (failMigrationList.length) {
100
- const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
99
+ const environment = process.env.ENVIRONMENT.toUpperCase();
101
100
  const printErrors = () => {
102
101
  failMigrationList.forEach(m => {
103
102
  this.logger.error(m.id, m.error);
@@ -105,10 +104,13 @@ class MigrationService {
105
104
  };
106
105
  printErrors();
107
106
  if (environment === 'PRODUCTION') {
108
- setInterval(printErrors, 60000);
107
+ this.interval = setInterval(printErrors, 60000);
109
108
  }
110
109
  }
111
110
  }
111
+ async destroy() {
112
+ clearInterval(this.interval);
113
+ }
112
114
  async executeSql(command, user) {
113
115
  const transaction = this.transactionFactory.get({
114
116
  name: `execute-sql-${command}`,
@@ -161,10 +163,9 @@ class MigrationService {
161
163
  user: c.user,
162
164
  });
163
165
  c.transaction.afterCommit(async () => {
164
- const redisCli = this.redisManagerService.get();
165
- redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
166
+ this.secundaryDataBase.publish('table_dictionary.change', tableDictionary.puca_pid);
166
167
  fieldDictionary.data.forEach(fd => {
167
- redisCli.publish('field_dictionary.change', fd.puca_pid);
168
+ this.secundaryDataBase.publish('field_dictionary.change', fd.puca_pid);
168
169
  });
169
170
  });
170
171
  }
@@ -224,7 +225,7 @@ class MigrationService {
224
225
  },
225
226
  });
226
227
  c.transaction.afterCommit(async () => {
227
- this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
228
+ this.secundaryDataBase.publish('field_dictionary.change', fieldDictionary.puca_pid);
228
229
  });
229
230
  }
230
231
  async alterTableDropColumn(args) {
@@ -279,7 +280,7 @@ class MigrationService {
279
280
  object_name: d.tableName,
280
281
  transaction: d.transaction
281
282
  });
282
- this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
283
+ this.secundaryDataBase.publish('field_dictionary.change', fieldDictionary.puca_pid);
283
284
  }
284
285
  async alterTableSetCrudApi(args) {
285
286
  const tablePid = (await this.repositoryFactory.getInstance({
@@ -341,11 +342,10 @@ class MigrationService {
341
342
  object_name: d.tableName,
342
343
  transaction: d.transaction
343
344
  });
344
- const redisCli = this.redisManagerService.get();
345
345
  d.transaction.afterCommit(async () => {
346
- redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
346
+ this.secundaryDataBase.publish('table_dictionary.change', tableDictionary.puca_pid);
347
347
  fieldDictionary.data.forEach(fd => {
348
- redisCli.publish('field_dictionary.change', fd.puca_pid);
348
+ this.secundaryDataBase.publish('field_dictionary.change', fd.puca_pid);
349
349
  });
350
350
  });
351
351
  }
@@ -353,97 +353,39 @@ class MigrationService {
353
353
  const sqlCommandList = await cases_1.ddlService.createIndex(c, c.user);
354
354
  await c.transaction.serialExec(sqlCommandList);
355
355
  }
356
- async shallowComputeDeps(objectName, transaction) {
357
- const sqlCommandToGetDependencies = await this.fileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-view-dependencies.sql`);
358
- const deps = _.chain(await transaction.exec({
359
- sql: sqlCommandToGetDependencies,
360
- args: [objectName],
361
- commandName: 'get-view-dependencies'
362
- })).map(d => d.dep)
363
- .value();
364
- return deps;
365
- }
366
- async computeDeps(objectName, transaction, visited = new Set(), level = 0) {
367
- if (level > 100) {
368
- this.logger.error(`Max level of recursion reached for object: ${objectName}`, visited, level);
369
- throw new Error(`Max level of recursion reached for object: ${objectName}`);
370
- }
371
- if (visited.has(objectName)) {
372
- this.logger.error(`Circular dependency detected: ${objectName}`, visited, level);
373
- throw new Error(`Circular dependency detected: ${objectName}`);
374
- }
375
- const newVisited = new Set(visited);
376
- newVisited.add(objectName);
377
- const depsTree = {};
378
- const deps = await this.shallowComputeDeps(objectName, transaction);
379
- for (const dep of deps) {
380
- depsTree[dep] = await this.computeDeps(dep, transaction, newVisited, level + 1);
381
- }
382
- return depsTree;
383
- }
384
356
  async ensureDatabaseDependenciesIntegrity(c) {
385
- const dependenciesTree = await this.computeDeps(c.object_name, c.transaction);
386
- const convertToFlatArray = (tree, childrenFirst) => {
387
- const flatArray = [];
388
- for (const dep in tree) {
389
- if (childrenFirst) {
390
- flatArray.push(...convertToFlatArray(tree[dep], childrenFirst));
391
- }
392
- flatArray.push(dep);
393
- if (!childrenFirst) {
394
- flatArray.push(...convertToFlatArray(tree[dep], childrenFirst));
395
- }
396
- }
397
- return _.uniq(flatArray);
398
- };
399
- if (!Object.keys(dependenciesTree).length) {
357
+ const sqlCommandToGetDependencies = await this.sharedFileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-view-dependencies.sql`);
358
+ const sqlCommandToRecorverScriptsDependencies = await this.sharedFileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-scripts-dependencies.sql`);
359
+ const dependencies = await c.transaction.exec({ sql: sqlCommandToGetDependencies, args: [c.object_name], commandName: 'get-view-dependencies' });
360
+ if (!dependencies.length) {
400
361
  await c.ddlMigration();
401
362
  return;
402
363
  }
403
- const dependenciesNames = convertToFlatArray(dependenciesTree, true);
404
- const sqlCommandToRecoverScriptsDependencies = await this.fileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-scripts-dependencies.sql`);
405
- const scriptsDependencies = await c.transaction.exec({
406
- sql: sqlCommandToRecoverScriptsDependencies,
407
- args: [dependenciesNames],
408
- commandName: 'get-scripts-dependencies'
409
- });
410
- const scriptsDropDependencies = dependenciesNames
411
- .map(d => {
412
- const script = cases_1.sqlBuilderDdlService.dropView({ viewName: d, ifExists: true });
364
+ for (const dependency of dependencies) {
365
+ if (dependency.obj_type !== 'v') {
366
+ throw new Error(`A view ${c.object_name} possui dependências de ${dependency.obj_type} ${dependency.obj_schema}.${dependency.obj_name}`);
367
+ }
368
+ }
369
+ const dependenciesName = dependencies.map(d => d.obj_name);
370
+ const scriptsDependencies = await c.transaction.exec({ sql: sqlCommandToRecorverScriptsDependencies, args: [dependenciesName], commandName: 'get-scripts-dependencies' });
371
+ const scriptsDropDependencies = dependencies.reverse().map(d => {
372
+ const script = cases_1.sqlBuilderDdlService.dropView({ viewName: d.obj_name, ifExists: true });
413
373
  return { sql: script, commandName: 'drop-view' };
414
374
  });
415
375
  try {
416
376
  await c.transaction.serialExec(scriptsDropDependencies);
417
377
  }
418
378
  catch (e) {
419
- this.logger.error(e, JSON.stringify(dependenciesTree, null, 2));
379
+ this.logger.error(e);
420
380
  throw new Error(`Erro ao preparar dependências da view ${c.object_name}`);
421
381
  }
422
382
  await c.ddlMigration();
423
383
  try {
424
- let tries = 0;
425
- const sortedScriptsDependencies = convertToFlatArray(dependenciesTree, false)
426
- .map(dn => scriptsDependencies.find(s => s.view_name === dn))
427
- .map(s => ({ cmd: { sql: s.ddl_script, commandName: 'create-view' }, exec: false }));
428
- while (sortedScriptsDependencies.some(s => !s.exec)) {
429
- const script = sortedScriptsDependencies[0];
430
- try {
431
- await c.transaction.serialExec([script.cmd]);
432
- script.exec = true;
433
- }
434
- catch (e) {
435
- if (tries++ > 10) {
436
- this.logger.error(e, JSON.stringify(dependenciesTree, null, 2));
437
- throw new Error(`Erro ao criar dependências da view ${c.object_name}, limite de tentativas excedido`);
438
- }
439
- this.logger.warn('Não foi possível criar a view ' + script.cmd.sql);
440
- sortedScriptsDependencies.push(sortedScriptsDependencies.shift());
441
- }
442
- }
384
+ await c.transaction.serialExec(scriptsDependencies.map(s => ({ sql: s.ddl_script, commandName: 'create-view' })));
443
385
  }
444
386
  catch (e) {
445
- this.logger.error(JSON.stringify(dependenciesTree, null, 2));
446
- throw e;
387
+ this.logger.error(e);
388
+ throw new Error(`Erro ao criar dependências da view ${c.object_name}`);
447
389
  }
448
390
  }
449
391
  }