@puca/puca-core 10.1.2 → 10.3.0
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.
- package/dist/core/services/crud-base-testable.service.d.ts +3 -1
- package/dist/core/services/crud-base-testable.service.js +14 -8
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +3 -3
- package/dist/core/services/crud-base.controller.js +17 -13
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/life-cycle.service.js +22 -16
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/logger.js +5 -1
- package/dist/core/services/logger.js.map +1 -1
- package/dist/core/services/module-especification.service.js +1 -2
- package/dist/core/services/module-especification.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +9 -0
- package/dist/core/services/report.service.js +71 -27
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +2 -1
- package/dist/core/services/storage/implementation/s3-client.service.js +8 -1
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +1 -0
- package/dist/core/services/table-permission.service.js +1 -2
- package/dist/core/services/table-permission.service.js.map +1 -1
- package/dist/essential/audit.service.js +1 -18
- package/dist/essential/audit.service.js.map +1 -1
- package/dist/essential/module-config.service.js +1 -2
- package/dist/essential/module-config.service.js.map +1 -1
- package/dist/models/module-config.d.ts +0 -1
- package/dist/models/module-especification.d.ts +0 -1
- package/dist/orm/cases/bo/ddl.service.js +0 -3
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/vanilla/interfaces.d.ts +2 -0
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js +0 -3
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +18 -5
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.js +4 -4
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/repository.d.ts +25 -7
- package/dist/orm/services/repository.js +33 -18
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/sql-layer.service.js +40 -8
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
- package/dist/orm/services/sql-parser/sql-parser.service.js +0 -2
- package/dist/orm/services/sql-parser/sql-parser.service.js.map +1 -1
- package/dist/orm/services/transaction.d.ts +1 -1
- package/dist/orm/services/transaction.js +17 -22
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ import { Join, OrderByField, SelectField, Where, With, From } from '../../orm/ca
|
|
|
3
3
|
import { SelectResult, TotalizeMode } from '../../orm/services/repository';
|
|
4
4
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
5
5
|
import { Transaction } from '../../orm/services/transaction';
|
|
6
|
-
import { Query } from '../../orm/cases/vanilla/interfaces';
|
|
6
|
+
import { Query, Select } from '../../orm/cases/vanilla/interfaces';
|
|
7
7
|
interface AbstractArgs {
|
|
8
8
|
user: User;
|
|
9
9
|
transaction?: Transaction;
|
|
@@ -14,6 +14,8 @@ export interface SelectAbstractArgs extends AbstractArgs {
|
|
|
14
14
|
with?: With[];
|
|
15
15
|
from?: From;
|
|
16
16
|
query?: Query[];
|
|
17
|
+
union?: Select[];
|
|
18
|
+
unionAll?: Select[];
|
|
17
19
|
}
|
|
18
20
|
export interface FindArgs extends SelectAbstractArgs {
|
|
19
21
|
fields: SelectField[];
|
|
@@ -37,10 +37,6 @@ class CrudBaseService {
|
|
|
37
37
|
user: null,
|
|
38
38
|
disablePermissionSystem: true,
|
|
39
39
|
transaction: args.transaction,
|
|
40
|
-
with: [],
|
|
41
|
-
from: null,
|
|
42
|
-
query: [],
|
|
43
|
-
join: []
|
|
44
40
|
});
|
|
45
41
|
const mode = oldEntity ? 'edit' : 'new';
|
|
46
42
|
return {
|
|
@@ -118,7 +114,9 @@ class CrudBaseService {
|
|
|
118
114
|
from: originalArgs.from,
|
|
119
115
|
join: originalArgs.join,
|
|
120
116
|
disablePermissionSystem: originalArgs.disablePermissionSystem,
|
|
121
|
-
query: originalArgs.query
|
|
117
|
+
query: originalArgs.query,
|
|
118
|
+
union: originalArgs.union,
|
|
119
|
+
unionAll: originalArgs.unionAll
|
|
122
120
|
}, {
|
|
123
121
|
beforeFind: async (args) => {
|
|
124
122
|
if (!(opts === null || opts === void 0 ? void 0 : opts.beforeFind)) {
|
|
@@ -164,7 +162,9 @@ class CrudBaseService {
|
|
|
164
162
|
from: args.from,
|
|
165
163
|
disablePermissionSystem: args.disablePermissionSystem,
|
|
166
164
|
query: args.query,
|
|
167
|
-
join: args.join
|
|
165
|
+
join: args.join,
|
|
166
|
+
union: args.union,
|
|
167
|
+
unionAll: args.unionAll
|
|
168
168
|
};
|
|
169
169
|
};
|
|
170
170
|
const findWhereArgs = {
|
|
@@ -195,6 +195,8 @@ class CrudBaseService {
|
|
|
195
195
|
query: args.query,
|
|
196
196
|
join: args.join,
|
|
197
197
|
transaction: args.transaction,
|
|
198
|
+
union: args.union,
|
|
199
|
+
unionAll: args.unionAll
|
|
198
200
|
};
|
|
199
201
|
return await this.find(findWhereArgs, {
|
|
200
202
|
beforeFind: async (args) => {
|
|
@@ -265,7 +267,9 @@ class CrudBaseService {
|
|
|
265
267
|
from: null,
|
|
266
268
|
disablePermissionSystem: args.disablePermissionSystem,
|
|
267
269
|
join: args.join,
|
|
268
|
-
query: args.query
|
|
270
|
+
query: args.query,
|
|
271
|
+
union: args.union,
|
|
272
|
+
unionAll: args.unionAll
|
|
269
273
|
};
|
|
270
274
|
};
|
|
271
275
|
return await this.findOneBy({
|
|
@@ -280,7 +284,9 @@ class CrudBaseService {
|
|
|
280
284
|
from: null,
|
|
281
285
|
disablePermissionSystem: args.disablePermissionSystem,
|
|
282
286
|
join: args.join,
|
|
283
|
-
query: args.query
|
|
287
|
+
query: args.query,
|
|
288
|
+
union: args.union,
|
|
289
|
+
unionAll: args.unionAll
|
|
284
290
|
}, {
|
|
285
291
|
beforeFind: async (args) => {
|
|
286
292
|
if (!(opts === null || opts === void 0 ? void 0 : opts.beforeFind)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-base-testable.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-base-testable.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"crud-base-testable.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-base-testable.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,18 +7,18 @@ import { AbstractController } from './abstract-controller';
|
|
|
7
7
|
import { TableDictionaryLayout } from '../../models/table-dictionary';
|
|
8
8
|
import { FindArgs } from './crud-base.service';
|
|
9
9
|
import { From } from '../../orm/interfaces';
|
|
10
|
-
import { Query as SelectQuery } from '../../orm/cases/vanilla/interfaces';
|
|
10
|
+
import { Select, Query as SelectQuery } from '../../orm/cases/vanilla/interfaces';
|
|
11
11
|
export declare class CrudBaseController<T extends {
|
|
12
12
|
puca_pid?: string;
|
|
13
13
|
} = any> extends AbstractController {
|
|
14
14
|
protected readonly crudService: InterfaceCrudFrontBaseService<T>;
|
|
15
15
|
constructor(className: string, crudService: InterfaceCrudFrontBaseService<T>);
|
|
16
16
|
getCrudControllerEspecification(environment: string): Promise<CrudControllerEspecification>;
|
|
17
|
-
find(pucaAuth: PucaAuth, fields: SelectField[], where: Where, args: any, page: number, pageSize: number, orderBy: OrderByField[], groupBy: SelectField[], join: Join[], alias: string, withs: With[], from: From, disablePermissionSystem: string, query: SelectQuery[], res: Response): Promise<void>;
|
|
17
|
+
find(pucaAuth: PucaAuth, fields: SelectField[], where: Where, args: any, page: number, pageSize: number, orderBy: OrderByField[], groupBy: SelectField[], join: Join[], alias: string, withs: With[], from: From, disablePermissionSystem: string, query: SelectQuery[], union: Select[], unionAll: Select[], res: Response): Promise<void>;
|
|
18
18
|
findByPucaPid(pucaAuth: PucaAuth, pucaPid: string, fields: SelectField[], alias: string, res: Response, disablePermissionSystem: string): Promise<void>;
|
|
19
19
|
delete(pucaAuth: PucaAuth, puca_pid: string, res: Response, disablePermissionSystem: string): Promise<void>;
|
|
20
20
|
update(pucaAuth: PucaAuth, entity: any, res: Response, disablePermissionSystem: string): Promise<void>;
|
|
21
21
|
updateEditorLayout(pucaAuth: PucaAuth, layout: TableDictionaryLayout, res: Response): Promise<void>;
|
|
22
|
-
reportFind(pucaAuth: PucaAuth, shortid: string, fields: SelectField[], where: Where, args: any, page: number, pageSize: number, orderBy: OrderByField[], groupBy: SelectField[], join: Join[], alias: string, withs: With[], query: SelectQuery[], from: From, res: Response): Promise<void>;
|
|
22
|
+
reportFind(pucaAuth: PucaAuth, shortid: string, fields: SelectField[], where: Where, args: any, page: number, pageSize: number, orderBy: OrderByField[], groupBy: SelectField[], join: Join[], alias: string, withs: With[], query: SelectQuery[], union: Select[], unionAll: Select[], from: From, res: Response): Promise<void>;
|
|
23
23
|
findPost(pucaAuth: PucaAuth, args: FindArgs, res: Response): Promise<void>;
|
|
24
24
|
}
|
|
@@ -30,7 +30,7 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
30
30
|
const e2 = await crud_front_base_service_1.crudControllerEspecificationEnvironmentToCrudControllerEspecification(e1, { environment });
|
|
31
31
|
return e2;
|
|
32
32
|
}
|
|
33
|
-
async find(pucaAuth, fields, where, args, page, pageSize, orderBy, groupBy, join, alias, withs, from, disablePermissionSystem, query, res) {
|
|
33
|
+
async find(pucaAuth, fields, where, args, page, pageSize, orderBy, groupBy, join, alias, withs, from, disablePermissionSystem, query, union, unionAll, res) {
|
|
34
34
|
await this.tryCatch(() => this.crudService.find({
|
|
35
35
|
alias,
|
|
36
36
|
fields,
|
|
@@ -48,7 +48,9 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
48
48
|
disablePermissionSystem: pucaAuth.device === 'internal' && (typeof disablePermissionSystem === 'boolean' ?
|
|
49
49
|
disablePermissionSystem :
|
|
50
50
|
disablePermissionSystem === 'true'),
|
|
51
|
-
query
|
|
51
|
+
query,
|
|
52
|
+
union,
|
|
53
|
+
unionAll
|
|
52
54
|
}), res);
|
|
53
55
|
}
|
|
54
56
|
async findByPucaPid(pucaAuth, pucaPid, fields, alias, res, disablePermissionSystem) {
|
|
@@ -57,13 +59,9 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
57
59
|
pucaPid,
|
|
58
60
|
user: pucaAuth.user,
|
|
59
61
|
alias,
|
|
60
|
-
transaction: null,
|
|
61
|
-
with: [],
|
|
62
|
-
from: null,
|
|
63
62
|
disablePermissionSystem: pucaAuth.device === 'internal' && (typeof disablePermissionSystem === 'boolean' ?
|
|
64
63
|
disablePermissionSystem :
|
|
65
64
|
disablePermissionSystem === 'true'),
|
|
66
|
-
query: []
|
|
67
65
|
}), res);
|
|
68
66
|
}
|
|
69
67
|
async delete(pucaAuth, puca_pid, res, disablePermissionSystem) {
|
|
@@ -92,7 +90,7 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
92
90
|
user: pucaAuth.user,
|
|
93
91
|
}), res);
|
|
94
92
|
}
|
|
95
|
-
async reportFind(pucaAuth, shortid, fields, where, args, page, pageSize, orderBy, groupBy, join, alias, withs, query, from, res) {
|
|
93
|
+
async reportFind(pucaAuth, shortid, fields, where, args, page, pageSize, orderBy, groupBy, join, alias, withs, query, union, unionAll, from, res) {
|
|
96
94
|
await this.tryCatch(async () => this.crudService.reportFind({
|
|
97
95
|
user: pucaAuth.user,
|
|
98
96
|
shortid,
|
|
@@ -107,7 +105,9 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
107
105
|
alias,
|
|
108
106
|
with: withs,
|
|
109
107
|
from,
|
|
110
|
-
query
|
|
108
|
+
query,
|
|
109
|
+
union,
|
|
110
|
+
unionAll
|
|
111
111
|
}), res);
|
|
112
112
|
}
|
|
113
113
|
async findPost(pucaAuth, args, res) {
|
|
@@ -138,9 +138,11 @@ __decorate([
|
|
|
138
138
|
__param(11, common_1.Query('from')),
|
|
139
139
|
__param(12, common_1.Query('disablePermissionSystem')),
|
|
140
140
|
__param(13, common_1.Query('query', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
141
|
-
__param(14, common_1.
|
|
141
|
+
__param(14, common_1.Query('union', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
142
|
+
__param(15, common_1.Query('unionAll', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
143
|
+
__param(16, common_1.Res()),
|
|
142
144
|
__metadata("design:type", Function),
|
|
143
|
-
__metadata("design:paramtypes", [Object, Array, Object, Object, Number, Number, Array, Array, Array, String, Array, Object, String, Array, Object]),
|
|
145
|
+
__metadata("design:paramtypes", [Object, Array, Object, Object, Number, Number, Array, Array, Array, String, Array, Object, String, Array, Array, Array, Object]),
|
|
144
146
|
__metadata("design:returntype", Promise)
|
|
145
147
|
], CrudBaseController.prototype, "find", null);
|
|
146
148
|
__decorate([
|
|
@@ -199,10 +201,12 @@ __decorate([
|
|
|
199
201
|
__param(10, common_1.Query('alias')),
|
|
200
202
|
__param(11, common_1.Query('with', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
201
203
|
__param(12, common_1.Query('query', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
202
|
-
__param(13, common_1.Query('
|
|
203
|
-
__param(14, common_1.
|
|
204
|
+
__param(13, common_1.Query('union', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
205
|
+
__param(14, common_1.Query('unionAll', json_pipe_transform_1.ParseJsonPipe, array_pipe_transform_1.ParseArrayPipe)),
|
|
206
|
+
__param(15, common_1.Query('from')),
|
|
207
|
+
__param(16, common_1.Res()),
|
|
204
208
|
__metadata("design:type", Function),
|
|
205
|
-
__metadata("design:paramtypes", [Object, String, Array, Object, Object, Number, Number, Array, Array, Array, String, Array, Array, Object, Object]),
|
|
209
|
+
__metadata("design:paramtypes", [Object, String, Array, Object, Object, Number, Number, Array, Array, Array, String, Array, Array, Array, Array, Object, Object]),
|
|
206
210
|
__metadata("design:returntype", Promise)
|
|
207
211
|
], CrudBaseController.prototype, "reportFind", null);
|
|
208
212
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-base.controller.js","sourceRoot":"","sources":["../../../src/core/services/crud-base.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AAKxB,oFAA2E;AAC3E,kFAAyE;AAEzE,uEAGmC;AAEnC,0EAAqE;AACrE,oFAAiE;AACjE,+DAA2D;AAO3D,IAAa,kBAAkB,GAA/B,MAAa,kBAA0D,SAAQ,wCAAkB;IAC/F,YACE,SAAiB,EACE,WAA6C;QAEhE,KAAK,CAAC,SAAS,CAAC,CAAC;QAFE,gBAAW,GAAX,WAAW,CAAkC;IAGlE,CAAC;IAID,KAAK,CAAC,+BAA+B,CACb,WAAmB;QAEzC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,0CAA0C,EAAE,CAAA;QAC9E,MAAM,EAAE,GAAG,MAAM,+FAAqE,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5G,OAAO,EAAE,CAAA;IACX,CAAC;IAGD,KAAK,CAAC,IAAI,CACA,QAAkB,EACsB,MAAqB,EACtC,KAAY,EACb,IAAS,EACxB,IAAY,EACR,QAAgB,EACc,OAAuB,EACvB,OAAsB,EACzB,IAAY,EAC1C,KAAa,EAEiB,KAAa,EAC5C,IAAU,EACS,uBAA+B,EAClB,KAAoB,
|
|
1
|
+
{"version":3,"file":"crud-base.controller.js","sourceRoot":"","sources":["../../../src/core/services/crud-base.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,17 +34,19 @@ class LifeCycleService {
|
|
|
34
34
|
async shutdown(opt) {
|
|
35
35
|
this.logger.warn('Finalizando o servidor');
|
|
36
36
|
this.intervals.forEach(clearInterval);
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
tasks.push(this.app.close);
|
|
45
|
-
}
|
|
37
|
+
const serviceTasks = [];
|
|
38
|
+
serviceTasks.push(this.repositoryFactory.shutdown);
|
|
39
|
+
serviceTasks.push(() => job_executor_service_1.JobExecutor.shutdown(true));
|
|
40
|
+
const essencialTasks = [];
|
|
41
|
+
essencialTasks.push(this.webSocketService.disconnect);
|
|
42
|
+
essencialTasks.push(this.databaseManagerService.get().disconnect);
|
|
43
|
+
essencialTasks.push(this.databaseManagerService.getTransactionalDatabase().disconnect);
|
|
46
44
|
try {
|
|
47
|
-
|
|
45
|
+
if (this.app) {
|
|
46
|
+
await this.app.close();
|
|
47
|
+
}
|
|
48
|
+
await Promise.all(serviceTasks);
|
|
49
|
+
await Promise.all(essencialTasks);
|
|
48
50
|
const exit = (opt === null || opt === void 0 ? void 0 : opt.exit) || process.exit;
|
|
49
51
|
exit(0);
|
|
50
52
|
}
|
|
@@ -124,12 +126,16 @@ class LifeCycleService {
|
|
|
124
126
|
doneEvent('pluginService');
|
|
125
127
|
await this.app.listen(await this.envConfigService.getEnvByName('SERVER_PORT', '4000'));
|
|
126
128
|
doneEvent('listen');
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
129
|
+
try {
|
|
130
|
+
events.forEach(e => {
|
|
131
|
+
this.logger.log(`${e.name} in ${e.end.getTime() - e.start.getTime()}ms`);
|
|
132
|
+
});
|
|
133
|
+
this.logger.log(`ready in ${new Date().getTime() - startDate.getTime()}ms`);
|
|
134
|
+
this.app.enableShutdownHooks();
|
|
135
|
+
}
|
|
136
|
+
finally {
|
|
137
|
+
this._isReady = true;
|
|
138
|
+
}
|
|
133
139
|
return this.app;
|
|
134
140
|
}
|
|
135
141
|
async connectToRedis() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAG9D,uCAA2C;AAC3C,qCAAkC;AAQlC,8EAAsF;AAsBtF,MAAa,gBAAgB;IAO3B,YACmB,sBAA8C,EAC9C,mBAAwC,EACxC,gBAAkC,EAClC,gBAAkC,EAClC,cAA8B,EAC9B,gBAAkC,EAClC,aAA4B,EAC5B,UAAsB,EACtB,aAA4B,EAC5B,kBAAsC,EACtC,kBAAsC,EACtC,gBAAkC,EAClC,wBAAkD,EAClD,YAA0B,EAC1B,YAA0B,EAC1B,WAAwB,EACxB,WAAwB,EACxB,aAA4B,EAC5B,iBAAoC;QAlBpC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAzBtC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;QAEjD,aAAQ,GAAG,KAAK,CAAA;QAGP,cAAS,GAAqB,EAAE,CAAA;IAqB7C,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,GAAkB;QAc/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACrC,MAAM,
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ class Logger {
|
|
|
33
33
|
awaysPrintLevel.includes(level);
|
|
34
34
|
const printStack = () => !Logger.stackCondition ||
|
|
35
35
|
new Error().stack.includes(Logger.stackCondition);
|
|
36
|
-
if (!printLevel() || !printClass() || !printStack) {
|
|
36
|
+
if (!printLevel() || !printClass() || !printStack()) {
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
const args = originalArgs.map(a => (typeof a === 'function' ? a() : a));
|
|
@@ -48,6 +48,10 @@ class Logger {
|
|
|
48
48
|
});
|
|
49
49
|
},
|
|
50
50
|
},
|
|
51
|
+
{
|
|
52
|
+
apply: () => a instanceof Date,
|
|
53
|
+
exec: () => a.toISOString(),
|
|
54
|
+
},
|
|
51
55
|
{
|
|
52
56
|
apply: () => typeof a === 'object',
|
|
53
57
|
exec: () => JSON.stringify(a),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/core/services/logger.ts"],"names":[],"mappings":";;;AAAA,2CAAkE;AAElE,MAAa,MAAM;IAqBjB,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAI,eAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAnBD,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACxB,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,KAAa;QAC9B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,KAAa;QACjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,CAAS;QAC1B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,CAAS;QAC7B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IAMO,IAAI,CAAC,KAAa,EAAE,GAAG,YAAmB;QAChD,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY,EAAE;YAC3B,OAAO;SACR;QAED,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,GAAG,EAAE,CACtB,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,GAAG,EAAE,CACtB,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YAC7C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YACvC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,GAAG,EAAE,CACtB,CAAC,MAAM,CAAC,cAAc;YACtB,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/core/services/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AAOA,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AAOA,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;SACxB,CAAC;IAC5B,CAAC;CACF;AA5BD,kEA4BC"}
|
|
@@ -11,12 +11,17 @@ export interface ReportConfig {
|
|
|
11
11
|
shortid?: string;
|
|
12
12
|
config?: unknown;
|
|
13
13
|
}
|
|
14
|
+
export declare enum ReportMode {
|
|
15
|
+
PrivateAsyncTemp = "privateAsyncTemp",
|
|
16
|
+
PublicSyncPermanent = "publicSyncPermanent"
|
|
17
|
+
}
|
|
14
18
|
export interface RenderDataArgs {
|
|
15
19
|
args: {
|
|
16
20
|
shortid: string;
|
|
17
21
|
};
|
|
18
22
|
data: any;
|
|
19
23
|
user: User;
|
|
24
|
+
mode?: ReportMode;
|
|
20
25
|
}
|
|
21
26
|
export interface ReportTemplate {
|
|
22
27
|
name: string;
|
|
@@ -41,8 +46,12 @@ export declare class ReportService {
|
|
|
41
46
|
activateReportJobProcessator: Boolean;
|
|
42
47
|
}): Promise<void>;
|
|
43
48
|
private getDefaultHeaders;
|
|
49
|
+
private uploadFileTemp;
|
|
50
|
+
private uploadFilePermanent;
|
|
51
|
+
private uploadFile;
|
|
44
52
|
private _renderData;
|
|
45
53
|
renderData(args: RenderDataArgs): Promise<void>;
|
|
54
|
+
renderReportSync({ args, user, data, mode }: RenderDataArgs): Promise<string>;
|
|
46
55
|
private getFolderByName;
|
|
47
56
|
private getFoldersByShortId;
|
|
48
57
|
private computeFolderList;
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ReportService = void 0;
|
|
3
|
+
exports.ReportService = exports.ReportMode = void 0;
|
|
4
4
|
const axios_1 = require("axios");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const _1 = require(".");
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
|
+
var ReportMode;
|
|
9
|
+
(function (ReportMode) {
|
|
10
|
+
ReportMode["PrivateAsyncTemp"] = "privateAsyncTemp";
|
|
11
|
+
ReportMode["PublicSyncPermanent"] = "publicSyncPermanent";
|
|
12
|
+
})(ReportMode = exports.ReportMode || (exports.ReportMode = {}));
|
|
8
13
|
class ReportService {
|
|
9
14
|
constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, cacheServiceFactory) {
|
|
10
15
|
this.uuidService = uuidService;
|
|
@@ -65,7 +70,48 @@ class ReportService {
|
|
|
65
70
|
'Authorization': `Basic ${Buffer.from(`${secret.jsReport.username}:${secret.jsReport.password}`).toString('base64')}`
|
|
66
71
|
};
|
|
67
72
|
}
|
|
68
|
-
async
|
|
73
|
+
async uploadFileTemp({ user, documentName, documentType, data }) {
|
|
74
|
+
const path = `spool/${user.username}/${documentName}-${this.uuidService.v4()}.${documentType}`;
|
|
75
|
+
const storageService = await this.storageServiceManager.getInstance();
|
|
76
|
+
await storageService.writeFile({
|
|
77
|
+
path,
|
|
78
|
+
buffer: data,
|
|
79
|
+
cacheControl: null
|
|
80
|
+
});
|
|
81
|
+
const expires = 604800;
|
|
82
|
+
const link = await storageService.getDownloadLink({
|
|
83
|
+
path,
|
|
84
|
+
expires
|
|
85
|
+
});
|
|
86
|
+
return link;
|
|
87
|
+
}
|
|
88
|
+
async uploadFilePermanent({ user, documentName, documentType, data }) {
|
|
89
|
+
const storagePublic = "public-spool";
|
|
90
|
+
const path = `${storagePublic}/${user.username}/${documentName}-${this.uuidService.v4()}.${documentType}`;
|
|
91
|
+
const storageService = await this.storageServiceManager.getInstance();
|
|
92
|
+
await storageService.writeFile({
|
|
93
|
+
path,
|
|
94
|
+
buffer: data,
|
|
95
|
+
cacheControl: null
|
|
96
|
+
});
|
|
97
|
+
const link = await storageService.getDownloadLink({
|
|
98
|
+
path,
|
|
99
|
+
publicLink: true
|
|
100
|
+
});
|
|
101
|
+
return link;
|
|
102
|
+
}
|
|
103
|
+
async uploadFile(args) {
|
|
104
|
+
if (args.mode === ReportMode.PrivateAsyncTemp || !args.mode) {
|
|
105
|
+
return await this.uploadFileTemp(args);
|
|
106
|
+
}
|
|
107
|
+
else if (args.mode === ReportMode.PublicSyncPermanent) {
|
|
108
|
+
return await this.uploadFilePermanent(args);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
throw new Error(`ReportMode ${args.mode} não suportado!`);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
async _renderData({ args, user, data, mode }) {
|
|
69
115
|
const body = {
|
|
70
116
|
template: {
|
|
71
117
|
shortid: args.shortid,
|
|
@@ -94,38 +140,36 @@ class ReportService {
|
|
|
94
140
|
.get(0)
|
|
95
141
|
.split('.')
|
|
96
142
|
.value();
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
await storageService.writeFile({
|
|
100
|
-
path,
|
|
101
|
-
buffer: response.data,
|
|
102
|
-
cacheControl: null
|
|
103
|
-
});
|
|
104
|
-
return { storageService, path, documentName, documentType };
|
|
143
|
+
const link = await this.uploadFile({ user, documentName, documentType, data: response.data, mode });
|
|
144
|
+
return { link, documentName, documentType };
|
|
105
145
|
};
|
|
106
|
-
const {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
}
|
|
146
|
+
const { link, documentName, documentType } = await renderLink();
|
|
147
|
+
if (mode === ReportMode.PublicSyncPermanent) {
|
|
148
|
+
return link;
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
await this.notificationService.send({
|
|
152
|
+
channels: ['toast'],
|
|
153
|
+
method: 'success',
|
|
154
|
+
destination: user.puca_pid,
|
|
155
|
+
link: `0=document-viewer/${encodeURIComponent(link)}?name=${documentName}&type=${documentType}`,
|
|
156
|
+
user,
|
|
157
|
+
title: `O relatório '${documentName}' está disponível`,
|
|
158
|
+
shortMessage: null,
|
|
159
|
+
htmlMessage: null,
|
|
160
|
+
expires: 604800
|
|
161
|
+
});
|
|
162
|
+
}
|
|
123
163
|
}
|
|
124
164
|
async renderData(args) {
|
|
125
165
|
await this.jobReportExecutor.add(args, {
|
|
126
166
|
timeout: 1000 * 60 * 10
|
|
127
167
|
});
|
|
128
168
|
}
|
|
169
|
+
async renderReportSync({ args, user, data, mode }) {
|
|
170
|
+
const reportLink = await this._renderData({ args, user, data, mode });
|
|
171
|
+
return reportLink;
|
|
172
|
+
}
|
|
129
173
|
async getFolderByName({ user, name }) {
|
|
130
174
|
return await this.cacheGetFolderByName.get(name);
|
|
131
175
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":";;;AAAA,iCAAyB;AACzB,4BAA4B;AAS5B,wBAAgC;AAChC,qCAAkC;
|
|
1
|
+
{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":"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"}
|