eservices-back-core 1.2.66 → 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.
|
@@ -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;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,OAAO,CAAC,sBAAsB;
|
|
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"}
|
|
@@ -43,6 +43,10 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
43
43
|
return result;
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* Продумать: если в момент получения значения для критерия нужной сущности - нет. В таком случае нужно пропускать
|
|
48
|
+
* критерий.
|
|
49
|
+
*/
|
|
46
50
|
generateCriterionArray(parsedCriterion, preset, entityValues) {
|
|
47
51
|
const parseArray = (array, separator, entity) => {
|
|
48
52
|
const result = array
|
|
@@ -59,13 +63,18 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
59
63
|
throw new Error(`CriterionService: Can't found values config config for entity ${entityName}`);
|
|
60
64
|
return config.values;
|
|
61
65
|
};
|
|
66
|
+
const checkEntity = (entityName) => entityValues.find(e => e.entity === entityName);
|
|
62
67
|
function parse(elem, entity) {
|
|
63
68
|
if (Array.isArray(elem))
|
|
64
69
|
return parseArray(elem, CriterionService.SYMBOL_CONCAT, entity);
|
|
65
|
-
if (typeof elem === 'string')
|
|
66
|
-
return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
|
|
67
70
|
if (this.isMasterCriterion(elem))
|
|
68
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));
|
|
69
78
|
// Custom Criterion
|
|
70
79
|
const expression = elem.expression;
|
|
71
80
|
const equal = expression.equal;
|
|
@@ -122,8 +131,11 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
122
131
|
if (entityName === null)
|
|
123
132
|
entityName = entities[0][0];
|
|
124
133
|
const id = (_a = entities.find(e => e[0] === entityName)) === null || _a === void 0 ? void 0 : _a[1];
|
|
125
|
-
if (!id)
|
|
126
|
-
|
|
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
|
+
}
|
|
127
139
|
if (!store.has(entityName))
|
|
128
140
|
store.set(entityName, {
|
|
129
141
|
fields: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAE5D,kEAAyC;AAEzC;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,gCAAoB;IAS3D,GAAG,CAAC,MAA0B;;YACnC,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE9D,MAAM,QAAQ,GAAuB;gBACpC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC1B,GAAG,MAAM,CAAC,cAAc;aACxB,CAAA;YAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzE,CAAC;KAAA;IAEa,iBAAiB,CAAC,eAAsC,EAAE,MAAW,EAAE,QAA4B;;YAEhH,mEAAmE;YACnE,2BAA2B;YAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YAE7E,sDAAsD;YACtD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAEpE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;YAE3H,gHAAgH;YAChH,sBAAsB;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YACpF,OAAO,MAAM,CAAC;QACf,CAAC;KAAA;
|
|
1
|
+
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAE5D,kEAAyC;AAEzC;;GAEG;AACH,MAAqB,gBAAiB,SAAQ,gCAAoB;IAS3D,GAAG,CAAC,MAA0B;;YACnC,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE9D,MAAM,QAAQ,GAAuB;gBACpC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC1B,GAAG,MAAM,CAAC,cAAc;aACxB,CAAA;YAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACzE,CAAC;KAAA;IAEa,iBAAiB,CAAC,eAAsC,EAAE,MAAW,EAAE,QAA4B;;YAEhH,mEAAmE;YACnE,2BAA2B;YAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YAE7E,sDAAsD;YACtD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAEpE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;YAE3H,gHAAgH;YAChH,sBAAsB;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YACpF,OAAO,MAAM,CAAC;QACf,CAAC;KAAA;IAED;;;OAGG;IACK,sBAAsB,CAAC,eAAsC,EAAE,MAAW,EAAE,YAAsC;QACzH,MAAM,UAAU,GAAG,CAAC,KAAY,EAAE,SAAiB,EAAE,MAAc,EAAE,EAAE;YACtE,MAAM,MAAM,GAAG,KAAK;iBACnB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;iBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;YAExB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACrD,CAAC,CAAA;QAED,gHAAgH;QAChH,uDAAuD;QACvD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxH,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,UAAU,EAAE,CAAC,CAAC;YAC5G,OAAO,MAAM,CAAC,MAAM,CAAC;QACtB,CAAC,CAAA;QACD,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QAE5F,SAAS,KAAK,CAAyB,IAAmB,EAAE,MAAc;YAEzE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YACzF,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpF,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE;gBACxB,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,wEAAwE,CAAC,CAAA;gBAC1H,OAAO,IAAI,CAAC;aACZ;YAED,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAC3B,OAAO,IAAI,CAAC,aAAa,CACxB,SAAS,CAAC,IAAI,EAAE,MAAM,CAAE,EACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAC5D,CAAC;YAGH,mBAAmB;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACnC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;YAE/B,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAEzC,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC,IAAI,CAAC;YAEtH,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,UAAU,CAAC,eAAe,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAChE,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,IAAY,EAAE,KAAU;QAC7C,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC,CAAC,qBAAqB;QACnE,OAAO,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD;;;OAGG;IACK,cAAc,CAAC,IAAY,EAAE,MAAW,EAAE,MAAM;QACvD,sCAAsC;QACtC,MAAM,mBAAmB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,mBAAmB,EAAE;YACxB,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAExD,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,OAAO,MAAM,CAAC,gBAAgB,CAAC;YACrF,MAAM,IAAI,KAAK,CAAC,uBAAuB,UAAU,EAAE,CAAC,CAAA;SACpD;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED;;OAEG;IACW,oBAAoB,CAAC,WAA2B;;YAE7D,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhD,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE;gBACjG,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aAC/B,CAAC,CAAC,CAAA;YAEH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEpD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,iBACzC,MAAM,IACH,WAAW,CAAC,KAAK,CAAC,EACpB,CAAC,CAAA;QACJ,CAAC;KAAA;IACD;;OAEG;IACK,wBAAwB,CAAC,eAAsC,EAAE,QAA4B;QACpG,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0C,CAAA;QAC/D,MAAM,GAAG,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,GAAG,KAAe,EAAE,EAAE;;YACvE,IAAI,UAAU,KAAK,IAAI;gBAAE,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAErD,MAAM,EAAE,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,0CAAG,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,EAAE,EAAE;gBACR,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,2CAA2C,UAAU,sBAAsB,CAAC,CAAC;gBACrG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO;aACP;YAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE;oBACjD,MAAM,EAAE,EAAE;oBACV,EAAE;iBACF,CAAC,CAAC;YACH,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAA;QAED,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACxB,IAAI,OAAO,SAAS,KAAK,QAAQ;oBAAE,OAAQ,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;gBAC/D,IAAI,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBAAE,OAAO,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;gBACxF,sBAAsB;gBACtB,uBAAuB;gBACvB,MAAM,KAAK,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;gBAEzC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAE,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBACtD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAE,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAChC,MAAM,CAAC,IAAI,iCACP,MAAM,KACT,MAAM,IACL,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,iBAAiB,CAAC,IAAa;QACtC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QAC5D,OAAO,CACN,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;eACjD,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CACvD,CAAA;IACF,CAAC;IAED;;;OAGG;IACK,aAAa,CAAC,SAAiB;QACtC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACrC,CAAC;IACD;;;;;;;;OAQG;IACK,cAAc,CAAC,SAAyB;QAE/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtE,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACrE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;YAErC,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAA;IACH,CAAC;IACO,oBAAoB,CAAC,SAAiB;QAC7C,OAAO,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;;AAtNF,mCAuNC;AAtNgB,6BAAY,GAAG,GAAG,CAAA;AAElC;;;GAGG;AACa,8BAAa,GAAG,GAAG,CAAC"}
|