@puca/puca-core 8.3.0 → 8.3.2
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 +34 -23
- package/dist/core/services/bootstrap-commands.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.js +2 -2
- 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 +5 -4
- package/dist/core/services/crud-front-base.service.js +5 -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 +9 -3
- 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 +1 -1
- package/dist/core/services/life-cycle.service.js +1 -1
- 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/report.service.js +2 -1
- 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 -1
- 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
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ConfigsService } from "../../../essential/configs.service";
|
|
2
2
|
import { ModuleConfigService } from "../module-config.service";
|
|
3
3
|
import { Args, JobClientManager } from "./job.client";
|
|
4
|
-
import { EvalServiceFactory } from '../eval.service';
|
|
5
4
|
export interface Job {
|
|
6
5
|
name: string;
|
|
7
6
|
cron: string;
|
|
@@ -14,10 +13,9 @@ export declare class JobService {
|
|
|
14
13
|
private readonly jobClientManager;
|
|
15
14
|
private readonly configService;
|
|
16
15
|
private readonly moduleConfigService;
|
|
17
|
-
|
|
18
|
-
constructor(jobClientManager: JobClientManager, configService: ConfigsService, moduleConfigService: ModuleConfigService, evalServiceFactory: EvalServiceFactory);
|
|
16
|
+
constructor(jobClientManager: JobClientManager, configService: ConfigsService, moduleConfigService: ModuleConfigService);
|
|
19
17
|
list(): Promise<import("./job.client").Job>;
|
|
20
|
-
update(
|
|
18
|
+
update(job: Job): Promise<void>;
|
|
21
19
|
delete(args: Args): Promise<void>;
|
|
22
20
|
nextDate(args: Args): Promise<{
|
|
23
21
|
nextDate: Date;
|
|
@@ -3,24 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.JobService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
class JobService {
|
|
6
|
-
constructor(jobClientManager, configService, moduleConfigService
|
|
6
|
+
constructor(jobClientManager, configService, moduleConfigService) {
|
|
7
7
|
this.jobClientManager = jobClientManager;
|
|
8
8
|
this.configService = configService;
|
|
9
9
|
this.moduleConfigService = moduleConfigService;
|
|
10
|
-
this.evalServiceFactory = evalServiceFactory;
|
|
11
10
|
}
|
|
12
11
|
async list() {
|
|
13
12
|
const jobClient = await this.jobClientManager.get();
|
|
14
13
|
return await jobClient.list();
|
|
15
14
|
}
|
|
16
|
-
async update(
|
|
17
|
-
|
|
18
|
-
env: await this.configService.getEnv()
|
|
19
|
-
}, {
|
|
20
|
-
token: '=',
|
|
21
|
-
user: null
|
|
22
|
-
});
|
|
23
|
-
const job = await evalService.evalObject(j);
|
|
15
|
+
async update(job) {
|
|
16
|
+
job.headers.key = (await this.configService.getSecret()).pucaTriggerConfig.key;
|
|
24
17
|
const jobClient = await this.jobClientManager.get();
|
|
25
18
|
if (!job.url.startsWith('http')) {
|
|
26
19
|
const { name: moduleName } = await this.moduleConfigService.getModuleConfig();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAc5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA6B,EAC7B,mBAAwC
|
|
1
|
+
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAc5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA6B,EAC7B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;QAC9E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EACpF,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AAvCD,gCAuCC"}
|
|
@@ -29,8 +29,8 @@ export declare class JobExecutor<T> {
|
|
|
29
29
|
limit?: number;
|
|
30
30
|
};
|
|
31
31
|
}): Promise<void>;
|
|
32
|
-
shutdown(): Promise<void>;
|
|
33
|
-
static shutdown(): Promise<void>;
|
|
32
|
+
shutdown(immediate: boolean): Promise<void>;
|
|
33
|
+
static shutdown(immediate: boolean): Promise<void>;
|
|
34
34
|
}
|
|
35
35
|
export declare class JobExecutorFactory {
|
|
36
36
|
private readonly configsService;
|
|
@@ -47,17 +47,17 @@ class JobExecutor {
|
|
|
47
47
|
const bullAddOptions = Object.assign(Object.assign({}, JobExecutor.DEFAULT_OPT), { jobId: _.get(opts, 'key') || this.uuidService.v4(), timeout: _.get(opts, 'timeout', JobExecutor.DEFAULT_OPT.timeout), attempts: _.get(opts, 'attempts', JobExecutor.DEFAULT_OPT.attempts), removeOnFail: _.get(opts, 'removeOnFail', JobExecutor.DEFAULT_OPT.removeOnFail), removeOnComplete: environment === 'PRODUCTION' || _.get(opts, 'removeOnComplete', JobExecutor.DEFAULT_OPT.removeOnComplete), repeat: _.get(opts, 'repeat'), backoff: Object.assign(Object.assign({}, JobExecutor.DEFAULT_OPT.backoff), _.get(opts, 'backoff')) });
|
|
48
48
|
await this.bull.add(data, bullAddOptions);
|
|
49
49
|
}
|
|
50
|
-
async shutdown() {
|
|
51
|
-
await this.bull.close();
|
|
50
|
+
async shutdown(immediate) {
|
|
51
|
+
await this.bull.close(immediate);
|
|
52
52
|
const i = JobExecutor.instances.indexOf(this);
|
|
53
53
|
if (i !== -1) {
|
|
54
54
|
JobExecutor.instances.splice(i, 1);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
static async shutdown() {
|
|
57
|
+
static async shutdown(immediate) {
|
|
58
58
|
while (JobExecutor.instances.length) {
|
|
59
59
|
const je = JobExecutor.instances[0];
|
|
60
|
-
await je.shutdown();
|
|
60
|
+
await je.shutdown(immediate);
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { ConfigsService } from '../../essential/configs.service';
|
|
|
8
8
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
9
9
|
import { RedisManagerService } from '../../orm/services/managers/redis-manager.service';
|
|
10
10
|
import { ComunicationServiceHttp } from './comunication/comunication-http.service';
|
|
11
|
-
import { SqlService } from '../../orm/services/sql.service';
|
|
11
|
+
import { SqlService } from '../../orm/services/sql/sql.service';
|
|
12
12
|
import { ReportService } from './report.service';
|
|
13
13
|
import { JobExecutorFactory } from './job-executor/job-executor.service';
|
|
14
14
|
import { EvalServiceFactory } from './eval.service';
|
|
@@ -32,7 +32,7 @@ class LifeCycleService {
|
|
|
32
32
|
tasks.push(this.repositoryFactory.shuwdown);
|
|
33
33
|
tasks.push(this.databaseManagerService.get().disconnect);
|
|
34
34
|
tasks.push(this.databaseManagerService.getTransactionalDatabase().disconnect);
|
|
35
|
-
tasks.push(job_executor_service_1.JobExecutor.shutdown);
|
|
35
|
+
tasks.push(() => job_executor_service_1.JobExecutor.shutdown(true));
|
|
36
36
|
if (this.app) {
|
|
37
37
|
tasks.push(this.app.close);
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAI9D,uCAA2C;AAC3C,qCAAkC;AASlC,8EAAsF;AAYtF,MAAa,gBAAgB;IAI3B,YACmB,sBAA8C,EAC9C,mBAAwC,EACxC,gBAAkC,EAClC,gBAAkC,EAClC,cAA8B,EAC9B,iBAAoC,EACpC,gBAAkC,EAClC,cAA8B,EAC9B,uBAAgD,EAChD,UAAsB,EACtB,aAA4B,EAC5B,kBAAsC,EACtC,kBAAsC;QAZtC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QAhBxC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;QAExC,cAAS,GAAqB,EAAE,CAAA;IAe7C,CAAC;IAEL,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACrC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,CAAA;QACvC,MAAM,KAAK,GAA4B,EAAE,CAAA;QACzC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;QAC5C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAC3C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAA;QACxD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,EAAE,CAAC,UAAU,CAAC,CAAA;QAC7E,KAAK,CAAC,IAAI,CAAC,kCAAW,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,16 +21,25 @@ export declare class MigrationService {
|
|
|
21
21
|
user: User;
|
|
22
22
|
moduleName?: string;
|
|
23
23
|
}): Promise<void>;
|
|
24
|
-
private internalCreateTable;
|
|
25
24
|
createTable(c: CreateTable & {
|
|
26
25
|
moduleName?: string;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
26
|
+
user: User;
|
|
27
|
+
}): Promise<void>;
|
|
28
|
+
private _createTable;
|
|
29
|
+
private createTableOnly;
|
|
30
|
+
alterTableAddColumn(alterTableAddColumn: AlterTableAddColumn & {
|
|
31
|
+
user: User;
|
|
32
|
+
}): Promise<void>;
|
|
33
|
+
private _alterTableAddColumn;
|
|
34
|
+
alterTableDropColumn(args: {
|
|
33
35
|
tableName: string;
|
|
34
36
|
name: string;
|
|
35
|
-
|
|
37
|
+
user: User;
|
|
38
|
+
}): Promise<void>;
|
|
39
|
+
private _alterTableDropColumn;
|
|
40
|
+
dropTable(args: {
|
|
41
|
+
tableName: string;
|
|
42
|
+
user: User;
|
|
43
|
+
}): Promise<void>;
|
|
44
|
+
private _dropTable;
|
|
36
45
|
}
|
|
@@ -29,7 +29,7 @@ class MigrationService {
|
|
|
29
29
|
operator: interfaces_1.ConditionalOpertator.anyOf,
|
|
30
30
|
v2: '$ids'
|
|
31
31
|
},
|
|
32
|
-
user
|
|
32
|
+
user,
|
|
33
33
|
})).data;
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
@@ -44,44 +44,47 @@ class MigrationService {
|
|
|
44
44
|
if (['createTableMigration', 'createTablTableDictionary', 'createTableFieldDictionary'].includes(c.id)) {
|
|
45
45
|
method = 'internalCreateTable';
|
|
46
46
|
}
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
47
|
+
const transaction = this.transactionFactory.get();
|
|
48
|
+
try {
|
|
49
|
+
const exec = (method) => async (c) => {
|
|
50
|
+
const commandList = cases_1.cSqlService[method](c);
|
|
51
51
|
await transaction.serialExec(commandList);
|
|
52
|
-
|
|
52
|
+
};
|
|
53
|
+
const f = {
|
|
54
|
+
internalCreateTable: async (c) => await this.createTableOnly(Object.assign(Object.assign({}, c), { moduleName, transaction, user })),
|
|
55
|
+
createTable: async (c) => await this._createTable(Object.assign(Object.assign({}, c), { moduleName, transaction, user })),
|
|
56
|
+
alterTableAddColumn: async (c) => await this._alterTableAddColumn(Object.assign(Object.assign({}, c), { user, transaction })),
|
|
57
|
+
alterTableDropColumn: async (c) => await this._alterTableDropColumn(Object.assign(Object.assign({}, c), { user, transaction })),
|
|
58
|
+
dropTable: async (c) => await this._dropTable(Object.assign(Object.assign({}, c), { user, transaction })),
|
|
59
|
+
insert: async (c) => await exec('insert')(c),
|
|
60
|
+
update: async (c) => await exec('update')(c),
|
|
61
|
+
delete: async (c) => await exec('delete')(c),
|
|
62
|
+
}[method];
|
|
63
|
+
if (!f) {
|
|
64
|
+
throw new Error(`Method '${method}' não encontrado`);
|
|
53
65
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
throw new Error(`Method '${method}' não encontrado`);
|
|
66
|
+
await f(c.command);
|
|
67
|
+
const migrationRepository = this.repositoryFactory.getInstance({
|
|
68
|
+
tableName: 'migration',
|
|
69
|
+
transaction
|
|
70
|
+
});
|
|
71
|
+
await migrationRepository.save({
|
|
72
|
+
entity: c,
|
|
73
|
+
user,
|
|
74
|
+
});
|
|
75
|
+
await transaction.commit();
|
|
76
|
+
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
await transaction.rollback();
|
|
79
|
+
throw e;
|
|
69
80
|
}
|
|
70
|
-
await f(c.command);
|
|
71
|
-
await migrationRepository.save({
|
|
72
|
-
entity: c,
|
|
73
|
-
user,
|
|
74
|
-
options: {},
|
|
75
|
-
});
|
|
76
81
|
}
|
|
77
82
|
}
|
|
78
83
|
}
|
|
79
|
-
async
|
|
80
|
-
const command = Object.assign(Object.assign({}, c), { module: c.moduleName || (await this.moduleConfigService.getModuleConfig()).name });
|
|
81
|
-
const sqlCommandList = cases_1.ddlService.createTable(command, u);
|
|
84
|
+
async createTable(c) {
|
|
82
85
|
const transaction = this.transactionFactory.get();
|
|
83
86
|
try {
|
|
84
|
-
await
|
|
87
|
+
await this._createTable(Object.assign(Object.assign({}, c), { transaction }));
|
|
85
88
|
await transaction.commit();
|
|
86
89
|
}
|
|
87
90
|
catch (e) {
|
|
@@ -89,52 +92,62 @@ class MigrationService {
|
|
|
89
92
|
throw e;
|
|
90
93
|
}
|
|
91
94
|
}
|
|
92
|
-
async
|
|
93
|
-
await this.
|
|
95
|
+
async _createTable(c) {
|
|
96
|
+
await this.createTableOnly(c);
|
|
94
97
|
const tableDictionaryRepository = this.repositoryFactory.getInstance({
|
|
95
98
|
tableName: 'table_dictionary',
|
|
96
|
-
transaction:
|
|
99
|
+
transaction: c.transaction
|
|
97
100
|
});
|
|
98
101
|
const tableDictionary = await tableDictionaryRepository.findOneBy({
|
|
99
102
|
fields: ['puca_pid'],
|
|
100
103
|
key: 'name',
|
|
101
104
|
value: c.tableName,
|
|
102
|
-
user:
|
|
105
|
+
user: c.user,
|
|
103
106
|
});
|
|
104
|
-
const redisCli = this.redisManagerService.get();
|
|
105
|
-
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
106
107
|
const fieldDictionaryRepository = this.repositoryFactory.getInstance({
|
|
107
108
|
tableName: 'field_dictionary',
|
|
108
|
-
transaction:
|
|
109
|
+
transaction: c.transaction
|
|
109
110
|
});
|
|
110
111
|
const fieldDictionary = await fieldDictionaryRepository.findBy({
|
|
111
112
|
fields: ['puca_pid'],
|
|
112
113
|
key: 'entity',
|
|
113
114
|
value: c.tableName,
|
|
114
|
-
user:
|
|
115
|
+
user: c.user,
|
|
115
116
|
});
|
|
116
|
-
|
|
117
|
-
redisCli.
|
|
117
|
+
c.transaction.afterCommit(async () => {
|
|
118
|
+
const redisCli = this.redisManagerService.get();
|
|
119
|
+
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
120
|
+
fieldDictionary.data.forEach(fd => {
|
|
121
|
+
redisCli.publish('field_dictionary.change', fd.puca_pid);
|
|
122
|
+
});
|
|
118
123
|
});
|
|
119
124
|
}
|
|
120
|
-
async
|
|
121
|
-
const
|
|
125
|
+
async createTableOnly(c) {
|
|
126
|
+
const command = Object.assign(Object.assign({}, c), { module: c.moduleName || (await this.moduleConfigService.getModuleConfig()).name });
|
|
127
|
+
const sqlCommandList = cases_1.ddlService.createTable(command, c.user);
|
|
128
|
+
await c.transaction.serialExec(sqlCommandList);
|
|
129
|
+
}
|
|
130
|
+
async alterTableAddColumn(alterTableAddColumn) {
|
|
122
131
|
const transaction = this.transactionFactory.get();
|
|
123
132
|
try {
|
|
124
|
-
await
|
|
133
|
+
await this._alterTableAddColumn(Object.assign(Object.assign({}, alterTableAddColumn), { transaction }));
|
|
125
134
|
await transaction.commit();
|
|
126
135
|
}
|
|
127
136
|
catch (e) {
|
|
128
137
|
await transaction.rollback();
|
|
129
138
|
throw e;
|
|
130
139
|
}
|
|
140
|
+
}
|
|
141
|
+
async _alterTableAddColumn(c) {
|
|
142
|
+
const sqlCommandList = await cases_1.ddlService.alterTableAddColumn(c, c.user);
|
|
143
|
+
await c.transaction.serialExec(sqlCommandList);
|
|
131
144
|
const fieldDictionaryRepository = this.repositoryFactory.getInstance({
|
|
132
145
|
tableName: 'field_dictionary',
|
|
133
|
-
transaction:
|
|
146
|
+
transaction: c.transaction
|
|
134
147
|
});
|
|
135
148
|
const fieldDictionary = await fieldDictionaryRepository.findOneWhere({
|
|
136
149
|
fields: ['puca_pid'],
|
|
137
|
-
user:
|
|
150
|
+
user: c.user,
|
|
138
151
|
args: {
|
|
139
152
|
name: c.name,
|
|
140
153
|
tableName: c.tableName
|
|
@@ -152,59 +165,31 @@ class MigrationService {
|
|
|
152
165
|
v2: '$tableName'
|
|
153
166
|
}
|
|
154
167
|
]
|
|
155
|
-
}
|
|
156
|
-
});
|
|
157
|
-
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
158
|
-
}
|
|
159
|
-
async dropTable(d, u) {
|
|
160
|
-
const tableDictionaryRepository = this.repositoryFactory.getInstance({
|
|
161
|
-
tableName: 'table_dictionary',
|
|
162
|
-
transaction: null
|
|
163
|
-
});
|
|
164
|
-
const tableDictionary = await tableDictionaryRepository.findOneBy({
|
|
165
|
-
fields: ['puca_pid'],
|
|
166
|
-
key: 'name',
|
|
167
|
-
value: d.tableName,
|
|
168
|
-
user: u
|
|
169
|
-
});
|
|
170
|
-
const fieldDictionaryRepository = this.repositoryFactory.getInstance({
|
|
171
|
-
tableName: 'field_dictionary',
|
|
172
|
-
transaction: null
|
|
168
|
+
},
|
|
173
169
|
});
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
key: 'entity',
|
|
177
|
-
value: d.tableName,
|
|
178
|
-
user: u
|
|
170
|
+
c.transaction.afterCommit(async () => {
|
|
171
|
+
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
179
172
|
});
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
tableDictionaryPid: tableDictionary.puca_pid,
|
|
183
|
-
fieldDictionaryPid: fieldDictionary.data.map(f => f.puca_pid)
|
|
184
|
-
}, u);
|
|
173
|
+
}
|
|
174
|
+
async alterTableDropColumn(args) {
|
|
185
175
|
const transaction = this.transactionFactory.get();
|
|
186
176
|
try {
|
|
187
|
-
await
|
|
177
|
+
await this._alterTableDropColumn(Object.assign(Object.assign({}, args), { transaction }));
|
|
188
178
|
await transaction.commit();
|
|
189
179
|
}
|
|
190
180
|
catch (e) {
|
|
191
181
|
await transaction.rollback();
|
|
192
182
|
throw e;
|
|
193
183
|
}
|
|
194
|
-
const redisCli = this.redisManagerService.get();
|
|
195
|
-
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
196
|
-
fieldDictionary.data.forEach(fd => {
|
|
197
|
-
redisCli.publish('field_dictionary.change', fd.puca_pid);
|
|
198
|
-
});
|
|
199
184
|
}
|
|
200
|
-
async
|
|
185
|
+
async _alterTableDropColumn(d) {
|
|
201
186
|
const fieldDictionaryRepository = this.repositoryFactory.getInstance({
|
|
202
187
|
tableName: 'field_dictionary',
|
|
203
|
-
transaction:
|
|
188
|
+
transaction: d.transaction
|
|
204
189
|
});
|
|
205
190
|
const fieldDictionary = await fieldDictionaryRepository.findOneWhere({
|
|
206
191
|
fields: ['puca_pid'],
|
|
207
|
-
user:
|
|
192
|
+
user: d.user,
|
|
208
193
|
args: {
|
|
209
194
|
name: d.name,
|
|
210
195
|
tableName: d.tableName
|
|
@@ -222,23 +207,61 @@ class MigrationService {
|
|
|
222
207
|
v2: '$tableName'
|
|
223
208
|
}
|
|
224
209
|
]
|
|
225
|
-
}
|
|
210
|
+
},
|
|
226
211
|
});
|
|
227
212
|
const sqlCommandList = cases_1.ddlService.alterTableDropColumn({
|
|
228
213
|
fieldDictionaryPid: fieldDictionary.puca_pid,
|
|
229
214
|
name: d.name,
|
|
230
215
|
tableName: d.tableName
|
|
231
|
-
},
|
|
216
|
+
}, d.user);
|
|
217
|
+
await d.transaction.serialExec(sqlCommandList);
|
|
218
|
+
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
219
|
+
}
|
|
220
|
+
async dropTable(args) {
|
|
232
221
|
const transaction = this.transactionFactory.get();
|
|
233
222
|
try {
|
|
234
|
-
await
|
|
223
|
+
await this._dropTable(Object.assign(Object.assign({}, args), { transaction }));
|
|
235
224
|
await transaction.commit();
|
|
236
225
|
}
|
|
237
226
|
catch (e) {
|
|
238
227
|
await transaction.rollback();
|
|
239
228
|
throw e;
|
|
240
229
|
}
|
|
241
|
-
|
|
230
|
+
}
|
|
231
|
+
async _dropTable(d) {
|
|
232
|
+
const tableDictionaryRepository = this.repositoryFactory.getInstance({
|
|
233
|
+
tableName: 'table_dictionary',
|
|
234
|
+
transaction: d.transaction
|
|
235
|
+
});
|
|
236
|
+
const tableDictionary = await tableDictionaryRepository.findOneBy({
|
|
237
|
+
fields: ['puca_pid'],
|
|
238
|
+
key: 'name',
|
|
239
|
+
value: d.tableName,
|
|
240
|
+
user: d.user,
|
|
241
|
+
});
|
|
242
|
+
const fieldDictionaryRepository = this.repositoryFactory.getInstance({
|
|
243
|
+
tableName: 'field_dictionary',
|
|
244
|
+
transaction: d.transaction
|
|
245
|
+
});
|
|
246
|
+
const fieldDictionary = await fieldDictionaryRepository.findBy({
|
|
247
|
+
fields: ['puca_pid'],
|
|
248
|
+
key: 'entity',
|
|
249
|
+
value: d.tableName,
|
|
250
|
+
user: d.user,
|
|
251
|
+
});
|
|
252
|
+
const sqlCommandList = cases_1.ddlService.dropTable({
|
|
253
|
+
tableName: d.tableName,
|
|
254
|
+
tableDictionaryPid: tableDictionary.puca_pid,
|
|
255
|
+
fieldDictionaryPid: fieldDictionary.data.map(f => f.puca_pid)
|
|
256
|
+
}, d.user);
|
|
257
|
+
await d.transaction.serialExec(sqlCommandList);
|
|
258
|
+
const redisCli = this.redisManagerService.get();
|
|
259
|
+
d.transaction.afterCommit(async () => {
|
|
260
|
+
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
261
|
+
fieldDictionary.data.forEach(fd => {
|
|
262
|
+
redisCli.publish('field_dictionary.change', fd.puca_pid);
|
|
263
|
+
});
|
|
264
|
+
});
|
|
242
265
|
}
|
|
243
266
|
}
|
|
244
267
|
exports.MigrationService = MigrationService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":";;;AACA,2CAA0D;AAC1D,8DAIuC;AAGvC,qCAAkC;AAclC,MAAa,gBAAgB;IAE3B,YACmB,kBAAsC,EACtC,iBAAoC,EACpC,mBAAwC,EACxC,mBAAwC;QAHxC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAqB;QAL1C,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAMrD,CAAC;IAEL,KAAK,CAAC,OAAO,CAAC,EACZ,WAAW,EACX,IAAI,EACJ,UAAU,GAKX;QACC,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ModuleConfigService } from "./module-config.service";
|
|
2
|
+
import { ModuleEspecification } from "../../models/module-especification";
|
|
3
|
+
import { FileSystemService } from "../../plugins/file-system/file-system.service";
|
|
4
|
+
export declare class ModuleEspecificationService {
|
|
5
|
+
private readonly fileSystemService;
|
|
6
|
+
private readonly moduleConfigService;
|
|
7
|
+
constructor(fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService);
|
|
8
|
+
get(): Promise<ModuleEspecification>;
|
|
9
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ModuleEspecificationService = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
5
|
+
class ModuleEspecificationService {
|
|
6
|
+
constructor(fileSystemService, moduleConfigService) {
|
|
7
|
+
this.fileSystemService = fileSystemService;
|
|
8
|
+
this.moduleConfigService = moduleConfigService;
|
|
9
|
+
}
|
|
10
|
+
async get() {
|
|
11
|
+
const ddlCommands = await this.fileSystemService.readJSONFile('./ddls.json', {
|
|
12
|
+
throwErrors: false,
|
|
13
|
+
});
|
|
14
|
+
const moduleConfig = await this.moduleConfigService.getModuleConfig();
|
|
15
|
+
const menuPlan = (await this.fileSystemService.readJSONFile('./menus.json', {
|
|
16
|
+
throwErrors: false,
|
|
17
|
+
})) || [];
|
|
18
|
+
return {
|
|
19
|
+
module_name: moduleConfig.name,
|
|
20
|
+
label: moduleConfig.label,
|
|
21
|
+
version: moduleConfig.version,
|
|
22
|
+
ddlCommands,
|
|
23
|
+
menu: menuPlan,
|
|
24
|
+
active: true,
|
|
25
|
+
showOnMenu: _.get(moduleConfig, 'showOnMenu', true),
|
|
26
|
+
useAccessControl: moduleConfig.useAccessControl,
|
|
27
|
+
indexPage: moduleConfig.indexPage
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.ModuleEspecificationService = ModuleEspecificationService;
|
|
32
|
+
//# sourceMappingURL=module-especification.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAO3B,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC;YACnD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,SAAS,EAAE,YAAY,CAAC,SAAS;SACV,CAAC;IAC5B,CAAC;CACF;AA9BD,kEA8BC"}
|
|
@@ -118,7 +118,8 @@ class ReportService {
|
|
|
118
118
|
const databaseReports = await repository.findByIn({
|
|
119
119
|
fields: ['shortid', 'config'],
|
|
120
120
|
key: 'shortid',
|
|
121
|
-
values: reportTemplateList.map(t => t.shortid)
|
|
121
|
+
values: reportTemplateList.map(t => t.shortid),
|
|
122
|
+
user
|
|
122
123
|
});
|
|
123
124
|
return reportTemplateList.map(template => {
|
|
124
125
|
return Object.assign(Object.assign({}, template), databaseReports.find(r => r.shortid === template.shortid));
|