@puca/puca-core 12.1.3 → 12.1.4
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/index.js +3 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +3 -3
- package/dist/core/services/install.service.js +3 -3
- package/dist/core/services/migration/migration.service.d.ts +3 -5
- package/dist/core/services/migration/migration.service.js +8 -9
- package/dist/core/services/migration/migration.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -3
- package/dist/core/services/storage/implementation/s3-client.service.js +4 -4
- package/dist/core/services/storage/storage.service.d.ts +3 -3
- package/dist/core/services/storage/storage.service.js +3 -3
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository-redis.js +3 -3
- package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository.js +3 -3
- package/dist/orm/services/cache.service.d.ts +5 -5
- package/dist/orm/services/cache.service.js +12 -11
- package/dist/orm/services/cache.service.js.map +1 -1
- package/dist/orm/services/index.d.ts +2 -2
- package/dist/orm/services/index.js +6 -6
- package/dist/orm/services/repository-factory.d.ts +3 -3
- package/dist/orm/services/repository-factory.js +4 -4
- package/dist/orm/services/repository.d.ts +3 -3
- package/dist/orm/services/repository.js +5 -5
- package/dist/orm/services/secundary-database/secundary-database.service.d.ts +4 -2
- package/dist/orm/services/secundary-database/secundary-database.service.js +25 -13
- package/dist/orm/services/secundary-database/secundary-database.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sqlParserService = exports.sqlService = exports.repositoryFactory = exports.cacheServiceFactory = exports.
|
|
3
|
+
exports.sqlParserService = exports.sqlService = exports.repositoryFactory = exports.cacheServiceFactory = exports.secondaryDataBase = exports.transactionFactory = exports.databaseManagerService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
5
|
const sql_service_1 = require("./sql/sql.service");
|
|
6
6
|
const repository_factory_1 = require("./repository-factory");
|
|
@@ -14,11 +14,11 @@ const multi_tentant_adapter_1 = require("../../plugins/multi-tenant/multi-tentan
|
|
|
14
14
|
const secundary_database_service_1 = require("./secundary-database/secundary-database.service");
|
|
15
15
|
exports.databaseManagerService = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new database_manager_service_1.DatabaseManagerService(essential_1.configService.get(domain)), async (domain, databaseManagerService) => await databaseManagerService.connect());
|
|
16
16
|
exports.transactionFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new transaction_1.TransactionFactory(exports.databaseManagerService.get(domain)));
|
|
17
|
-
exports.
|
|
18
|
-
return new secundary_database_service_1.
|
|
19
|
-
}, async (domain,
|
|
20
|
-
exports.cacheServiceFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new cache_service_1.CacheServiceFactory(exports.
|
|
17
|
+
exports.secondaryDataBase = new multi_tentant_adapter_1.MultiTenantAdapter(domain => {
|
|
18
|
+
return new secundary_database_service_1.SecondaryDatabase(domain, essential_1.configService.get(domain));
|
|
19
|
+
}, async (domain, secondaryDataBase) => await secondaryDataBase.init(), async (domain, secondaryDataBase) => await secondaryDataBase.destroy());
|
|
20
|
+
exports.cacheServiceFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new cache_service_1.CacheServiceFactory(exports.secondaryDataBase.get(domain), essential_1.envConfigService.get(domain)));
|
|
21
21
|
exports.sqlService = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new sql_service_1.SqlService(cases_1.cSqlService, () => exports.repositoryFactory.get(domain), essential_1.envConfigService.get(domain)));
|
|
22
|
-
exports.repositoryFactory = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new repository_factory_1.RepositoryFactory(exports.
|
|
22
|
+
exports.repositoryFactory = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new repository_factory_1.RepositoryFactory(exports.secondaryDataBase.get(domain), exports.databaseManagerService.get(domain), exports.transactionFactory.get(domain), () => exports.sqlService.get(domain), plugins_1.uuidService));
|
|
23
23
|
exports.sqlParserService = new sql_parser_service_1.SqlParserService();
|
|
24
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -4,19 +4,19 @@ import { CacheRepository } from './cache-repository/cache-repository';
|
|
|
4
4
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
5
5
|
import { Repository } from './repository';
|
|
6
6
|
import { Transaction, TransactionFactory } from './transaction';
|
|
7
|
-
import {
|
|
7
|
+
import { SecondaryDatabase } from './secundary-database/secundary-database.service';
|
|
8
8
|
export interface CacheInstanceList {
|
|
9
9
|
tableName: string;
|
|
10
10
|
cacheRepository: CacheRepository<any>;
|
|
11
11
|
}
|
|
12
12
|
export declare class RepositoryFactory {
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly secondaryDataBase;
|
|
14
14
|
private readonly databaseManagerService;
|
|
15
15
|
private readonly transactionFactory;
|
|
16
16
|
private readonly funcSqlService;
|
|
17
17
|
private readonly uuidService;
|
|
18
18
|
private readonly cacheInstances;
|
|
19
|
-
constructor(
|
|
19
|
+
constructor(secondaryDataBase: SecondaryDatabase, databaseManagerService: DatabaseManagerService, transactionFactory: TransactionFactory, funcSqlService: () => SqlService, uuidService: UuidService);
|
|
20
20
|
getInstance<T>({ tableName, transaction: oTransaction }: {
|
|
21
21
|
tableName: string;
|
|
22
22
|
transaction?: Transaction;
|
|
@@ -5,8 +5,8 @@ const cache_repository_1 = require("./cache-repository/cache-repository");
|
|
|
5
5
|
const repository_1 = require("./repository");
|
|
6
6
|
const sql_executor_1 = require("./sql-executor");
|
|
7
7
|
class RepositoryFactory {
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
8
|
+
constructor(secondaryDataBase, databaseManagerService, transactionFactory, funcSqlService, uuidService) {
|
|
9
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
10
10
|
this.databaseManagerService = databaseManagerService;
|
|
11
11
|
this.transactionFactory = transactionFactory;
|
|
12
12
|
this.funcSqlService = funcSqlService;
|
|
@@ -19,12 +19,12 @@ class RepositoryFactory {
|
|
|
19
19
|
getInstance({ tableName, transaction: oTransaction }) {
|
|
20
20
|
const transaction = oTransaction || this.transactionFactory.getPseudoTransaction();
|
|
21
21
|
const sqlExecutor = new sql_executor_1.SqlExecutor(this.funcSqlService, transaction);
|
|
22
|
-
return new repository_1.Repository(transaction, sqlExecutor, this.
|
|
22
|
+
return new repository_1.Repository(transaction, sqlExecutor, this.secondaryDataBase, this.funcSqlService, this.uuidService, tableName, !oTransaction);
|
|
23
23
|
}
|
|
24
24
|
getCacheInstance({ tableName, version }) {
|
|
25
25
|
const versionKey = version ? 'v' + version : 'v2';
|
|
26
26
|
if (!this.cacheInstances[versionKey][tableName]) {
|
|
27
|
-
this.cacheInstances[versionKey][tableName] = new cache_repository_1.CacheRepository(this.databaseManagerService.get(), this.
|
|
27
|
+
this.cacheInstances[versionKey][tableName] = new cache_repository_1.CacheRepository(this.databaseManagerService.get(), this.secondaryDataBase, tableName, { version: version || 2 });
|
|
28
28
|
}
|
|
29
29
|
return this.cacheInstances[versionKey][tableName];
|
|
30
30
|
}
|
|
@@ -5,7 +5,7 @@ import { Join, OrderByField, SelectField, Where, From, With } from '../cases/bo/
|
|
|
5
5
|
import { Transaction } from './transaction';
|
|
6
6
|
import { Query, Select } from '../cases/vanilla/interfaces';
|
|
7
7
|
import { SqlExecutor } from './sql-executor';
|
|
8
|
-
import {
|
|
8
|
+
import { SecondaryDatabase } from './secundary-database/secundary-database.service';
|
|
9
9
|
export interface SelectResult<T> {
|
|
10
10
|
data: T[];
|
|
11
11
|
page?: number;
|
|
@@ -174,13 +174,13 @@ export declare class Repository<T extends {
|
|
|
174
174
|
}> {
|
|
175
175
|
private readonly transaction;
|
|
176
176
|
private readonly sqlExecutor;
|
|
177
|
-
private readonly
|
|
177
|
+
private readonly secondaryDataBase;
|
|
178
178
|
private readonly sqlServiceFunc;
|
|
179
179
|
private readonly uuidService;
|
|
180
180
|
private readonly table;
|
|
181
181
|
private readonly autoCommit;
|
|
182
182
|
private readonly log;
|
|
183
|
-
constructor(transaction: Transaction, sqlExecutor: SqlExecutor,
|
|
183
|
+
constructor(transaction: Transaction, sqlExecutor: SqlExecutor, secondaryDataBase: SecondaryDatabase, sqlServiceFunc: () => SqlService, uuidService: UuidService, table: string, autoCommit: boolean);
|
|
184
184
|
findByIn({ key, values, fields, orderBy, user, alias, totalizeMode, forUpdate, with: w, from, query, join, union, unionAll, disablePermissionSystem }: FindByInArgs): Promise<T[]>;
|
|
185
185
|
private getAlias;
|
|
186
186
|
findByPucaPid({ pucaPid, fields, user, alias: oAlias, forUpdate, with: w, from, join, query, disablePermissionSystem }: FindByPucaPidArgs & {
|
|
@@ -10,10 +10,10 @@ var TotalizeMode;
|
|
|
10
10
|
TotalizeMode["never"] = "never";
|
|
11
11
|
})(TotalizeMode = exports.TotalizeMode || (exports.TotalizeMode = {}));
|
|
12
12
|
class Repository {
|
|
13
|
-
constructor(transaction, sqlExecutor,
|
|
13
|
+
constructor(transaction, sqlExecutor, secondaryDataBase, sqlServiceFunc, uuidService, table, autoCommit) {
|
|
14
14
|
this.transaction = transaction;
|
|
15
15
|
this.sqlExecutor = sqlExecutor;
|
|
16
|
-
this.
|
|
16
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
17
17
|
this.sqlServiceFunc = sqlServiceFunc;
|
|
18
18
|
this.uuidService = uuidService;
|
|
19
19
|
this.table = table;
|
|
@@ -327,7 +327,7 @@ class Repository {
|
|
|
327
327
|
throw new Error('Falha ao executar o insert, verifique se o usuário tem permissão para realizar a operação');
|
|
328
328
|
}
|
|
329
329
|
this.transaction.afterCommit(async () => {
|
|
330
|
-
await this.
|
|
330
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
331
331
|
version: 2,
|
|
332
332
|
puca_pid: r.puca_pid,
|
|
333
333
|
row: r,
|
|
@@ -388,7 +388,7 @@ class Repository {
|
|
|
388
388
|
mode = 'new';
|
|
389
389
|
}
|
|
390
390
|
this.transaction.afterCommit(async () => {
|
|
391
|
-
await this.
|
|
391
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
392
392
|
version: 2,
|
|
393
393
|
puca_pid: entity.puca_pid,
|
|
394
394
|
row: entity,
|
|
@@ -428,7 +428,7 @@ class Repository {
|
|
|
428
428
|
throw new Error('Falha ao executar a deleção, verifique se o usuário tem permissão para realizar a operação');
|
|
429
429
|
}
|
|
430
430
|
this.transaction.afterCommit(async () => {
|
|
431
|
-
await this.
|
|
431
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
432
432
|
version: 2,
|
|
433
433
|
puca_pid,
|
|
434
434
|
row: null,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Callback, RedisClient } from "redis";
|
|
2
2
|
import { ConfigService } from "../../../essential/config.service";
|
|
3
3
|
import { RedisConfig } from "../../../models/redis-config";
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class SecondaryDatabase {
|
|
5
5
|
private readonly domain;
|
|
6
6
|
private readonly configService;
|
|
7
7
|
private redisClient;
|
|
@@ -10,10 +10,12 @@ export declare class SecundaryDatabase {
|
|
|
10
10
|
constructor(domain: string, configService: ConfigService | RedisConfig);
|
|
11
11
|
init(): Promise<void>;
|
|
12
12
|
destroy(): Promise<void>;
|
|
13
|
+
private addPrefix;
|
|
14
|
+
private removePrefix;
|
|
13
15
|
subscribe(topic: string, func?: Callback<string>): void;
|
|
14
16
|
publish(topic: string, message: string, callback?: Callback<number>): void;
|
|
15
17
|
onMessage(func: Callback<string>): void;
|
|
16
|
-
duplicate():
|
|
18
|
+
duplicate(): SecondaryDatabase;
|
|
17
19
|
get(key: string, callback?: Callback<string>): void;
|
|
18
20
|
set(key: string, value: string, func?: Callback<string>): void;
|
|
19
21
|
getRedisClient(): RedisClient;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.SecondaryDatabase = void 0;
|
|
4
4
|
const redis_1 = require("redis");
|
|
5
|
-
class
|
|
5
|
+
class SecondaryDatabase {
|
|
6
6
|
constructor(domain, configService) {
|
|
7
7
|
this.domain = domain;
|
|
8
8
|
this.configService = configService;
|
|
@@ -29,38 +29,50 @@ class SecundaryDatabase {
|
|
|
29
29
|
this.redisClient.removeAllListeners();
|
|
30
30
|
this.redisClient.quit();
|
|
31
31
|
}
|
|
32
|
+
addPrefix(key) {
|
|
33
|
+
return `${this.domain}-${key}`;
|
|
34
|
+
}
|
|
35
|
+
removePrefix(key) {
|
|
36
|
+
return key.replace(`${this.domain}-`, '');
|
|
37
|
+
}
|
|
32
38
|
subscribe(topic, func) {
|
|
33
|
-
this.redisClient.subscribe(
|
|
39
|
+
this.redisClient.subscribe(this.addPrefix(topic), func);
|
|
34
40
|
}
|
|
35
41
|
publish(topic, message, callback) {
|
|
36
|
-
this.redisClient.publish(
|
|
42
|
+
this.redisClient.publish(this.addPrefix(topic), message, callback);
|
|
37
43
|
}
|
|
38
44
|
onMessage(func) {
|
|
39
45
|
this.redisClient.on('message', func);
|
|
40
46
|
}
|
|
41
47
|
duplicate() {
|
|
42
|
-
const
|
|
43
|
-
this.children.push(
|
|
44
|
-
return
|
|
48
|
+
const instaceSecondaryDatabase = new SecondaryDatabase(this.domain, this.redisConfig);
|
|
49
|
+
this.children.push(instaceSecondaryDatabase);
|
|
50
|
+
return instaceSecondaryDatabase;
|
|
45
51
|
}
|
|
46
52
|
get(key, callback) {
|
|
47
|
-
this.redisClient.get(
|
|
53
|
+
this.redisClient.get(this.addPrefix(key), callback);
|
|
48
54
|
}
|
|
49
55
|
set(key, value, func) {
|
|
50
|
-
this.redisClient.set(
|
|
56
|
+
this.redisClient.set(this.addPrefix(key), value, func);
|
|
51
57
|
}
|
|
52
58
|
getRedisClient() {
|
|
53
59
|
return this.redisClient;
|
|
54
60
|
}
|
|
55
61
|
del(key, callback) {
|
|
56
|
-
this.redisClient.del(
|
|
62
|
+
this.redisClient.del(this.addPrefix(key), callback);
|
|
57
63
|
}
|
|
58
64
|
setex(key, seconds, value, callback) {
|
|
59
|
-
this.redisClient.setex(
|
|
65
|
+
this.redisClient.setex(this.addPrefix(key), seconds, value, callback);
|
|
60
66
|
}
|
|
61
67
|
keys(pattern, callback) {
|
|
62
|
-
this.redisClient.keys(`${this.domain}-${pattern}`,
|
|
68
|
+
this.redisClient.keys(`${this.domain}-${pattern}`, (err, keys) => {
|
|
69
|
+
if (err) {
|
|
70
|
+
return callback(err, null);
|
|
71
|
+
}
|
|
72
|
+
const keysWithoutPrefix = keys.map((key) => this.removePrefix(key));
|
|
73
|
+
callback(null, keysWithoutPrefix);
|
|
74
|
+
});
|
|
63
75
|
}
|
|
64
76
|
}
|
|
65
|
-
exports.
|
|
77
|
+
exports.SecondaryDatabase = SecondaryDatabase;
|
|
66
78
|
//# sourceMappingURL=secundary-database.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secundary-database.service.js","sourceRoot":"","sources":["../../../../src/orm/services/secundary-database/secundary-database.service.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAI9C,MAAa,iBAAiB;IAK5B,YACmB,MAAc,EACd,aAA0C;QAD1C,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAA6B;QALrD,aAAQ,GAAwB,EAAE,CAAC;QAOzC,IAAI,MAAM,IAAI,aAAa,EAAE;YAE3B,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC;YACjC,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAW,CAAC,aAAa,CAAC,CAAC;SACnD;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QAER,IAAI,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE;YAChC,OAAM;SACP;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAW,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,KAAI,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;SAClB;QAED,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QACtC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,IAAuB;QAC9C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"secundary-database.service.js","sourceRoot":"","sources":["../../../../src/orm/services/secundary-database/secundary-database.service.ts"],"names":[],"mappings":"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"}
|