rez_core 2.1.113 → 2.1.114
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/module/resolver/resolver.module.js +1 -2
- package/dist/module/resolver/resolver.module.js.map +1 -1
- package/dist/module/resolver/service/resolver.service.d.ts +1 -2
- package/dist/module/resolver/service/resolver.service.js +9 -5
- package/dist/module/resolver/service/resolver.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/resolver/resolver.module.ts +1 -1
- package/src/module/resolver/service/resolver.service.ts +21 -12
- package/src/resources/local.properties.yaml +23 -0
|
@@ -10,13 +10,12 @@ exports.ResolverModule = void 0;
|
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const resolver_service_1 = require("./service/resolver.service");
|
|
12
12
|
const resolver_controller_1 = require("./controller/resolver.controller");
|
|
13
|
-
const entity_module_1 = require("../meta/entity.module");
|
|
14
13
|
let ResolverModule = class ResolverModule {
|
|
15
14
|
};
|
|
16
15
|
exports.ResolverModule = ResolverModule;
|
|
17
16
|
exports.ResolverModule = ResolverModule = __decorate([
|
|
18
17
|
(0, common_1.Module)({
|
|
19
|
-
imports: [
|
|
18
|
+
imports: [],
|
|
20
19
|
controllers: [resolver_controller_1.ResolverController],
|
|
21
20
|
providers: [resolver_service_1.ResolverService],
|
|
22
21
|
exports: [resolver_service_1.ResolverService],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.module.js","sourceRoot":"","sources":["../../../src/module/resolver/resolver.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,iEAA6D;AAC7D,0EAAsE;
|
|
1
|
+
{"version":3,"file":"resolver.module.js","sourceRoot":"","sources":["../../../src/module/resolver/resolver.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,iEAA6D;AAC7D,0EAAsE;AAS/D,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAN1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,CAAC,wCAAkB,CAAC;QACjC,SAAS,EAAE,CAAC,kCAAe,CAAC;QAC5B,OAAO,EAAE,CAAC,kCAAe,CAAC;KAC3B,CAAC;GACW,cAAc,CAAG"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { DataSource } from 'typeorm';
|
|
2
2
|
import { UserData } from 'src/module/user/entity/user.entity';
|
|
3
|
-
|
|
4
|
-
export declare class ResolverService extends EntityServiceImpl {
|
|
3
|
+
export declare class ResolverService {
|
|
5
4
|
private readonly dataSource;
|
|
6
5
|
constructor(dataSource: DataSource);
|
|
7
6
|
getResolvedData(loggedInUser: UserData, entityData: any, entityType: string): Promise<any>;
|
|
@@ -12,10 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ResolverService = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
const common_1 = require("@nestjs/common");
|
|
15
|
-
|
|
16
|
-
let ResolverService = class ResolverService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
15
|
+
let ResolverService = class ResolverService {
|
|
17
16
|
constructor(dataSource) {
|
|
18
|
-
super();
|
|
19
17
|
this.dataSource = dataSource;
|
|
20
18
|
}
|
|
21
19
|
async getResolvedData(loggedInUser, entityData, entityType) {
|
|
@@ -27,16 +25,22 @@ let ResolverService = class ResolverService extends entity_service_impl_service_
|
|
|
27
25
|
if (!codeValue)
|
|
28
26
|
continue;
|
|
29
27
|
if (attr.data_source_type === 'entity') {
|
|
28
|
+
const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`, [attr.datasource_list, loggedInUser.organization_id]);
|
|
29
|
+
if (!entityDef) {
|
|
30
|
+
resolvedEntityData[field] = codeValue;
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const tableName = entityDef.db_table_name;
|
|
30
34
|
if (Array.isArray(codeValue)) {
|
|
31
35
|
const resolvedValues = [];
|
|
32
36
|
for (const code of codeValue) {
|
|
33
|
-
const item = await
|
|
37
|
+
const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE code = ? AND organization_id = ?`, [code, loggedInUser.organization_id]);
|
|
34
38
|
resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
|
|
35
39
|
}
|
|
36
40
|
resolvedEntityData[field] = resolvedValues;
|
|
37
41
|
}
|
|
38
42
|
else {
|
|
39
|
-
const item = await
|
|
43
|
+
const [item] = await this.dataSource.query(`SELECT * FROM ${tableName} WHERE code = ? AND organization_id = ?`, [codeValue, loggedInUser.organization_id]);
|
|
40
44
|
resolvedEntityData[field] =
|
|
41
45
|
item?.[attr.data_source_attribute] ?? codeValue;
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/resolver/service/resolver.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAA4C;
|
|
1
|
+
{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/resolver/service/resolver.service.ts"],"names":[],"mappings":"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"}
|