@servicelabsco/nestjs-utility-services 1.1.15 → 1.1.17
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/app.controller.js +7 -24
- package/dist/app.controller.js.map +1 -1
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/app.service.js +8 -23
- package/dist/app.service.js.map +1 -1
- package/dist/auth/controllers/auth.controller.js +54 -75
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/controllers/social.controller.js +7 -20
- package/dist/auth/controllers/social.controller.js.map +1 -1
- package/dist/auth/controllers/user.controller.js +6 -17
- package/dist/auth/controllers/user.controller.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +2 -1
- package/dist/auth/es6.classes.js +2 -1
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/middlewares/basic.auth.middleware.js +14 -25
- package/dist/auth/middlewares/basic.auth.middleware.js.map +1 -1
- package/dist/auth/middlewares/index.d.ts +1 -0
- package/dist/auth/middlewares/index.js +1 -0
- package/dist/auth/middlewares/index.js.map +1 -1
- package/dist/auth/middlewares/internal.middleware.d.ts +10 -0
- package/dist/auth/middlewares/internal.middleware.js +48 -0
- package/dist/auth/middlewares/internal.middleware.js.map +1 -0
- package/dist/auth/middlewares/jwt.middleware.js +19 -32
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -1
- package/dist/auth/services/auth.service.js +42 -63
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/device.token.service.js +34 -47
- package/dist/auth/services/device.token.service.js.map +1 -1
- package/dist/auth/services/refresh.token.service.js +17 -30
- package/dist/auth/services/refresh.token.service.js.map +1 -1
- package/dist/auth/services/social.service.js +20 -33
- package/dist/auth/services/social.service.js.map +1 -1
- package/dist/auth/services/user.service.js +29 -46
- package/dist/auth/services/user.service.js.map +1 -1
- package/dist/auth/strategies/fb.strategy.js +8 -19
- package/dist/auth/strategies/fb.strategy.js.map +1 -1
- package/dist/auth/strategies/google.strategy.js +8 -19
- package/dist/auth/strategies/google.strategy.js.map +1 -1
- package/dist/cli.js +12 -23
- package/dist/cli.js.map +1 -1
- package/dist/common/guards/login.guard.js +5 -20
- package/dist/common/guards/login.guard.js.map +1 -1
- package/dist/common/libraries/base.migration.utility.js +106 -145
- package/dist/common/libraries/base.migration.utility.js.map +1 -1
- package/dist/common/libraries/common.entity.js +42 -63
- package/dist/common/libraries/common.entity.js.map +1 -1
- package/dist/common/libraries/common.job.js +31 -46
- package/dist/common/libraries/common.job.js.map +1 -1
- package/dist/common/libraries/common.mapper.job.js +20 -35
- package/dist/common/libraries/common.mapper.job.js.map +1 -1
- package/dist/common/libraries/common.subscriber.d.ts +1 -0
- package/dist/common/libraries/common.subscriber.js +10 -17
- package/dist/common/libraries/common.subscriber.js.map +1 -1
- package/dist/common/libraries/data.manager.js +85 -112
- package/dist/common/libraries/data.manager.js.map +1 -1
- package/dist/common/libraries/list.manager.js +62 -85
- package/dist/common/libraries/list.manager.js.map +1 -1
- package/dist/common/libraries/migration.utility.js +10 -31
- package/dist/common/libraries/migration.utility.js.map +1 -1
- package/dist/common/libraries/platform.utility.js +2 -13
- package/dist/common/libraries/platform.utility.js.map +1 -1
- package/dist/common/libraries/record.manager.js +106 -127
- package/dist/common/libraries/record.manager.js.map +1 -1
- package/dist/common/libraries/report.data.manager.js +66 -93
- package/dist/common/libraries/report.data.manager.js.map +1 -1
- package/dist/common/libraries/report.list.manager.js +69 -92
- package/dist/common/libraries/report.list.manager.js.map +1 -1
- package/dist/common/libraries/reverse.migration.utility.js +4 -23
- package/dist/common/libraries/reverse.migration.utility.js.map +1 -1
- package/dist/common/libraries/seeder.utility.js +51 -70
- package/dist/common/libraries/seeder.utility.js.map +1 -1
- package/dist/console.js +4 -13
- package/dist/console.js.map +1 -1
- package/dist/main.js +15 -26
- package/dist/main.js.map +1 -1
- package/dist/migrations/1599567001962-AddUserSequence.js +3 -16
- package/dist/migrations/1599567001962-AddUserSequence.js.map +1 -1
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js +7 -20
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js.map +1 -1
- package/dist/platformUtility/commands/entity.generator.command.js +81 -108
- package/dist/platformUtility/commands/entity.generator.command.js.map +1 -1
- package/dist/platformUtility/commands/maintenance.command.js +16 -35
- package/dist/platformUtility/commands/maintenance.command.js.map +1 -1
- package/dist/platformUtility/commands/sqs.worker.command.js +49 -72
- package/dist/platformUtility/commands/sqs.worker.command.js.map +1 -1
- package/dist/platformUtility/commands/sync.class.command.js +14 -25
- package/dist/platformUtility/commands/sync.class.command.js.map +1 -1
- package/dist/platformUtility/consumers/event.consumer.js +21 -42
- package/dist/platformUtility/consumers/event.consumer.js.map +1 -1
- package/dist/platformUtility/consumers/job.consumer.js +8 -19
- package/dist/platformUtility/consumers/job.consumer.js.map +1 -1
- package/dist/platformUtility/controllers/queue.controller.js +47 -76
- package/dist/platformUtility/controllers/queue.controller.js.map +1 -1
- package/dist/platformUtility/dtos/common.attributes.dto.d.ts +1 -0
- package/dist/platformUtility/dtos/common.attributes.dto.js +6 -0
- package/dist/platformUtility/dtos/common.attributes.dto.js.map +1 -1
- package/dist/platformUtility/jobs/record.watcher.job.js +5 -18
- package/dist/platformUtility/jobs/record.watcher.job.js.map +1 -1
- package/dist/platformUtility/jobs/test.job.js +1 -12
- package/dist/platformUtility/jobs/test.job.js.map +1 -1
- package/dist/platformUtility/libraries/process.common.mail.js +27 -44
- package/dist/platformUtility/libraries/process.common.mail.js.map +1 -1
- package/dist/platformUtility/libraries/process.postmark.mail.js +22 -37
- package/dist/platformUtility/libraries/process.postmark.mail.js.map +1 -1
- package/dist/platformUtility/services/audit.service.js +50 -67
- package/dist/platformUtility/services/audit.service.js.map +1 -1
- package/dist/platformUtility/services/cache.service.js +21 -36
- package/dist/platformUtility/services/cache.service.js.map +1 -1
- package/dist/platformUtility/services/dynamo.service.js +16 -29
- package/dist/platformUtility/services/dynamo.service.js.map +1 -1
- package/dist/platformUtility/services/fcm.notification.service.js +42 -63
- package/dist/platformUtility/services/fcm.notification.service.js.map +1 -1
- package/dist/platformUtility/services/mail.service.js +8 -19
- package/dist/platformUtility/services/mail.service.js.map +1 -1
- package/dist/platformUtility/services/queue.service.js +105 -158
- package/dist/platformUtility/services/queue.service.js.map +1 -1
- package/dist/platformUtility/services/remote.request.service.js +8 -19
- package/dist/platformUtility/services/remote.request.service.js.map +1 -1
- package/dist/platformUtility/services/sql.service.js +17 -38
- package/dist/platformUtility/services/sql.service.js.map +1 -1
- package/dist/platformUtility/services/sqs.service.js +39 -56
- package/dist/platformUtility/services/sqs.service.js.map +1 -1
- package/dist/platformUtility/services/startup.service.js +8 -21
- package/dist/platformUtility/services/startup.service.js.map +1 -1
- package/dist/platformUtility/subscribers/base.subscriber.js +6 -19
- package/dist/platformUtility/subscribers/base.subscriber.js.map +1 -1
- package/dist/system/commands/db.scanner.command.js +182 -221
- package/dist/system/commands/db.scanner.command.js.map +1 -1
- package/dist/system/commands/event.queue.command.js +30 -47
- package/dist/system/commands/event.queue.command.js.map +1 -1
- package/dist/system/commands/jobs.scanner.command.js +7 -18
- package/dist/system/commands/jobs.scanner.command.js.map +1 -1
- package/dist/system/commands/model.scanner.command.js +15 -30
- package/dist/system/commands/model.scanner.command.js.map +1 -1
- package/dist/system/commands/report.scanner.command.js +9 -20
- package/dist/system/commands/report.scanner.command.js.map +1 -1
- package/dist/system/commands/service.scanner.command.js +7 -18
- package/dist/system/commands/service.scanner.command.js.map +1 -1
- package/dist/system/commands/sync.all.command.js +13 -24
- package/dist/system/commands/sync.all.command.js.map +1 -1
- package/dist/system/controllers/base.controller.js +62 -87
- package/dist/system/controllers/base.controller.js.map +1 -1
- package/dist/system/controllers/data.controller.js +10 -23
- package/dist/system/controllers/data.controller.js.map +1 -1
- package/dist/system/controllers/form.controller.js +9 -20
- package/dist/system/controllers/form.controller.js.map +1 -1
- package/dist/system/controllers/menu.controller.js +4 -17
- package/dist/system/controllers/menu.controller.js.map +1 -1
- package/dist/system/controllers/preference.controller.js +51 -74
- package/dist/system/controllers/preference.controller.js.map +1 -1
- package/dist/system/controllers/report.controller.js +29 -46
- package/dist/system/controllers/report.controller.js.map +1 -1
- package/dist/system/controllers/upload.controller.js +11 -26
- package/dist/system/controllers/upload.controller.js.map +1 -1
- package/dist/system/controllers/user.preference.controller.js +9 -22
- package/dist/system/controllers/user.preference.controller.js.map +1 -1
- package/dist/system/es6.classes.d.ts +1 -1
- package/dist/system/jobs/clean.scheduled.event.job.js +3 -14
- package/dist/system/jobs/clean.scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/column.mapper.job.js +18 -33
- package/dist/system/jobs/column.mapper.job.js.map +1 -1
- package/dist/system/jobs/model.scanner.job.js +106 -133
- package/dist/system/jobs/model.scanner.job.js.map +1 -1
- package/dist/system/jobs/property.job.js +5 -16
- package/dist/system/jobs/property.job.js.map +1 -1
- package/dist/system/jobs/relationship.mapper.job.js +18 -33
- package/dist/system/jobs/relationship.mapper.job.js.map +1 -1
- package/dist/system/jobs/report.column.sync.job.js +71 -94
- package/dist/system/jobs/report.column.sync.job.js.map +1 -1
- package/dist/system/jobs/scheduled.event.job.js +15 -28
- package/dist/system/jobs/scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/scheduled.events.job.js +11 -22
- package/dist/system/jobs/scheduled.events.job.js.map +1 -1
- package/dist/system/jobs/user.group.member.job.js +56 -79
- package/dist/system/jobs/user.group.member.job.js.map +1 -1
- package/dist/system/jobs/user.group.permission.job.js +24 -39
- package/dist/system/jobs/user.group.permission.job.js.map +1 -1
- package/dist/system/jobs/user.group.role.job.js +24 -39
- package/dist/system/jobs/user.group.role.job.js.map +1 -1
- package/dist/system/libraries/business.rule.filter.validator.js +20 -37
- package/dist/system/libraries/business.rule.filter.validator.js.map +1 -1
- package/dist/system/libraries/business.rule.query.evaluator.js +24 -39
- package/dist/system/libraries/business.rule.query.evaluator.js.map +1 -1
- package/dist/system/libraries/column.manager.js +42 -61
- package/dist/system/libraries/column.manager.js.map +1 -1
- package/dist/system/libraries/model.sync.js +64 -87
- package/dist/system/libraries/model.sync.js.map +1 -1
- package/dist/system/libraries/security.rule.evaluator.js +13 -26
- package/dist/system/libraries/security.rule.evaluator.js.map +1 -1
- package/dist/system/services/business.rule.service.js +23 -36
- package/dist/system/services/business.rule.service.js.map +1 -1
- package/dist/system/services/client.script.service.js +17 -28
- package/dist/system/services/client.script.service.js.map +1 -1
- package/dist/system/services/column.service.js +12 -23
- package/dist/system/services/column.service.js.map +1 -1
- package/dist/system/services/comment.service.js +2 -13
- package/dist/system/services/comment.service.js.map +1 -1
- package/dist/system/services/common.service.js +27 -44
- package/dist/system/services/common.service.js.map +1 -1
- package/dist/system/services/document.service.js +3 -14
- package/dist/system/services/document.service.js.map +1 -1
- package/dist/system/services/event.detail.service.js +10 -21
- package/dist/system/services/event.detail.service.js.map +1 -1
- package/dist/system/services/event.queue.service.js +21 -34
- package/dist/system/services/event.queue.service.js.map +1 -1
- package/dist/system/services/form.service.js +6 -17
- package/dist/system/services/form.service.js.map +1 -1
- package/dist/system/services/list.service.js +20 -35
- package/dist/system/services/list.service.js.map +1 -1
- package/dist/system/services/menu.service.js +50 -69
- package/dist/system/services/menu.service.js.map +1 -1
- package/dist/system/services/model.service.js +60 -81
- package/dist/system/services/model.service.js.map +1 -1
- package/dist/system/services/preference.service.js +32 -53
- package/dist/system/services/preference.service.js.map +1 -1
- package/dist/system/services/property.service.js +23 -36
- package/dist/system/services/property.service.js.map +1 -1
- package/dist/system/services/report.service.js +19 -32
- package/dist/system/services/report.service.js.map +1 -1
- package/dist/system/services/scheduled.event.service.js +69 -90
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/dist/system/services/security.rule.service.js +23 -40
- package/dist/system/services/security.rule.service.js.map +1 -1
- package/dist/system/services/ui.action.service.js +13 -24
- package/dist/system/services/ui.action.service.js.map +1 -1
- package/dist/system/services/upload.service.js +33 -48
- package/dist/system/services/upload.service.js.map +1 -1
- package/dist/system/services/user.preference.service.js +38 -57
- package/dist/system/services/user.preference.service.js.map +1 -1
- package/dist/system/subscribers/column.subscriber.js +4 -17
- package/dist/system/subscribers/column.subscriber.js.map +1 -1
- package/dist/system/subscribers/property.subscriber.js +4 -17
- package/dist/system/subscribers/property.subscriber.js.map +1 -1
- package/dist/system/subscribers/relationship.subscriber.js +4 -17
- package/dist/system/subscribers/relationship.subscriber.js.map +1 -1
- package/dist/system/subscribers/scheduled.event.subscriber.js +6 -19
- package/dist/system/subscribers/scheduled.event.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.member.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.member.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.permission.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.permission.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.role.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.role.subscriber.js.map +1 -1
- package/dist/worker.js +6 -17
- package/dist/worker.js.map +1 -1
- package/package.json +2 -1
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.ReportColumnSyncJob = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -34,70 +25,62 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
|
|
34
25
|
this.queueService = queueService;
|
35
26
|
this.sqlService = sqlService;
|
36
27
|
}
|
37
|
-
handle(id) {
|
28
|
+
async handle(id) {
|
38
29
|
var _a;
|
39
|
-
|
40
|
-
|
41
|
-
relations: ['query'],
|
42
|
-
});
|
43
|
-
if (!((_a = report === null || report === void 0 ? void 0 : report.query) === null || _a === void 0 ? void 0 : _a.script))
|
44
|
-
return;
|
45
|
-
yield this.setReportColumn(report);
|
46
|
-
const data = yield this.getQueryResults(report);
|
47
|
-
if (!data)
|
48
|
-
return report;
|
49
|
-
const columns = yield this.loadReportColumns(report, data);
|
50
|
-
return this.removeAllUnusedColumns(report, columns);
|
30
|
+
const report = await report_entity_1.ReportEntity.first(id, {
|
31
|
+
relations: ['query'],
|
51
32
|
});
|
33
|
+
if (!((_a = report === null || report === void 0 ? void 0 : report.query) === null || _a === void 0 ? void 0 : _a.script))
|
34
|
+
return;
|
35
|
+
await this.setReportColumn(report);
|
36
|
+
const data = await this.getQueryResults(report);
|
37
|
+
if (!data)
|
38
|
+
return report;
|
39
|
+
const columns = await this.loadReportColumns(report, data);
|
40
|
+
return this.removeAllUnusedColumns(report, columns);
|
52
41
|
}
|
53
|
-
loadReportColumns(report, data) {
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
columns.push(response.name);
|
63
|
-
});
|
64
|
-
return columns;
|
42
|
+
async loadReportColumns(report, data) {
|
43
|
+
const promises = [];
|
44
|
+
const columns = [];
|
45
|
+
for (const [key, value] of Object.entries(data)) {
|
46
|
+
promises.push(this.saveColumn(report, { key, value }));
|
47
|
+
}
|
48
|
+
return Promise.all(promises).then((res) => {
|
49
|
+
res.forEach((response) => {
|
50
|
+
columns.push(response.name);
|
65
51
|
});
|
52
|
+
return columns;
|
66
53
|
});
|
67
54
|
}
|
68
|
-
saveColumn(report, obj) {
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
name: obj.key,
|
74
|
-
});
|
75
|
-
if (column.id)
|
76
|
-
return column;
|
77
|
-
column.display_name = this.getDisplayName(obj.key);
|
78
|
-
column.type_id = this.getType(obj.value);
|
79
|
-
yield column.save();
|
55
|
+
async saveColumn(report, obj) {
|
56
|
+
const column = await column_entity_1.ColumnEntity.firstOrNew({
|
57
|
+
source_type: SOURCEHASH.report,
|
58
|
+
source_id: report.id,
|
59
|
+
name: obj.key,
|
80
60
|
});
|
61
|
+
if (column.id)
|
62
|
+
return column;
|
63
|
+
column.display_name = this.getDisplayName(obj.key);
|
64
|
+
column.type_id = this.getType(obj.value);
|
65
|
+
await column.save();
|
81
66
|
}
|
82
|
-
getQueryResults(report) {
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
if (param.default_value === null)
|
88
|
-
return {};
|
89
|
-
const key = `:${param.name}`;
|
90
|
-
query = query.replace(new RegExp(key, 'ig'), param.default_value);
|
91
|
-
}
|
92
|
-
query += ` LIMIT 1`;
|
93
|
-
try {
|
94
|
-
return yield this.sqlService.sql(query);
|
95
|
-
}
|
96
|
-
catch (error) {
|
97
|
-
global.console.log(`error`, error);
|
67
|
+
async getQueryResults(report) {
|
68
|
+
let query = report.query.script;
|
69
|
+
const params = await report_param_entity_1.ReportParamEntity.find({ where: { report_id: report.id } });
|
70
|
+
for (const param of params) {
|
71
|
+
if (param.default_value === null)
|
98
72
|
return {};
|
99
|
-
}
|
100
|
-
|
73
|
+
const key = `:${param.name}`;
|
74
|
+
query = query.replace(new RegExp(key, 'ig'), param.default_value);
|
75
|
+
}
|
76
|
+
query += ` LIMIT 1`;
|
77
|
+
try {
|
78
|
+
return await this.sqlService.sql(query);
|
79
|
+
}
|
80
|
+
catch (error) {
|
81
|
+
global.console.log(`error`, error);
|
82
|
+
return {};
|
83
|
+
}
|
101
84
|
}
|
102
85
|
getDisplayName(str) {
|
103
86
|
const lastChar = str.substr(0, -3);
|
@@ -106,19 +89,17 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
|
|
106
89
|
str = str.replace(/_/g, ' ');
|
107
90
|
return platform_utility_1.PlatformUtility.ucwords(str);
|
108
91
|
}
|
109
|
-
removeAllUnusedColumns(report, columns) {
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
return
|
120
|
-
return res;
|
121
|
-
});
|
92
|
+
async removeAllUnusedColumns(report, columns) {
|
93
|
+
const reportColumns = await column_entity_1.ColumnEntity.find({
|
94
|
+
where: { source_type: SOURCEHASH.report, source_id: report.id },
|
95
|
+
});
|
96
|
+
const promises = [];
|
97
|
+
reportColumns.forEach((reportColumn) => {
|
98
|
+
if (columns.indexOf(reportColumn.name) === -1)
|
99
|
+
promises.push(reportColumn.softDelete());
|
100
|
+
});
|
101
|
+
return Promise.all(promises).then((res) => {
|
102
|
+
return res;
|
122
103
|
});
|
123
104
|
}
|
124
105
|
getType(str) {
|
@@ -128,26 +109,22 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
|
|
128
109
|
return 5;
|
129
110
|
return 1;
|
130
111
|
}
|
131
|
-
setReportColumn(report) {
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
promises.push(this.setColumn(report, match.replace(':', '').trim()));
|
137
|
-
});
|
138
|
-
return Promise.all(promises).then((res) => {
|
139
|
-
return res;
|
140
|
-
});
|
112
|
+
async setReportColumn(report) {
|
113
|
+
const matches = report.query.script.match(/:\w+/g);
|
114
|
+
const promises = [];
|
115
|
+
matches.forEach((match) => {
|
116
|
+
promises.push(this.setColumn(report, match.replace(':', '').trim()));
|
141
117
|
});
|
142
|
-
|
143
|
-
|
144
|
-
return __awaiter(this, void 0, void 0, function* () {
|
145
|
-
const column = yield report_param_entity_1.ReportParamEntity.firstOrNew({ report_id: report.id, name });
|
146
|
-
if (column.id)
|
147
|
-
return;
|
148
|
-
return column.save();
|
118
|
+
return Promise.all(promises).then((res) => {
|
119
|
+
return res;
|
149
120
|
});
|
150
121
|
}
|
122
|
+
async setColumn(report, name) {
|
123
|
+
const column = await report_param_entity_1.ReportParamEntity.firstOrNew({ report_id: report.id, name });
|
124
|
+
if (column.id)
|
125
|
+
return;
|
126
|
+
return column.save();
|
127
|
+
}
|
151
128
|
};
|
152
129
|
ReportColumnSyncJob = __decorate([
|
153
130
|
(0, common_1.Injectable)(),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"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"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.ScheduledEventJob = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -30,26 +21,22 @@ let ScheduledEventJob = class ScheduledEventJob extends common_job_1.CommonJob {
|
|
30
21
|
this.queueService = queueService;
|
31
22
|
this.scheduledEventService = scheduledEventService;
|
32
23
|
}
|
33
|
-
handle(data) {
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
return [yield this.scheduledEventService.createEventsForJob(job)];
|
41
|
-
});
|
24
|
+
async handle(data) {
|
25
|
+
if (!(data && data > 0))
|
26
|
+
return this.handleAllActiveJobs();
|
27
|
+
const job = await scheduled_event_entity_1.ScheduledEventEntity.first(data);
|
28
|
+
if (!job)
|
29
|
+
return [job];
|
30
|
+
return [await this.scheduledEventService.createEventsForJob(job)];
|
42
31
|
}
|
43
|
-
handleAllActiveJobs() {
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
return
|
51
|
-
return res;
|
52
|
-
});
|
32
|
+
async handleAllActiveJobs() {
|
33
|
+
const scheduledJobs = await this.scheduledEventService.getActiveSchedules();
|
34
|
+
const promises = [];
|
35
|
+
scheduledJobs.forEach((scheduledJob) => {
|
36
|
+
promises.push(this.scheduledEventService.createEventsForJob(scheduledJob));
|
37
|
+
});
|
38
|
+
return Promise.all(promises).then((res) => {
|
39
|
+
return res;
|
53
40
|
});
|
54
41
|
}
|
55
42
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.event.job.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAA0E;AAC1E,iFAA4E;AAGrE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,sBAAS;IAC5C,YAA+B,YAA0B,EAAmB,qBAA4C;QACpH,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;QAAmB,0BAAqB,GAArB,qBAAqB,CAAuB;IAExH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE3D,MAAM,GAAG,GAAG,MAAM,6CAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAEvB,OAAO,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC7B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QAC5E,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACnC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAxBY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAEoC,4BAAY,EAA0C,+CAAqB;GAD/G,iBAAiB,CAwB7B;AAxBY,8CAAiB"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.ScheduledEventsJob = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -30,19 +21,17 @@ let ScheduledEventsJob = class ScheduledEventsJob extends common_job_1.CommonJob
|
|
30
21
|
this.queueService = queueService;
|
31
22
|
this.scheduledEventService = scheduledEventService;
|
32
23
|
}
|
33
|
-
handle(data) {
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
return
|
44
|
-
return res;
|
45
|
-
});
|
24
|
+
async handle(data) {
|
25
|
+
const jobs = await scheduled_event_entity_1.ScheduledEventEntity.find({
|
26
|
+
where: { active: true },
|
27
|
+
relations: ['event'],
|
28
|
+
});
|
29
|
+
const promises = [];
|
30
|
+
jobs.forEach((job) => {
|
31
|
+
promises.push(this.scheduledEventService.createEventsForJob(job));
|
32
|
+
});
|
33
|
+
return Promise.all(promises).then((res) => {
|
34
|
+
return res;
|
46
35
|
});
|
47
36
|
}
|
48
37
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scheduled.events.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.events.job.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"scheduled.events.job.js","sourceRoot":"","sources":["../../../src/system/jobs/scheduled.events.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,+EAA0E;AAC1E,iFAA4E;AAGrE,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,sBAAS;IAC7C,YAA+B,YAA0B,EAAmB,qBAA4C;QACpH,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;QAAmB,0BAAqB,GAArB,qBAAqB,CAAuB;IAExH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAS;QAClB,MAAM,IAAI,GAAG,MAAM,6CAAoB,CAAC,IAAI,CAAC;YACzC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAnBY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEoC,4BAAY,EAA0C,+CAAqB;GAD/G,kBAAkB,CAmB9B;AAnBY,gDAAkB"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.UserGroupMemberJob = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -32,87 +23,73 @@ let UserGroupMemberJob = class UserGroupMemberJob extends common_job_1.CommonJob
|
|
32
23
|
super();
|
33
24
|
this.queueService = queueService;
|
34
25
|
}
|
35
|
-
handle(data) {
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
return this.handleInsertOperation(data);
|
40
|
-
});
|
26
|
+
async handle(data) {
|
27
|
+
if (data.deleted_at)
|
28
|
+
return this.handleDeleteOperation(data);
|
29
|
+
return this.handleInsertOperation(data);
|
41
30
|
}
|
42
|
-
handleInsertOperation(record) {
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
return
|
48
|
-
return res;
|
49
|
-
});
|
31
|
+
async handleInsertOperation(record) {
|
32
|
+
const promises = [];
|
33
|
+
promises.push(this.addRolesToMember(record));
|
34
|
+
promises.push(this.addPermissionsToMember(record));
|
35
|
+
return Promise.all(promises).then((res) => {
|
36
|
+
return res;
|
50
37
|
});
|
51
38
|
}
|
52
|
-
handleDeleteOperation(record) {
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
return
|
58
|
-
return res;
|
59
|
-
});
|
39
|
+
async handleDeleteOperation(record) {
|
40
|
+
const promises = [];
|
41
|
+
promises.push(this.removeRolesFromMember(record));
|
42
|
+
promises.push(this.removePermissionsFromMember(record));
|
43
|
+
return Promise.all(promises).then((res) => {
|
44
|
+
return res;
|
60
45
|
});
|
61
46
|
}
|
62
|
-
addRolesToMember(record) {
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
return
|
77
|
-
return res;
|
78
|
-
});
|
47
|
+
async addRolesToMember(record) {
|
48
|
+
const promises = [];
|
49
|
+
const roles = await user_group_role_entity_1.UserGroupRoleEntity.find({
|
50
|
+
where: { user_group_id: record.user_group_id },
|
51
|
+
});
|
52
|
+
roles.forEach((role) => {
|
53
|
+
const userRole = new user_role_entity_1.UserRoleEntity();
|
54
|
+
userRole.user_id = record.user_id;
|
55
|
+
userRole.role_id = role.role_id;
|
56
|
+
userRole.source_type = SOURCEHASH.userGroup;
|
57
|
+
userRole.source_id = record.user_group_id;
|
58
|
+
promises.push(userRole.save());
|
59
|
+
});
|
60
|
+
return Promise.all(promises).then((res) => {
|
61
|
+
return res;
|
79
62
|
});
|
80
63
|
}
|
81
|
-
addPermissionsToMember(record) {
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
return
|
96
|
-
return res;
|
97
|
-
});
|
64
|
+
async addPermissionsToMember(record) {
|
65
|
+
const promises = [];
|
66
|
+
const permissions = await user_group_permission_entity_1.UserGroupPermissionEntity.find({
|
67
|
+
where: { user_group_id: record.user_group_id },
|
68
|
+
});
|
69
|
+
permissions.forEach((permission) => {
|
70
|
+
const userPermission = new user_permission_entity_1.UserPermissionEntity();
|
71
|
+
userPermission.user_id = record.user_id;
|
72
|
+
userPermission.permission_id = permission.permission_id;
|
73
|
+
userPermission.source_type = SOURCEHASH.userGroup;
|
74
|
+
userPermission.source_id = record.user_group_id;
|
75
|
+
promises.push(userPermission.save());
|
76
|
+
});
|
77
|
+
return Promise.all(promises).then((res) => {
|
78
|
+
return res;
|
98
79
|
});
|
99
80
|
}
|
100
|
-
removeRolesFromMember(record) {
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
user_id: record.user_id,
|
106
|
-
});
|
81
|
+
async removeRolesFromMember(record) {
|
82
|
+
await user_role_entity_1.UserRoleEntity.destroy({
|
83
|
+
source_type: SOURCEHASH.userGroup,
|
84
|
+
source_id: record.user_group_id,
|
85
|
+
user_id: record.user_id,
|
107
86
|
});
|
108
87
|
}
|
109
|
-
removePermissionsFromMember(record) {
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
user_id: record.user_id,
|
115
|
-
});
|
88
|
+
async removePermissionsFromMember(record) {
|
89
|
+
await user_permission_entity_1.UserPermissionEntity.destroy({
|
90
|
+
source_type: SOURCEHASH.userGroup,
|
91
|
+
source_id: record.user_group_id,
|
92
|
+
user_id: record.user_id,
|
116
93
|
});
|
117
94
|
}
|
118
95
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"user.group.member.job.js","sourceRoot":"","sources":["../../../src/system/jobs/user.group.member.job.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"user.group.member.job.js","sourceRoot":"","sources":["../../../src/system/jobs/user.group.member.job.ts"],"names":[],"mappings":"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"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.UserGroupPermissionJob = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -30,39 +21,33 @@ let UserGroupPermissionJob = class UserGroupPermissionJob extends common_job_1.C
|
|
30
21
|
super();
|
31
22
|
this.queueService = queueService;
|
32
23
|
}
|
33
|
-
handle(data) {
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
return this.addRoleToMembers(data);
|
38
|
-
});
|
24
|
+
async handle(data) {
|
25
|
+
if (data.deleted_at)
|
26
|
+
return this.removeRoleFromMembers(data);
|
27
|
+
return this.addRoleToMembers(data);
|
39
28
|
}
|
40
|
-
addRoleToMembers(record) {
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
return
|
55
|
-
return res;
|
56
|
-
});
|
29
|
+
async addRoleToMembers(record) {
|
30
|
+
const members = await user_group_member_entity_1.UserGroupMemberEntity.find({
|
31
|
+
where: { user_group_id: record.user_group_id },
|
32
|
+
});
|
33
|
+
const promises = [];
|
34
|
+
members.forEach((member) => {
|
35
|
+
const userPermission = new user_permission_entity_1.UserPermissionEntity();
|
36
|
+
userPermission.user_id = member.user_id;
|
37
|
+
userPermission.permission_id = record.permission_id;
|
38
|
+
userPermission.source_type = SOURCEHASH.userGroup;
|
39
|
+
userPermission.source_id = record.user_group_id;
|
40
|
+
promises.push(userPermission.save());
|
41
|
+
});
|
42
|
+
return Promise.all(promises).then((res) => {
|
43
|
+
return res;
|
57
44
|
});
|
58
45
|
}
|
59
|
-
removeRoleFromMembers(record) {
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
permission_id: record.permission_id,
|
65
|
-
});
|
46
|
+
async removeRoleFromMembers(record) {
|
47
|
+
await user_permission_entity_1.UserPermissionEntity.destroy({
|
48
|
+
source_type: SOURCEHASH.userGroup,
|
49
|
+
source_id: record.user_group_id,
|
50
|
+
permission_id: record.permission_id,
|
66
51
|
});
|
67
52
|
}
|
68
53
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"user.group.permission.job.js","sourceRoot":"","sources":["../../../src/system/jobs/user.group.permission.job.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"user.group.permission.job.js","sourceRoot":"","sources":["../../../src/system/jobs/user.group.permission.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,uDAAwD;AACxD,gFAA4E;AAC5E,2FAAsF;AAEtF,qFAA+E;AASxE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAS;IAMjD,YAA+B,YAA0B;QACrD,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IAQD,KAAK,CAAC,MAAM,CAAC,IAA+B;QACxC,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAQD,KAAK,CAAC,gBAAgB,CAAC,MAAiC;QACpD,MAAM,OAAO,GAAG,MAAM,gDAAqB,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE;SACjD,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,MAAM,cAAc,GAAG,IAAI,6CAAoB,EAAE,CAAC;YAElD,cAAc,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YACxC,cAAc,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;YAEpD,cAAc,CAAC,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC;YAClD,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC;YAEhD,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAOD,KAAK,CAAC,qBAAqB,CAAC,MAAiC;QACzD,MAAM,6CAAoB,CAAC,OAAO,CAAC;YAC/B,WAAW,EAAE,UAAU,CAAC,SAAS;YACjC,SAAS,EAAE,MAAM,CAAC,aAAa;YAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;SACtC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAhEY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAOoC,4BAAY;GANhD,sBAAsB,CAgElC;AAhEY,wDAAsB"}
|