eservices-back-core 1.2.65 → 1.2.67
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/controller/close-api/data-controller.d.ts.map +1 -1
- package/dist/controller/close-api/data-controller.js +14 -3
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/services/criterion-service.d.ts +4 -0
- package/dist/services/criterion-service.d.ts.map +1 -1
- package/dist/services/criterion-service.js +16 -9
- package/dist/services/criterion-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAW1C,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO;WAkC5B,MAAM,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA0BjD;;;OAGG;WACU,gBAAgB,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA8B3D;;OAEG;WACU,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAmBpE;;OAEG;WACU,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAoDlD,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAiDnD,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAkB5D"}
|
|
@@ -20,6 +20,7 @@ const transform_update_values_1 = __importDefault(require("../../utils/transform
|
|
|
20
20
|
const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
|
|
21
21
|
const get_criterion_preset_1 = __importDefault(require("../../utils/get-criterion-preset"));
|
|
22
22
|
const Store_1 = __importDefault(require("../../store/Store"));
|
|
23
|
+
const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
|
|
23
24
|
class DataController {
|
|
24
25
|
static formatValues(valuesObject) {
|
|
25
26
|
function transformName(name) {
|
|
@@ -49,10 +50,16 @@ class DataController {
|
|
|
49
50
|
try {
|
|
50
51
|
const { entity } = req.params;
|
|
51
52
|
const { values } = req.body;
|
|
52
|
-
const { rule } = req.query;
|
|
53
53
|
const context = (0, get_usage_context_1.default)(req.headers.referer);
|
|
54
|
+
const criterionService = new criterion_service_1.default(req.__token);
|
|
55
|
+
const rules = yield criterionService.get({
|
|
56
|
+
entity,
|
|
57
|
+
preset: (0, get_criterion_preset_1.default)(req),
|
|
58
|
+
masterEntities: (0, get_master_entities_1.default)(req),
|
|
59
|
+
criterion: Store_1.default.getMetadataSettingsForEntity(entity).criterion
|
|
60
|
+
});
|
|
54
61
|
const dataService = new data_service_1.default(req.__token);
|
|
55
|
-
const data = yield dataService.create(entity, (0, transform_update_values_1.default)(values), context,
|
|
62
|
+
const data = yield dataService.create(entity, (0, transform_update_values_1.default)(values), context, rules);
|
|
56
63
|
return void response.json(data);
|
|
57
64
|
}
|
|
58
65
|
catch (e) {
|
|
@@ -75,7 +82,11 @@ class DataController {
|
|
|
75
82
|
const version = req.body.version || req.body.Version || values.Version || values.version || 0;
|
|
76
83
|
const criterionService = new criterion_service_1.default(req.__token);
|
|
77
84
|
const rules = yield criterionService.get({
|
|
78
|
-
entity,
|
|
85
|
+
entity,
|
|
86
|
+
id,
|
|
87
|
+
preset: (0, get_criterion_preset_1.default)(req),
|
|
88
|
+
masterEntities: (0, get_master_entities_1.default)(req),
|
|
89
|
+
criterion: Store_1.default.getMetadataSettingsForEntity(entity).criterion || ["StatusCode"]
|
|
79
90
|
});
|
|
80
91
|
const output = yield dataService.updateById(entity, id, (0, transform_update_values_1.default)(values), version, context, rules);
|
|
81
92
|
response.json(output);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsE;AACtE,0DAAkC;AAClC,uFAA8D;AAC9D,sFAA4D;AAC5D,kGAAwE;AACxE,yFAAgE;AAChE,4FAAkE;AAClE,8DAAsC;
|
|
1
|
+
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export default class CriterionService extends InterfaceAuthService {
|
|
|
12
12
|
static readonly SYMBOL_CONCAT = ";";
|
|
13
13
|
get(params: CriterionGetParams): Promise<string>;
|
|
14
14
|
private generateCriterion;
|
|
15
|
+
/**
|
|
16
|
+
* Продумать: если в момент получения значения для критерия нужной сущности - нет. В таком случае нужно пропускать
|
|
17
|
+
* критерий.
|
|
18
|
+
*/
|
|
15
19
|
private generateCriterionArray;
|
|
16
20
|
/**
|
|
17
21
|
* @description Метод возвращает сгенерированный ОДИНОЧНый критерий.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,cAAc,EAAuC,MAAM,eAAe,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAWtB,iBAAiB;IAiB/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IA2ChC,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAGrB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,oBAAoB;CAG5B;AAED,UAAU,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B"}
|
|
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const interface_auth_service_1 = __importDefault(require("./interface-auth-service"));
|
|
16
|
-
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
17
16
|
const data_service_1 = __importDefault(require("./data-service"));
|
|
18
17
|
/**
|
|
19
18
|
* @description Класс предназначен для получения, парсинг criterion.
|
|
@@ -21,11 +20,7 @@ const data_service_1 = __importDefault(require("./data-service"));
|
|
|
21
20
|
class CriterionService extends interface_auth_service_1.default {
|
|
22
21
|
get(params) {
|
|
23
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
// Now ID params is required.
|
|
25
|
-
if (!params.id)
|
|
26
|
-
throw api_error_1.default.UndefinedId();
|
|
27
23
|
const parsedCriterion = this.parseCriterion(params.criterion);
|
|
28
|
-
console.log(parsedCriterion);
|
|
29
24
|
const entities = [
|
|
30
25
|
[params.entity, params.id],
|
|
31
26
|
...params.masterEntities
|
|
@@ -48,6 +43,10 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
48
43
|
return result;
|
|
49
44
|
});
|
|
50
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* Продумать: если в момент получения значения для критерия нужной сущности - нет. В таком случае нужно пропускать
|
|
48
|
+
* критерий.
|
|
49
|
+
*/
|
|
51
50
|
generateCriterionArray(parsedCriterion, preset, entityValues) {
|
|
52
51
|
const parseArray = (array, separator, entity) => {
|
|
53
52
|
const result = array
|
|
@@ -64,13 +63,18 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
64
63
|
throw new Error(`CriterionService: Can't found values config config for entity ${entityName}`);
|
|
65
64
|
return config.values;
|
|
66
65
|
};
|
|
66
|
+
const checkEntity = (entityName) => entityValues.find(e => e.entity === entityName);
|
|
67
67
|
function parse(elem, entity) {
|
|
68
68
|
if (Array.isArray(elem))
|
|
69
69
|
return parseArray(elem, CriterionService.SYMBOL_CONCAT, entity);
|
|
70
|
-
if (typeof elem === 'string')
|
|
71
|
-
return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
|
|
72
70
|
if (this.isMasterCriterion(elem))
|
|
73
71
|
return parse.call(this, elem.fields, elem.entity);
|
|
72
|
+
if (checkEntity(entity)) {
|
|
73
|
+
console.log(`[criterion-service]: entity ${entity} was not inited. Please check that id for current entity was provided.`);
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
76
|
+
if (typeof elem === 'string')
|
|
77
|
+
return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
|
|
74
78
|
// Custom Criterion
|
|
75
79
|
const expression = elem.expression;
|
|
76
80
|
const equal = expression.equal;
|
|
@@ -127,8 +131,11 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
127
131
|
if (entityName === null)
|
|
128
132
|
entityName = entities[0][0];
|
|
129
133
|
const id = (_a = entities.find(e => e[0] === entityName)) === null || _a === void 0 ? void 0 : _a[1];
|
|
130
|
-
if (!id)
|
|
131
|
-
|
|
134
|
+
if (!id) {
|
|
135
|
+
const error = new Error(`Parse Fields From Criterion: for entity ${entityName} id is not provided.`);
|
|
136
|
+
console.log(error.message);
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
132
139
|
if (!store.has(entityName))
|
|
133
140
|
store.set(entityName, {
|
|
134
141
|
fields: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;
|
|
1
|
+
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
|