@puca/puca-core 6.0.1 → 6.1.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/cache.service.d.ts +2 -0
- package/dist/core/services/cache.service.js +16 -1
- package/dist/core/services/cache.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.js +0 -1
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/orm/services/repository.d.ts +11 -7
- package/dist/orm/services/repository.js +24 -14
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,9 @@ export declare class CacheService<K, R> {
|
|
|
4
4
|
private readonly fetch;
|
|
5
5
|
private readonly lifetimeInSeconds;
|
|
6
6
|
constructor(redisManagerService: RedisManagerService, fetch: (keyObj: K) => Promise<R>, lifetimeInSeconds: number);
|
|
7
|
+
invalidate(keyObj: K): Promise<void>;
|
|
7
8
|
get(keyObj: K): Promise<R>;
|
|
9
|
+
private buildKeyStr;
|
|
8
10
|
}
|
|
9
11
|
export declare class CacheServiceFactory {
|
|
10
12
|
private readonly redisManagerService;
|
|
@@ -8,8 +8,20 @@ class CacheService {
|
|
|
8
8
|
this.fetch = fetch;
|
|
9
9
|
this.lifetimeInSeconds = lifetimeInSeconds;
|
|
10
10
|
}
|
|
11
|
+
async invalidate(keyObj) {
|
|
12
|
+
return new Promise((resolve, reject) => {
|
|
13
|
+
const redisClient = this.redisManagerService.get();
|
|
14
|
+
redisClient.del(this.buildKeyStr(keyObj), (err) => {
|
|
15
|
+
if (err) {
|
|
16
|
+
reject(err);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
resolve();
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
}
|
|
11
23
|
async get(keyObj) {
|
|
12
|
-
const keyStr =
|
|
24
|
+
const keyStr = this.buildKeyStr(keyObj);
|
|
13
25
|
return new Promise((resolve, reject) => {
|
|
14
26
|
const redisClient = this.redisManagerService.get();
|
|
15
27
|
redisClient.get(keyStr, (err, reply) => {
|
|
@@ -43,6 +55,9 @@ class CacheService {
|
|
|
43
55
|
});
|
|
44
56
|
});
|
|
45
57
|
}
|
|
58
|
+
buildKeyStr(keyObj) {
|
|
59
|
+
return 'cache-' + crypto_1.createHash('md5').update(JSON.stringify(keyObj)).digest('hex');
|
|
60
|
+
}
|
|
46
61
|
}
|
|
47
62
|
exports.CacheService = CacheService;
|
|
48
63
|
class CacheServiceFactory {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/core/services/cache.service.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAGnC,MAAa,YAAY;IACvB,YACmB,mBAAwC,EACxC,KAAgC,EAChC,iBAAyB;QAFzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,UAAK,GAAL,KAAK,CAA2B;QAChC,sBAAiB,GAAjB,iBAAiB,CAAQ;IACxC,CAAC;IAEL,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/core/services/cache.service.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAGnC,MAAa,YAAY;IACvB,YACmB,mBAAwC,EACxC,KAAgC,EAChC,iBAAyB;QAFzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,UAAK,GAAL,KAAK,CAA2B;QAChC,sBAAiB,GAAjB,iBAAiB,CAAQ;IACxC,CAAC;IAEL,KAAK,CAAC,UAAU,CAAC,MAAS;QACxB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAA;YAClD,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBAChD,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAA;oBACX,OAAM;iBACP;gBACD,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAS;QACjB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAEvC,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAA;YAClD,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACrC,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAA;oBACX,OAAM;iBACP;gBAED,IAAI,CAAC,KAAK,EAAE;oBACV,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAC9B,WAAW,CAAC,KAAK,CACf,MAAM,EACN,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,WAAW,EACpC,CAAC,GAAG,EAAE,EAAE;4BACN,IAAI,GAAG,EAAE;gCACP,MAAM,CAAC,GAAG,CAAC,CAAA;gCACX,OAAM;6BACP;4BACD,OAAO,CAAC,KAAK,CAAC,CAAA;wBAChB,CAAC,CAAC,CAAA;oBACN,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBACb,IAAI,GAAG,EAAE;4BACP,MAAM,CAAC,GAAG,CAAC,CAAA;4BACX,OAAM;yBACP;oBACH,CAAC,CAAC,CAAA;iBACH;qBAAM,IAAI,KAAK,KAAK,WAAW,EAAE;oBAChC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACb,OAAM;iBACP;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC3B;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,WAAW,CAAC,MAAS;QAC3B,OAAO,QAAQ,GAAG,mBAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnF,CAAC;CACF;AA/DD,oCA+DC;AAED,MAAa,mBAAmB;IAC9B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,GAAG,CAAO,KAAgC,EAAE,iBAAyB;QACnE,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAA;IAC7E,CAAC;CACF;AAND,kDAMC"}
|
|
@@ -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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"}
|
|
@@ -4,6 +4,10 @@ import { User } from '../../models/user';
|
|
|
4
4
|
import { SqlService } from '../cases/sql/sql.service';
|
|
5
5
|
import { Database } from './managers/database-manager.service';
|
|
6
6
|
import { RedisClient } from 'redis';
|
|
7
|
+
export declare enum TotalizeMode {
|
|
8
|
+
auto = "auto",
|
|
9
|
+
never = "never"
|
|
10
|
+
}
|
|
7
11
|
export interface FindWhereArgs {
|
|
8
12
|
where?: Where;
|
|
9
13
|
args?: any;
|
|
@@ -11,11 +15,11 @@ export interface FindWhereArgs {
|
|
|
11
15
|
page?: number;
|
|
12
16
|
pageSize?: number;
|
|
13
17
|
orderBy?: OrderByField[];
|
|
14
|
-
totalize?: boolean;
|
|
15
18
|
join?: Join[];
|
|
16
19
|
user?: User;
|
|
17
20
|
groupBy?: SelectField[];
|
|
18
21
|
alias?: string;
|
|
22
|
+
totalizeMode?: TotalizeMode;
|
|
19
23
|
}
|
|
20
24
|
export interface FindByInArgs {
|
|
21
25
|
key: string;
|
|
@@ -24,6 +28,7 @@ export interface FindByInArgs {
|
|
|
24
28
|
orderBy?: OrderByField[];
|
|
25
29
|
user?: User;
|
|
26
30
|
alias?: string;
|
|
31
|
+
totalizeMode?: TotalizeMode;
|
|
27
32
|
}
|
|
28
33
|
export interface FindByPucaPidArgs {
|
|
29
34
|
pucaPid: string;
|
|
@@ -72,9 +77,9 @@ export interface FindByArgs {
|
|
|
72
77
|
pageSize?: number;
|
|
73
78
|
orderBy?: OrderByField[];
|
|
74
79
|
groupBy?: SelectField[];
|
|
75
|
-
totalize?: boolean;
|
|
76
80
|
user?: User;
|
|
77
81
|
alias?: string;
|
|
82
|
+
totalizeMode?: TotalizeMode;
|
|
78
83
|
}
|
|
79
84
|
export interface FindAllArgs {
|
|
80
85
|
fields: SelectField[];
|
|
@@ -82,7 +87,6 @@ export interface FindAllArgs {
|
|
|
82
87
|
pageSize?: number;
|
|
83
88
|
orderBy?: OrderByField[];
|
|
84
89
|
groupBy?: SelectField[];
|
|
85
|
-
totalize?: boolean;
|
|
86
90
|
join?: Join[];
|
|
87
91
|
user?: User;
|
|
88
92
|
alias?: string;
|
|
@@ -97,18 +101,18 @@ export declare class Repository<T extends {
|
|
|
97
101
|
private readonly table;
|
|
98
102
|
private readonly log;
|
|
99
103
|
constructor(database: Database, redisClient: RedisClient, sqlService: SqlService, uuidService: UuidService, table: string);
|
|
100
|
-
findByIn({ key, values, fields, orderBy, user, alias }: FindByInArgs): Promise<T[]>;
|
|
104
|
+
findByIn({ key, values, fields, orderBy, user, alias, totalizeMode, }: FindByInArgs): Promise<T[]>;
|
|
101
105
|
findByPucaPid({ pucaPid, fields, user, alias }: FindByPucaPidArgs): Promise<T>;
|
|
102
106
|
findOneBy(args: FindOneByArgs): Promise<T>;
|
|
103
107
|
findOneWhere(args: FindOneWhereArgs): Promise<T>;
|
|
104
108
|
countBy({ key, value, user, groupBy, alias }: CountByArgs): Promise<number>;
|
|
105
109
|
countWhere({ where, args, join, user, groupBy, alias }: CountWhereArgs): Promise<number>;
|
|
106
|
-
findWhere({ args, where, fields, join, page, pageSize, orderBy,
|
|
107
|
-
findBy({ key, value, fields, page, pageSize, orderBy, groupBy,
|
|
110
|
+
findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode, user, groupBy, alias }: FindWhereArgs): Promise<SelectResult<T>>;
|
|
111
|
+
findBy({ key, value, fields, page, pageSize, orderBy, groupBy, user, alias, totalizeMode, }: FindByArgs): Promise<SelectResult<T>>;
|
|
108
112
|
countAll(args?: {
|
|
109
113
|
user?: User;
|
|
110
114
|
}): Promise<number>;
|
|
111
|
-
findAll({ fields, page, pageSize, orderBy, groupBy,
|
|
115
|
+
findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias }: FindAllArgs): Promise<SelectResult<T>>;
|
|
112
116
|
private insert;
|
|
113
117
|
private upinsert;
|
|
114
118
|
save(args: {
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Repository = void 0;
|
|
3
|
+
exports.Repository = exports.TotalizeMode = void 0;
|
|
4
4
|
const interfaces_1 = require("../interfaces");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const logger_1 = require("../../core/services/logger");
|
|
7
|
+
var TotalizeMode;
|
|
8
|
+
(function (TotalizeMode) {
|
|
9
|
+
TotalizeMode["auto"] = "auto";
|
|
10
|
+
TotalizeMode["never"] = "never";
|
|
11
|
+
})(TotalizeMode = exports.TotalizeMode || (exports.TotalizeMode = {}));
|
|
7
12
|
class Repository {
|
|
8
13
|
constructor(database, redisClient, sqlService, uuidService, table) {
|
|
9
14
|
this.database = database;
|
|
@@ -13,7 +18,7 @@ class Repository {
|
|
|
13
18
|
this.table = table;
|
|
14
19
|
this.log = new logger_1.Logger('Repository');
|
|
15
20
|
}
|
|
16
|
-
async findByIn({ key, values, fields, orderBy, user, alias }) {
|
|
21
|
+
async findByIn({ key, values, fields, orderBy, user, alias, totalizeMode = TotalizeMode.auto, }) {
|
|
17
22
|
const retorno = await this.findWhere({
|
|
18
23
|
fields,
|
|
19
24
|
args: values.reduce((r, v, i) => {
|
|
@@ -29,7 +34,8 @@ class Repository {
|
|
|
29
34
|
},
|
|
30
35
|
orderBy,
|
|
31
36
|
user,
|
|
32
|
-
alias
|
|
37
|
+
alias,
|
|
38
|
+
totalizeMode,
|
|
33
39
|
});
|
|
34
40
|
return retorno.data;
|
|
35
41
|
}
|
|
@@ -43,11 +49,11 @@ class Repository {
|
|
|
43
49
|
});
|
|
44
50
|
}
|
|
45
51
|
async findOneBy(args) {
|
|
46
|
-
const result = await this.findBy(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: [`${args.alias || this.table}.puca_created_at`] }));
|
|
52
|
+
const result = await this.findBy(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: [`${args.alias || this.table}.puca_created_at`], totalizeMode: TotalizeMode.never }));
|
|
47
53
|
return _.get(result.data, 0);
|
|
48
54
|
}
|
|
49
55
|
async findOneWhere(args) {
|
|
50
|
-
const result = await this.findWhere(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: ['puca_created_at'] }));
|
|
56
|
+
const result = await this.findWhere(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: ['puca_created_at'], totalizeMode: TotalizeMode.never }));
|
|
51
57
|
return _.get(result.data, 0);
|
|
52
58
|
}
|
|
53
59
|
async countBy({ key, value, user, groupBy, alias }) {
|
|
@@ -108,7 +114,7 @@ class Repository {
|
|
|
108
114
|
return result[0].count;
|
|
109
115
|
}
|
|
110
116
|
}
|
|
111
|
-
async findWhere({ args, where, fields, join, page, pageSize, orderBy,
|
|
117
|
+
async findWhere({ args, where, fields, join, page, pageSize, orderBy, totalizeMode = TotalizeMode.auto, user, groupBy, alias }) {
|
|
112
118
|
const limit = page ? pageSize || 20 : pageSize;
|
|
113
119
|
const offset = (page - 1) * (pageSize || 20);
|
|
114
120
|
const command = this.sqlService.select({
|
|
@@ -125,9 +131,13 @@ class Repository {
|
|
|
125
131
|
orderBy,
|
|
126
132
|
groupBy,
|
|
127
133
|
}, user);
|
|
134
|
+
const totalize = {
|
|
135
|
+
[TotalizeMode.never]: false,
|
|
136
|
+
[TotalizeMode.auto]: !!(limit || offset)
|
|
137
|
+
}[totalizeMode];
|
|
128
138
|
const [result, count] = await Promise.all([
|
|
129
139
|
this.database.exec(command),
|
|
130
|
-
totalize
|
|
140
|
+
totalize
|
|
131
141
|
? this.countWhere({
|
|
132
142
|
join,
|
|
133
143
|
args,
|
|
@@ -144,11 +154,11 @@ class Repository {
|
|
|
144
154
|
page: +page || null,
|
|
145
155
|
pageSize: +pageSize || null,
|
|
146
156
|
totalPages: pageSize ? Math.ceil(count / pageSize) : null,
|
|
147
|
-
totalItems: totalize
|
|
157
|
+
totalItems: totalize ? +count : null,
|
|
148
158
|
};
|
|
149
159
|
return retorno;
|
|
150
160
|
}
|
|
151
|
-
async findBy({ key, value, fields, page, pageSize, orderBy, groupBy,
|
|
161
|
+
async findBy({ key, value, fields, page, pageSize, orderBy, groupBy, user, alias, totalizeMode = TotalizeMode.auto, }) {
|
|
152
162
|
return await this.findWhere({
|
|
153
163
|
fields,
|
|
154
164
|
args: {
|
|
@@ -161,27 +171,27 @@ class Repository {
|
|
|
161
171
|
},
|
|
162
172
|
page,
|
|
163
173
|
pageSize,
|
|
164
|
-
totalize,
|
|
165
174
|
orderBy,
|
|
166
175
|
groupBy,
|
|
167
176
|
user,
|
|
168
|
-
alias
|
|
177
|
+
alias,
|
|
178
|
+
totalizeMode
|
|
169
179
|
});
|
|
170
180
|
}
|
|
171
181
|
async countAll(args = {}) {
|
|
172
182
|
return await this.countWhere({ user: args.user });
|
|
173
183
|
}
|
|
174
|
-
async findAll({ fields, page, pageSize, orderBy, groupBy,
|
|
184
|
+
async findAll({ fields, page, pageSize, orderBy, groupBy, join, user, alias }) {
|
|
175
185
|
return await this.findWhere({
|
|
176
186
|
fields,
|
|
177
187
|
join,
|
|
178
188
|
orderBy,
|
|
179
189
|
page,
|
|
180
190
|
pageSize,
|
|
181
|
-
totalize,
|
|
182
191
|
user,
|
|
183
192
|
groupBy,
|
|
184
|
-
alias
|
|
193
|
+
alias,
|
|
194
|
+
totalizeMode: TotalizeMode.never
|
|
185
195
|
});
|
|
186
196
|
}
|
|
187
197
|
async insert({ entity, user, options, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/orm/services/repository.ts"],"names":[],"mappings":";;;AAAA,8CAOuB;AAEvB,4BAA4B;AAI5B,uDAAoD;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/orm/services/repository.ts"],"names":[],"mappings":"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"}
|