@puca/puca-core 8.2.3 → 8.3.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.
- package/dist/core/services/auth.service.js +2 -1
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +59 -23
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +17 -25
- package/dist/core/services/crud-base-testable.service.js +4 -4
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +4 -2
- package/dist/core/services/crud-base.controller.js +32 -82
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.d.ts +1 -4
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +12 -4
- package/dist/core/services/crud-front-base.service.js +81 -1
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/eval.service.js +1 -0
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/index.d.ts +4 -0
- package/dist/core/services/index.js +10 -4
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +5 -8
- package/dist/core/services/install.service.js +20 -323
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job/job.service.d.ts +2 -4
- package/dist/core/services/job/job.service.js +3 -10
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.d.ts +2 -2
- package/dist/core/services/job-executor/job-executor.service.js +4 -4
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -2
- package/dist/core/services/life-cycle.service.js +5 -3
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +17 -8
- package/dist/core/services/migration.service.js +110 -87
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/module-especification.service.d.ts +9 -0
- package/dist/core/services/module-especification.service.js +32 -0
- package/dist/core/services/module-especification.service.js.map +1 -0
- package/dist/core/services/notification.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +26 -71
- package/dist/core/services/report.service.js +67 -213
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/single-instance-ensure.service.js +1 -1
- package/dist/core/services/single-instance-ensure.service.js.map +1 -1
- package/dist/core/services/source/source.service.js +1 -0
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/table-permission.service.d.ts +14 -0
- package/dist/core/services/table-permission.service.js +299 -0
- package/dist/core/services/table-permission.service.js.map +1 -0
- package/dist/core/services/user-config.service.js +1 -1
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +3 -1
- package/dist/models/field-dictionary.d.ts +6 -2
- package/dist/models/puca-row-status.d.ts +0 -0
- package/dist/models/puca-row-status.js +1 -0
- package/dist/models/puca-row-status.js.map +1 -0
- package/dist/orm/cases/bo/ddl.service.d.ts +1 -1
- package/dist/orm/cases/bo/ddl.service.js +15 -9
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/bo/interfaces.d.ts +15 -2
- package/dist/orm/cases/bo/interfaces.js.map +1 -1
- package/dist/orm/cases/bo/sql.service.d.ts +5 -14
- package/dist/orm/cases/bo/sql.service.js +11 -11
- package/dist/orm/cases/bo/sql.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +0 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.js +11 -15
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/index.d.ts +1 -1
- package/dist/orm/services/index.js +1 -1
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +1 -1
- package/dist/orm/services/repository.d.ts +18 -19
- package/dist/orm/services/repository.js +33 -23
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/helpers.d.ts +2 -0
- package/dist/orm/services/sql/helpers.js +48 -0
- package/dist/orm/services/sql/helpers.js.map +1 -0
- package/dist/orm/services/sql/interfaces.d.ts +11 -0
- package/dist/orm/services/sql/interfaces.js +3 -0
- package/dist/orm/services/sql/interfaces.js.map +1 -0
- package/dist/orm/services/sql/sql-layer.service.d.ts +52 -0
- package/dist/orm/services/sql/sql-layer.service.js +446 -0
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql-security-layer.service.d.ts +17 -0
- package/dist/orm/services/sql/sql-security-layer.service.js +165 -0
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql-status-layer.service.d.ts +0 -0
- package/dist/orm/services/sql/sql-status-layer.service.js +1 -0
- package/dist/orm/services/sql/sql-status-layer.service.js.map +1 -0
- package/dist/orm/services/sql/sql.service.d.ts +14 -0
- package/dist/orm/services/sql/sql.service.js +42 -0
- package/dist/orm/services/sql/sql.service.js.map +1 -0
- package/dist/orm/services/transaction.d.ts +5 -0
- package/dist/orm/services/transaction.js +55 -20
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -2
- package/dist/orm/services/sql.service.d.ts +0 -32
- package/dist/orm/services/sql.service.js +0 -464
- package/dist/orm/services/sql.service.js.map +0 -1
|
@@ -67,7 +67,7 @@ class CSqlService {
|
|
|
67
67
|
this.uuid = uuid;
|
|
68
68
|
this.sqlBuilderService = sqlBuilderService;
|
|
69
69
|
}
|
|
70
|
-
insert(insert
|
|
70
|
+
insert(insert) {
|
|
71
71
|
const puca_pid = _.get(insert, ['values', 'puca_pid']) || this.uuid.v4();
|
|
72
72
|
const now = new Date();
|
|
73
73
|
const { valuesPuca, valuesUser } = Object.entries(insert.values)
|
|
@@ -76,7 +76,7 @@ class CSqlService {
|
|
|
76
76
|
return [
|
|
77
77
|
k,
|
|
78
78
|
wildCardStrategies({
|
|
79
|
-
user,
|
|
79
|
+
user: insert.user,
|
|
80
80
|
v,
|
|
81
81
|
})
|
|
82
82
|
.find(s => s.apply())
|
|
@@ -103,7 +103,7 @@ class CSqlService {
|
|
|
103
103
|
returningUser: [],
|
|
104
104
|
});
|
|
105
105
|
const tableName = computePucaTable(insert.tableName);
|
|
106
|
-
const args = applyWildCardStrategies({ args: insert.args, user });
|
|
106
|
+
const args = applyWildCardStrategies({ args: insert.args, user: insert.user });
|
|
107
107
|
const retorno = [
|
|
108
108
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
109
109
|
tableName,
|
|
@@ -122,12 +122,12 @@ class CSqlService {
|
|
|
122
122
|
].filter(r => r);
|
|
123
123
|
return retorno;
|
|
124
124
|
}
|
|
125
|
-
update(update
|
|
125
|
+
update(update) {
|
|
126
126
|
const userTable = computeUserTable(update.tableName);
|
|
127
127
|
const pucaTable = computePucaTable(update.tableName);
|
|
128
128
|
const updateArgs = applyWildCardStrategies({
|
|
129
129
|
args: update.args,
|
|
130
|
-
user,
|
|
130
|
+
user: update.user,
|
|
131
131
|
});
|
|
132
132
|
const { setUser, setPuca } = Object.entries(update.set)
|
|
133
133
|
.filter(([k]) => !['puca_pid', 'puca_created_at', 'puca_key', 'user_pid'].includes(k))
|
|
@@ -135,7 +135,7 @@ class CSqlService {
|
|
|
135
135
|
return [
|
|
136
136
|
k,
|
|
137
137
|
wildCardStrategies({
|
|
138
|
-
user,
|
|
138
|
+
user: update.user,
|
|
139
139
|
v,
|
|
140
140
|
})
|
|
141
141
|
.find(s => s.apply())
|
|
@@ -192,7 +192,7 @@ class CSqlService {
|
|
|
192
192
|
].filter(f => f);
|
|
193
193
|
return retorno;
|
|
194
194
|
}
|
|
195
|
-
delete(d
|
|
195
|
+
delete(d) {
|
|
196
196
|
const userTable = computeUserTable(d.tableName);
|
|
197
197
|
const pucaTable = computePucaTable(d.tableName);
|
|
198
198
|
const { returningPuca, returningUser } = Object.entries(d.returning || []).reduce((r, [k, v]) => {
|
|
@@ -207,7 +207,7 @@ class CSqlService {
|
|
|
207
207
|
tableName: userTable,
|
|
208
208
|
args: applyWildCardStrategies({
|
|
209
209
|
args: Object.assign({ puca_pid: d.puca_pid }, d.args),
|
|
210
|
-
user,
|
|
210
|
+
user: d.user,
|
|
211
211
|
}),
|
|
212
212
|
where: {
|
|
213
213
|
and: [{
|
|
@@ -224,7 +224,7 @@ class CSqlService {
|
|
|
224
224
|
tableName: pucaTable,
|
|
225
225
|
args: applyWildCardStrategies({
|
|
226
226
|
args: Object.assign({ puca_pid: d.puca_pid }, d.args),
|
|
227
|
-
user,
|
|
227
|
+
user: d.user,
|
|
228
228
|
}),
|
|
229
229
|
where: {
|
|
230
230
|
and: [{
|
|
@@ -238,14 +238,14 @@ class CSqlService {
|
|
|
238
238
|
];
|
|
239
239
|
return retorno;
|
|
240
240
|
}
|
|
241
|
-
select(originalSelect
|
|
241
|
+
select(originalSelect) {
|
|
242
242
|
if (!originalSelect.fields || !originalSelect.fields.length) {
|
|
243
243
|
throw new Error('Field atributte must be define');
|
|
244
244
|
}
|
|
245
245
|
const select = _.cloneDeep(originalSelect);
|
|
246
246
|
select.args = applyWildCardStrategies({
|
|
247
247
|
args: select.args,
|
|
248
|
-
user,
|
|
248
|
+
user: select.user,
|
|
249
249
|
});
|
|
250
250
|
return Object.assign(Object.assign({}, this.sqlBuilderService.select(select)), { commandName: 'select' });
|
|
251
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/sql.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAI5B,
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/sql.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,18 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CacheRepositoryRedis = void 0;
|
|
4
4
|
const logger_1 = require("../../../core/services/logger");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
-
var CacheStatus;
|
|
7
|
-
(function (CacheStatus) {
|
|
8
|
-
CacheStatus["Loading"] = "loading";
|
|
9
|
-
CacheStatus["Ready"] = "Ready";
|
|
10
|
-
})(CacheStatus || (CacheStatus = {}));
|
|
11
6
|
class CacheRepositoryRedis {
|
|
12
7
|
constructor(database, redisClient, table) {
|
|
13
8
|
this.database = database;
|
|
14
9
|
this.redisClient = redisClient;
|
|
15
10
|
this.logger = new logger_1.Logger('CacheRepositoryRedis');
|
|
16
11
|
this.events = [];
|
|
17
|
-
this.status = CacheStatus.Loading;
|
|
18
12
|
this.intervals = [];
|
|
19
13
|
this.table = table;
|
|
20
14
|
this.topicChange = `${this.table}.change`;
|
|
@@ -30,15 +24,17 @@ class CacheRepositoryRedis {
|
|
|
30
24
|
subscribeOnChange() {
|
|
31
25
|
this.subscribe(this.topicChange, async (pucaPid) => {
|
|
32
26
|
this.logger.debug(this.topicChange, this.table, pucaPid);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
27
|
+
setTimeout(async () => {
|
|
28
|
+
const rows = await this.database.exec({
|
|
29
|
+
sql: `select * from ${this.table} where puca_pid = $1`,
|
|
30
|
+
args: [pucaPid],
|
|
31
|
+
commandName: 'onChangeRefresh',
|
|
32
|
+
}, { transaction: null });
|
|
33
|
+
this.emitChange({
|
|
34
|
+
puca_pid: pucaPid,
|
|
35
|
+
row: rows[0],
|
|
36
|
+
});
|
|
37
|
+
}, 1000);
|
|
42
38
|
});
|
|
43
39
|
}
|
|
44
40
|
emitChange(args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;AAEvD,+BAAiC;
|
|
1
|
+
{"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SqlService } from './sql.service';
|
|
1
|
+
import { SqlService } from './sql/sql.service';
|
|
2
2
|
import { RepositoryFactory } from './repository-factory';
|
|
3
3
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
4
4
|
import { RedisManagerService } from './managers/redis-manager.service';
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sqlService = exports.cacheServiceFactory = exports.repositoryFactory = exports.redisManagerService = exports.transactionFactory = exports.databaseManagerService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
|
-
const sql_service_1 = require("./sql.service");
|
|
5
|
+
const sql_service_1 = require("./sql/sql.service");
|
|
6
6
|
const repository_factory_1 = require("./repository-factory");
|
|
7
7
|
const database_manager_service_1 = require("./managers/database-manager.service");
|
|
8
8
|
const essential_1 = require("../../essential");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C,mDAA+C;AAC/C,6DAAyD;AACzD,kFAA6E;AAC7E,+CAAmD;AACnD,4EAAuE;AACvE,oCAAuC;AACvC,mDAAsD;AACtD,+CAAmD;AAEtC,QAAA,sBAAsB,GAAG,IAAI,iDAAsB,EAAE,CAAC;AACtD,QAAA,kBAAkB,GAAG,IAAI,gCAAkB,CAAC,8BAAsB,CAAC,CAAA;AACnE,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;AAIhD,QAAA,mBAAmB,GAAG,IAAI,mCAAmB,CAAC,2BAAmB,CAAC,CAAA;AAElE,QAAA,UAAU,GAAG,IAAI,wBAAU,CACtC,mBAAW,EAAE,GAAG,EAAE,CAAC,yBAAiB,CACrC,CAAA;AAED,yBAAiB,GAAG,IAAI,sCAAiB,CACvC,8BAAsB,EACtB,0BAAkB,EAClB,2BAAmB,EACnB,GAAG,EAAE,CAAC,kBAAU,EAChB,qBAAW,EACX,4BAAgB,CACjB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
2
2
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
3
|
-
import { SqlService } from './sql.service';
|
|
3
|
+
import { SqlService } from './sql/sql.service';
|
|
4
4
|
import { CacheRepository } from './cache-repository/cache-repository';
|
|
5
5
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
6
6
|
import { RedisManagerService } from './managers/redis-manager.service';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
2
2
|
import { User } from '../../models/user';
|
|
3
|
-
import { SqlService } from './sql.service';
|
|
3
|
+
import { SqlService } from './sql/sql.service';
|
|
4
4
|
import { RedisClient } from 'redis';
|
|
5
5
|
import { Join, OrderByField, SelectField, Where } from '../cases/bo/interfaces';
|
|
6
6
|
import { Transaction } from './transaction';
|
|
@@ -24,7 +24,7 @@ export interface FindWhereArgs {
|
|
|
24
24
|
pageSize?: number;
|
|
25
25
|
orderBy?: OrderByField[];
|
|
26
26
|
join?: Join[];
|
|
27
|
-
user
|
|
27
|
+
user: User;
|
|
28
28
|
groupBy?: SelectField[];
|
|
29
29
|
alias?: string;
|
|
30
30
|
totalizeMode?: TotalizeMode;
|
|
@@ -34,14 +34,14 @@ export interface FindByInArgs {
|
|
|
34
34
|
values: any[];
|
|
35
35
|
fields: SelectField[];
|
|
36
36
|
orderBy?: OrderByField[];
|
|
37
|
-
user
|
|
37
|
+
user: User;
|
|
38
38
|
alias?: string;
|
|
39
39
|
totalizeMode?: TotalizeMode;
|
|
40
40
|
}
|
|
41
41
|
export interface FindByPucaPidArgs {
|
|
42
42
|
pucaPid: string;
|
|
43
43
|
fields: SelectField[];
|
|
44
|
-
user
|
|
44
|
+
user: User;
|
|
45
45
|
join?: Join[];
|
|
46
46
|
alias?: string;
|
|
47
47
|
}
|
|
@@ -49,7 +49,7 @@ export interface FindOneByArgs {
|
|
|
49
49
|
key: string | string[];
|
|
50
50
|
value: any | any[];
|
|
51
51
|
fields: SelectField[];
|
|
52
|
-
user
|
|
52
|
+
user: User;
|
|
53
53
|
groupBy?: SelectField[];
|
|
54
54
|
alias?: string;
|
|
55
55
|
}
|
|
@@ -61,7 +61,7 @@ export interface FindByArgs {
|
|
|
61
61
|
pageSize?: number;
|
|
62
62
|
orderBy?: OrderByField[];
|
|
63
63
|
groupBy?: SelectField[];
|
|
64
|
-
user
|
|
64
|
+
user: User;
|
|
65
65
|
alias?: string;
|
|
66
66
|
totalizeMode?: TotalizeMode;
|
|
67
67
|
}
|
|
@@ -69,7 +69,7 @@ export interface FindOneWhereArgs {
|
|
|
69
69
|
fields: SelectField[];
|
|
70
70
|
args: Object;
|
|
71
71
|
where?: Where;
|
|
72
|
-
user
|
|
72
|
+
user: User;
|
|
73
73
|
groupBy?: SelectField[];
|
|
74
74
|
join?: Join[];
|
|
75
75
|
alias?: string;
|
|
@@ -77,7 +77,7 @@ export interface FindOneWhereArgs {
|
|
|
77
77
|
export interface CountByArgs {
|
|
78
78
|
key: string;
|
|
79
79
|
value: any;
|
|
80
|
-
user
|
|
80
|
+
user: User;
|
|
81
81
|
groupBy?: SelectField[];
|
|
82
82
|
alias?: string;
|
|
83
83
|
}
|
|
@@ -85,7 +85,7 @@ export interface CountWhereArgs {
|
|
|
85
85
|
where?: Where;
|
|
86
86
|
args?: Object;
|
|
87
87
|
join?: Join[];
|
|
88
|
-
user
|
|
88
|
+
user: User;
|
|
89
89
|
groupBy?: SelectField[];
|
|
90
90
|
alias?: string;
|
|
91
91
|
}
|
|
@@ -96,7 +96,7 @@ export interface FindAllArgs {
|
|
|
96
96
|
orderBy?: OrderByField[];
|
|
97
97
|
groupBy?: SelectField[];
|
|
98
98
|
join?: Join[];
|
|
99
|
-
user
|
|
99
|
+
user: User;
|
|
100
100
|
alias?: string;
|
|
101
101
|
}
|
|
102
102
|
export declare class Repository<T extends {
|
|
@@ -111,27 +111,26 @@ export declare class Repository<T extends {
|
|
|
111
111
|
private readonly log;
|
|
112
112
|
constructor(transaction: Transaction, redisClient: RedisClient, sqlServiceFunc: () => SqlService, uuidService: UuidService, table: string, autoCommit: boolean);
|
|
113
113
|
findByIn({ key, values, fields, orderBy, user, alias, totalizeMode, }: FindByInArgs): Promise<T[]>;
|
|
114
|
-
findByPucaPid({ pucaPid, fields, user, alias }: FindByPucaPidArgs): Promise<T>;
|
|
114
|
+
findByPucaPid({ pucaPid, fields, user, alias, }: FindByPucaPidArgs): Promise<T>;
|
|
115
115
|
findOneBy(args: FindOneByArgs): Promise<T>;
|
|
116
116
|
findOneWhere(args: FindOneWhereArgs): Promise<T>;
|
|
117
|
-
countBy({ key, value, user, groupBy, alias }: CountByArgs): Promise<number>;
|
|
118
|
-
countWhere({ where, args, join, user, groupBy, alias: oAlias }: CountWhereArgs): Promise<number>;
|
|
119
|
-
findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode, user, groupBy, alias }: FindWhereArgs): Promise<SelectResult<T>>;
|
|
117
|
+
countBy({ key, value, user, groupBy, alias, }: CountByArgs): Promise<number>;
|
|
118
|
+
countWhere({ where, args, join, user, groupBy, alias: oAlias, }: CountWhereArgs): Promise<number>;
|
|
119
|
+
findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode, user, groupBy, alias, }: FindWhereArgs): Promise<SelectResult<T>>;
|
|
120
120
|
findBy({ key: originalKey, value: originalValue, fields, page, pageSize, orderBy, groupBy, user, alias, totalizeMode, }: FindByArgs): Promise<SelectResult<T>>;
|
|
121
|
-
countAll(args
|
|
122
|
-
user
|
|
121
|
+
countAll(args: {
|
|
122
|
+
user: User;
|
|
123
123
|
}): Promise<number>;
|
|
124
|
-
findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias }: FindAllArgs): Promise<SelectResult<T>>;
|
|
124
|
+
findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias, }: FindAllArgs): Promise<SelectResult<T>>;
|
|
125
125
|
private _insert;
|
|
126
126
|
private insert;
|
|
127
127
|
private upinsert;
|
|
128
128
|
save(args: {
|
|
129
129
|
entity: T;
|
|
130
130
|
user: User;
|
|
131
|
-
options?: {};
|
|
132
131
|
}): Promise<T>;
|
|
133
132
|
delete({ puca_pid, user }: {
|
|
134
|
-
puca_pid:
|
|
133
|
+
puca_pid: string;
|
|
135
134
|
user: User;
|
|
136
135
|
}): Promise<void>;
|
|
137
136
|
}
|
|
@@ -40,13 +40,13 @@ class Repository {
|
|
|
40
40
|
});
|
|
41
41
|
return retorno.data;
|
|
42
42
|
}
|
|
43
|
-
async findByPucaPid({ pucaPid, fields, user, alias }) {
|
|
43
|
+
async findByPucaPid({ pucaPid, fields, user, alias, }) {
|
|
44
44
|
return await this.findOneBy({
|
|
45
45
|
fields,
|
|
46
46
|
key: `${alias || this.table}.puca_pid`,
|
|
47
47
|
value: pucaPid,
|
|
48
48
|
user,
|
|
49
|
-
alias
|
|
49
|
+
alias,
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
async findOneBy(args) {
|
|
@@ -57,7 +57,7 @@ class Repository {
|
|
|
57
57
|
const result = await this.findWhere(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: [`${args.alias || this.table}.puca_created_at`], totalizeMode: TotalizeMode.never }));
|
|
58
58
|
return _.get(result.data, 0);
|
|
59
59
|
}
|
|
60
|
-
async countBy({ key, value, user, groupBy, alias }) {
|
|
60
|
+
async countBy({ key, value, user, groupBy, alias, }) {
|
|
61
61
|
return await this.countWhere({
|
|
62
62
|
args: {
|
|
63
63
|
value,
|
|
@@ -69,10 +69,10 @@ class Repository {
|
|
|
69
69
|
},
|
|
70
70
|
user,
|
|
71
71
|
groupBy,
|
|
72
|
-
alias
|
|
72
|
+
alias,
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
|
-
async countWhere({ where, args, join, user, groupBy, alias: oAlias }) {
|
|
75
|
+
async countWhere({ where, args, join, user, groupBy, alias: oAlias, }) {
|
|
76
76
|
const alias = oAlias || this.table;
|
|
77
77
|
const sqlService = this.sqlServiceFunc();
|
|
78
78
|
if (!_.isEmpty(groupBy)) {
|
|
@@ -92,7 +92,8 @@ class Repository {
|
|
|
92
92
|
args,
|
|
93
93
|
where,
|
|
94
94
|
groupBy,
|
|
95
|
-
|
|
95
|
+
user,
|
|
96
|
+
});
|
|
96
97
|
const result = await this.transaction.exec(command);
|
|
97
98
|
return result.length;
|
|
98
99
|
}
|
|
@@ -112,12 +113,13 @@ class Repository {
|
|
|
112
113
|
join,
|
|
113
114
|
args: Object.assign(Object.assign({}, args), { one: 1 }),
|
|
114
115
|
where,
|
|
115
|
-
|
|
116
|
+
user,
|
|
117
|
+
});
|
|
116
118
|
const result = await this.transaction.exec(command);
|
|
117
119
|
return result[0].count;
|
|
118
120
|
}
|
|
119
121
|
}
|
|
120
|
-
async findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode, user, groupBy, alias }) {
|
|
122
|
+
async findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode, user, groupBy, alias, }) {
|
|
121
123
|
const limit = page ? pageSize || 20 : pageSize;
|
|
122
124
|
const offset = ((page || 1) - 1) * (pageSize || 20);
|
|
123
125
|
const command = this.sqlServiceFunc().select({
|
|
@@ -133,7 +135,8 @@ class Repository {
|
|
|
133
135
|
offset,
|
|
134
136
|
orderBy,
|
|
135
137
|
groupBy,
|
|
136
|
-
|
|
138
|
+
user,
|
|
139
|
+
});
|
|
137
140
|
const totalize = {
|
|
138
141
|
[TotalizeMode.never]: false,
|
|
139
142
|
[TotalizeMode.auto]: !!(limit || offset)
|
|
@@ -147,7 +150,7 @@ class Repository {
|
|
|
147
150
|
where,
|
|
148
151
|
user,
|
|
149
152
|
groupBy,
|
|
150
|
-
alias
|
|
153
|
+
alias,
|
|
151
154
|
})
|
|
152
155
|
: new Promise(r => r(null)),
|
|
153
156
|
]);
|
|
@@ -191,13 +194,13 @@ class Repository {
|
|
|
191
194
|
groupBy,
|
|
192
195
|
user,
|
|
193
196
|
alias,
|
|
194
|
-
totalizeMode
|
|
197
|
+
totalizeMode,
|
|
195
198
|
});
|
|
196
199
|
}
|
|
197
|
-
async countAll(args
|
|
198
|
-
return await this.countWhere(
|
|
200
|
+
async countAll(args) {
|
|
201
|
+
return await this.countWhere(args);
|
|
199
202
|
}
|
|
200
|
-
async findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias }) {
|
|
203
|
+
async findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias, }) {
|
|
201
204
|
return await this.findWhere({
|
|
202
205
|
fields,
|
|
203
206
|
join,
|
|
@@ -207,10 +210,10 @@ class Repository {
|
|
|
207
210
|
user,
|
|
208
211
|
groupBy,
|
|
209
212
|
alias,
|
|
210
|
-
totalizeMode: TotalizeMode.never
|
|
213
|
+
totalizeMode: TotalizeMode.never,
|
|
211
214
|
});
|
|
212
215
|
}
|
|
213
|
-
async _insert({ entity: originalEntity, user,
|
|
216
|
+
async _insert({ entity: originalEntity, user, }) {
|
|
214
217
|
const entity = _.cloneDeep(originalEntity);
|
|
215
218
|
if (!entity.puca_pid) {
|
|
216
219
|
entity.puca_pid = this.uuidService.v4();
|
|
@@ -218,7 +221,8 @@ class Repository {
|
|
|
218
221
|
const commands = this.sqlServiceFunc().insert({
|
|
219
222
|
tableName: this.table,
|
|
220
223
|
values: entity,
|
|
221
|
-
|
|
224
|
+
user
|
|
225
|
+
});
|
|
222
226
|
await this.transaction.serialExec(commands);
|
|
223
227
|
return entity;
|
|
224
228
|
}
|
|
@@ -256,7 +260,8 @@ class Repository {
|
|
|
256
260
|
}, {}),
|
|
257
261
|
args: entity,
|
|
258
262
|
puca_pid: entity.puca_pid,
|
|
259
|
-
|
|
263
|
+
user
|
|
264
|
+
});
|
|
260
265
|
try {
|
|
261
266
|
const response = await this.transaction.serialExec(commands);
|
|
262
267
|
if (!response
|
|
@@ -268,6 +273,9 @@ class Repository {
|
|
|
268
273
|
});
|
|
269
274
|
entity.puca_pid = inserted.puca_pid;
|
|
270
275
|
}
|
|
276
|
+
this.transaction.afterCommit(async () => {
|
|
277
|
+
await this.redisClient.publish(`${this.table}.change`, entity.puca_pid);
|
|
278
|
+
});
|
|
271
279
|
if (this.autoCommit) {
|
|
272
280
|
await this.transaction.commit();
|
|
273
281
|
}
|
|
@@ -278,24 +286,27 @@ class Repository {
|
|
|
278
286
|
throw e;
|
|
279
287
|
}
|
|
280
288
|
}
|
|
281
|
-
await this.redisClient.publish(`${this.table}.change`, entity.puca_pid);
|
|
282
289
|
return entity;
|
|
283
290
|
}
|
|
284
291
|
async save(args) {
|
|
285
292
|
if (args.entity.puca_pid) {
|
|
286
|
-
return this.upinsert(args);
|
|
293
|
+
return await this.upinsert(args);
|
|
287
294
|
}
|
|
288
295
|
else {
|
|
289
|
-
return this.insert(args);
|
|
296
|
+
return await this.insert(args);
|
|
290
297
|
}
|
|
291
298
|
}
|
|
292
299
|
async delete({ puca_pid, user }) {
|
|
293
300
|
const commands = this.sqlServiceFunc().delete({
|
|
294
301
|
tableName: this.table,
|
|
295
302
|
puca_pid,
|
|
296
|
-
|
|
303
|
+
user,
|
|
304
|
+
});
|
|
297
305
|
try {
|
|
298
306
|
await this.transaction.serialExec(commands);
|
|
307
|
+
this.transaction.afterCommit(async () => {
|
|
308
|
+
await this.redisClient.publish(`${this.table}.change`, puca_pid);
|
|
309
|
+
});
|
|
299
310
|
if (this.autoCommit) {
|
|
300
311
|
await this.transaction.commit();
|
|
301
312
|
}
|
|
@@ -306,7 +317,6 @@ class Repository {
|
|
|
306
317
|
throw e;
|
|
307
318
|
}
|
|
308
319
|
}
|
|
309
|
-
await this.redisClient.publish(`${this.table}.change`, puca_pid);
|
|
310
320
|
}
|
|
311
321
|
}
|
|
312
322
|
exports.Repository = Repository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/orm/services/repository.ts"],"names":[],"mappings":";;;AACA,4BAA4B;AAG5B,uDAAoD;AAEpD,uDAAsG;AAYtG,IAAY,YAEX;AAFD,WAAY,YAAY;IACtB,6BAAa,CAAA;IAAE,+BAAe,CAAA;AAChC,CAAC,EAFW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAEvB;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/orm/services/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.simplifyWhere = void 0;
|
|
4
|
+
const simplifyWhere = (w) => {
|
|
5
|
+
if (!w) {
|
|
6
|
+
return null;
|
|
7
|
+
}
|
|
8
|
+
else if ('exists' in w) {
|
|
9
|
+
const join = (w.exists.join || [])
|
|
10
|
+
.map(j => (Object.assign(Object.assign({}, j), { on: exports.simplifyWhere(j.on) })))
|
|
11
|
+
.filter(j => j);
|
|
12
|
+
return {
|
|
13
|
+
exists: Object.assign(Object.assign({}, w.exists), { join, where: exports.simplifyWhere(w.exists.where) })
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
else if ('not' in w) {
|
|
17
|
+
return { not: exports.simplifyWhere(w.not) };
|
|
18
|
+
}
|
|
19
|
+
else if ('or' in w) {
|
|
20
|
+
const or = w.or
|
|
21
|
+
.map(w => exports.simplifyWhere(w))
|
|
22
|
+
.filter(w => w);
|
|
23
|
+
if (or.length === 0) {
|
|
24
|
+
return { or: [] };
|
|
25
|
+
}
|
|
26
|
+
else if (or.length === 1) {
|
|
27
|
+
return or[0];
|
|
28
|
+
}
|
|
29
|
+
return { or };
|
|
30
|
+
}
|
|
31
|
+
else if ('and' in w) {
|
|
32
|
+
const and = w.and
|
|
33
|
+
.map(w => exports.simplifyWhere(w))
|
|
34
|
+
.filter(w => w);
|
|
35
|
+
if (and.length === 0) {
|
|
36
|
+
return { and: [] };
|
|
37
|
+
}
|
|
38
|
+
else if (and.length === 1) {
|
|
39
|
+
return and[0];
|
|
40
|
+
}
|
|
41
|
+
return { and };
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
return w;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
exports.simplifyWhere = simplifyWhere;
|
|
48
|
+
//# sourceMappingURL=helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/orm/services/sql/helpers.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAS,EAAE;IAC/C,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,QAAQ,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;aAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCAAM,CAAC,KAAE,EAAE,EAAE,qBAAa,CAAC,CAAC,CAAC,EAAE,CAAC,IAAG,CAAC;aAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjB,OAAO;YACL,MAAM,kCACD,CAAC,CAAC,MAAM,KACX,IAAI,EACJ,KAAK,EAAE,qBAAa,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GACrC;SACF,CAAA;KACF;SAAM,IAAI,KAAK,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,GAAG,EAAE,qBAAa,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAA;KACrC;SAAM,IAAI,IAAI,IAAI,CAAC,EAAE;QACpB,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE;aACZ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAa,CAAC,CAAC,CAAC,CAAC;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjB,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;SAClB;aAAM,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;SACb;QACD,OAAO,EAAE,EAAE,EAAE,CAAA;KACd;SAAM,IAAI,KAAK,IAAI,CAAC,EAAE;QACrB,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG;aACd,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAa,CAAC,CAAC,CAAC,CAAC;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACjB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAAA;SACnB;aAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,GAAG,CAAC,CAAC,CAAC,CAAA;SACd;QACD,OAAO,EAAE,GAAG,EAAE,CAAA;KACf;SAAM;QACL,OAAO,CAAC,CAAA;KACT;AACH,CAAC,CAAA;AAvCY,QAAA,aAAa,iBAuCzB"}
|