eservices-back-core 1.5.6 → 1.5.7

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.
Files changed (43) hide show
  1. package/dist/auth/use-auth.d.ts.map +1 -1
  2. package/dist/auth/use-auth.js +4 -1
  3. package/dist/auth/use-auth.js.map +1 -1
  4. package/dist/controller/close-api/actions-controller.d.ts.map +1 -1
  5. package/dist/controller/close-api/actions-controller.js +11 -16
  6. package/dist/controller/close-api/actions-controller.js.map +1 -1
  7. package/dist/controller/close-api/data-controller.d.ts.map +1 -1
  8. package/dist/controller/close-api/data-controller.js +16 -22
  9. package/dist/controller/close-api/data-controller.js.map +1 -1
  10. package/dist/controller/close-api/executors-controller.d.ts.map +1 -1
  11. package/dist/controller/close-api/executors-controller.js +9 -12
  12. package/dist/controller/close-api/executors-controller.js.map +1 -1
  13. package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
  14. package/dist/controller/close-api/metadata-controller.js +7 -15
  15. package/dist/controller/close-api/metadata-controller.js.map +1 -1
  16. package/dist/controller/close-api/view-controller.d.ts.map +1 -1
  17. package/dist/controller/close-api/view-controller.js +7 -13
  18. package/dist/controller/close-api/view-controller.js.map +1 -1
  19. package/dist/middleware/error-middleware.d.ts +1 -1
  20. package/dist/middleware/error-middleware.d.ts.map +1 -1
  21. package/dist/middleware/error-middleware.js +2 -3
  22. package/dist/middleware/error-middleware.js.map +1 -1
  23. package/dist/model/criterion.d.ts +13 -3
  24. package/dist/model/criterion.d.ts.map +1 -1
  25. package/dist/model/criterion.js +6 -3
  26. package/dist/model/criterion.js.map +1 -1
  27. package/dist/router/index.d.ts.map +1 -1
  28. package/dist/router/index.js +2 -13
  29. package/dist/router/index.js.map +1 -1
  30. package/dist/socket/metadata-read-socket.d.ts.map +1 -1
  31. package/dist/socket/metadata-read-socket.js +7 -17
  32. package/dist/socket/metadata-read-socket.js.map +1 -1
  33. package/dist/utils/get-criterion-config.d.ts +5 -0
  34. package/dist/utils/get-criterion-config.d.ts.map +1 -0
  35. package/dist/utils/get-criterion-config.js +32 -0
  36. package/dist/utils/get-criterion-config.js.map +1 -0
  37. package/dist/utils/get-criterion-preset.d.ts +6 -2
  38. package/dist/utils/get-criterion-preset.d.ts.map +1 -1
  39. package/dist/utils/get-criterion-preset.js +10 -3
  40. package/dist/utils/get-criterion-preset.js.map +1 -1
  41. package/dist/utils/get-usage-context.d.ts.map +1 -1
  42. package/dist/utils/get-usage-context.js.map +1 -1
  43. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAkIZ,OAAO;wBAwBpB,OAAO;EASlC;AAqCD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM/F;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAElD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
1
+ {"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAkIZ,OAAO;wBAwBpB,OAAO;EASlC;AAqCD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM/F;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAIlD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
@@ -231,7 +231,10 @@ function updateSessionByTokenSet(request, tokenSet) {
231
231
  debug("Session was updated by TokenSet");
232
232
  }
233
233
  function getFullAccessToken(request) {
234
- return `${request.session[SESSION_KEY].tokenType} ${request.session[SESSION_KEY].accessToken}`;
234
+ const state = getAuthStateFormRequest(request);
235
+ if (!state)
236
+ return null;
237
+ return [state.tokenType, state.accessToken].join(' ');
235
238
  }
236
239
  exports.getFullAccessToken = getFullAccessToken;
237
240
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"actions-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AASzC,MAAM,CAAC,OAAO,OAAO,iBAAiB;WAExB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAarC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAgBlD,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;CAgC/D"}
1
+ {"version":3,"file":"actions-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AASzC,MAAM,CAAC,OAAO,OAAO,iBAAiB;WAExB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAarC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAgBlD,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;CA0B/D"}
@@ -14,11 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const action_service_1 = __importDefault(require("../../services/action-service"));
16
16
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
17
- const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
18
- const Store_1 = __importDefault(require("../../store/Store"));
19
- const get_criterion_preset_1 = __importDefault(require("../../utils/get-criterion-preset"));
17
+ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
20
18
  const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
21
- const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
19
+ const criterion_1 = __importDefault(require("../../model/criterion"));
20
+ const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
21
+ const add_criterion_to_header_1 = __importDefault(require("../../utils/add-criterion-to-header"));
22
22
  class ActionsController {
23
23
  static get(req, res, next) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
@@ -50,24 +50,19 @@ class ActionsController {
50
50
  });
51
51
  }
52
52
  static getById(request, response, next) {
53
- var _a;
54
53
  return __awaiter(this, void 0, void 0, function* () {
55
54
  try {
56
55
  const { entity, id } = request.params;
56
+ const parsedId = Number.parseInt(id, 10);
57
57
  const context = (0, get_usage_context_1.default)(request.headers.referer);
58
58
  const actionService = new action_service_1.default(request.infoAccessToken);
59
- const criterionService = new criterion_service_1.default(request.infoAccessToken);
60
- const criterionConfig = ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a.criterionForAction) ||
61
- ((yield metadata_service_1.default.checkFieldInEntity(entity, 'StatusCode')) ? ["StatusCode"] : []);
62
- const actionCriterion = yield criterionService.get({
63
- entity,
64
- id: Number.parseInt(id, 10),
65
- criterion: criterionConfig,
66
- preset: (0, get_criterion_preset_1.default)(request),
67
- masterEntities: (0, get_master_entities_1.default)(request)
59
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity, 'criterionForAction'), {
60
+ primaryEntity: entity, primaryId: parsedId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(request),
61
+ masterEntities: (0, get_master_entities_1.default)(request), accessToken: request.infoAccessToken
68
62
  });
69
- const result = yield actionService.get({ context, criterion: actionCriterion });
70
- response.setHeader('_filter', actionCriterion);
63
+ const criterion = yield criterionObject.generate();
64
+ const result = yield actionService.get({ context, criterion });
65
+ (0, add_criterion_to_header_1.default)(response, criterion);
71
66
  return response.json(result);
72
67
  }
73
68
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"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"}
@@ -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;AAa1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAElB,MAAM,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA0BjD;;;OAGG;WACU,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAgCpE;;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;WAuClD,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"}
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;AAa1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAElB,MAAM,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAyBjD;;;OAGG;WACU,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA4BpE;;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;WAuClD,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"}
@@ -17,30 +17,27 @@ const Server_1 = __importDefault(require("../../Server"));
17
17
  const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
18
18
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
19
19
  const transform_update_values_1 = __importDefault(require("../../utils/transform-update-values"));
20
- const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
21
- const get_criterion_preset_1 = __importDefault(require("../../utils/get-criterion-preset"));
22
- const Store_1 = __importDefault(require("../../store/Store"));
20
+ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
23
21
  const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
24
22
  const add_criterion_to_header_1 = __importDefault(require("../../utils/add-criterion-to-header"));
25
23
  const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
24
+ const criterion_1 = __importDefault(require("../../model/criterion"));
25
+ const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
26
26
  class DataController {
27
27
  static create(req, response, next) {
28
- var _a;
29
28
  return __awaiter(this, void 0, void 0, function* () {
30
29
  try {
31
30
  const { entity } = req.params;
32
31
  const { values } = req.body;
33
32
  const context = (0, get_usage_context_1.default)(req.headers.referer);
34
- const criterionService = new criterion_service_1.default(req.infoAccessToken);
35
- const rules = yield criterionService.get({
36
- entity,
37
- preset: (0, get_criterion_preset_1.default)(req),
38
- masterEntities: (0, get_master_entities_1.default)(req),
39
- criterion: ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a.criterion) || []
33
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity), {
34
+ primaryEntity: entity, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
35
+ masterEntities: (0, get_master_entities_1.default)(req), accessToken: req.infoAccessToken
40
36
  });
41
- (0, add_criterion_to_header_1.default)(response, rules);
37
+ const criterion = yield criterionObject.generate();
38
+ (0, add_criterion_to_header_1.default)(response, criterion);
42
39
  const dataService = new data_service_1.default(req.infoAccessToken);
43
- const data = yield dataService.create(entity, (0, transform_update_values_1.default)(values), context, rules);
40
+ const data = yield dataService.create(entity, (0, transform_update_values_1.default)(values), context, criterion);
44
41
  return void response.json(data);
45
42
  }
46
43
  catch (e) {
@@ -53,25 +50,22 @@ class DataController {
53
50
  * values - должны приходить в удобном формате {name: value, name: {name: value}}
54
51
  */
55
52
  static updateEntityById(req, response, next) {
56
- var _a;
57
53
  return __awaiter(this, void 0, void 0, function* () {
58
54
  try {
59
55
  const { values } = req.body;
60
56
  const { entity, id } = req.params;
57
+ const parsedId = Number.parseInt(id, 10);
61
58
  const context = (0, get_usage_context_1.default)(req.headers.referer);
62
59
  const dataService = new data_service_1.default(req.infoAccessToken);
63
60
  // Перебираем все возможные варианты получения версии
64
61
  const version = req.body.version || req.body.Version || values.Version || values.version || 0;
65
- const criterionService = new criterion_service_1.default(req.infoAccessToken);
66
- const rules = yield criterionService.get({
67
- entity,
68
- id: parseInt(id, 10),
69
- preset: (0, get_criterion_preset_1.default)(req),
70
- masterEntities: (0, get_master_entities_1.default)(req),
71
- criterion: ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a.criterion) || ["StatusCode"]
62
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity), {
63
+ primaryEntity: entity, primaryId: parsedId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
64
+ masterEntities: (0, get_master_entities_1.default)(req), accessToken: req.infoAccessToken
72
65
  });
73
- (0, add_criterion_to_header_1.default)(response, rules);
74
- const output = yield dataService.updateById(entity, id, (0, transform_update_values_1.default)(values), version, context, rules);
66
+ const criterion = yield criterionObject.generate();
67
+ (0, add_criterion_to_header_1.default)(response, criterion);
68
+ const output = yield dataService.updateById(entity, id, (0, transform_update_values_1.default)(values), version, context, criterion);
75
69
  response.json(output);
76
70
  }
77
71
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"executors-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/executors-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,mBAAmB;WAC1B,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAavD,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAoCxD,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CA8B3E"}
1
+ {"version":3,"file":"executors-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/executors-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,mBAAmB;WAC1B,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAavD,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAmCxD,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CA8B3E"}
@@ -14,11 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
16
16
  const data_service_1 = __importDefault(require("../../services/data-service"));
17
- const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
18
- const get_criterion_preset_1 = __importDefault(require("../../utils/get-criterion-preset"));
19
- const Store_1 = __importDefault(require("../../store/Store"));
17
+ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
20
18
  const add_criterion_to_header_1 = __importDefault(require("../../utils/add-criterion-to-header"));
21
19
  const Filter_1 = __importDefault(require("../../utils/Filter"));
20
+ const criterion_1 = __importDefault(require("../../model/criterion"));
21
+ const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
22
22
  class ExecutorsController {
23
23
  static checkDIPSerialNumbers(req, res, next) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
@@ -35,27 +35,24 @@ class ExecutorsController {
35
35
  });
36
36
  }
37
37
  static uploadDIPSerialNumbers(req, res, next) {
38
- var _a;
39
38
  return __awaiter(this, void 0, void 0, function* () {
40
39
  try {
41
40
  const { data, applicationId } = req.body;
42
41
  const context = (0, get_usage_context_1.default)(req.headers.referer);
43
42
  const ds = new data_service_1.default(req.infoAccessToken);
44
43
  const entity = 'DIPApplicationSerialNumber';
45
- const criterionService = new criterion_service_1.default(req.infoAccessToken);
46
- const rules = yield criterionService.get({
47
- entity,
48
- preset: (0, get_criterion_preset_1.default)(req),
49
- masterEntities: [["Application", Number.parseInt(applicationId, 10)]],
50
- criterion: ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a.criterion) || []
44
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity), {
45
+ primaryEntity: entity, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
46
+ masterEntities: [["Application", Number.parseInt(applicationId, 10)]], accessToken: req.infoAccessToken
51
47
  });
52
- (0, add_criterion_to_header_1.default)(res, rules);
48
+ const criterion = yield criterionObject.generate();
49
+ (0, add_criterion_to_header_1.default)(res, criterion);
53
50
  for (const SerialNumber of data) {
54
51
  yield ds.create(entity, {
55
52
  SerialNumber,
56
53
  ApplicationId: applicationId,
57
54
  OperationCode: 'A'
58
- }, context, rules);
55
+ }, context, criterion);
59
56
  }
60
57
  res.json({});
61
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"executors-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/executors-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sFAA4D;AAC5D,+EAAsD;AACtD,yFAAgE;AAChE,4FAAkE;AAClE,8DAAsC;AACtC,kGAAuE;AACvE,gEAAwC;AAExC,MAAqB,mBAAmB;IACvC,MAAM,CAAO,qBAAqB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACnE,IAAI,CAAC;gBACJ,MAAM,EAAC,IAAI,EAAC,GAAG,GAAG,CAAC,IAAwB,CAAC;gBAC5C,MAAM,GAAG,GAAG,gBAAgB,CAAA;gBAC5B,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACzE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAE3C,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC;YAClE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;IAED,MAAM,CAAO,sBAAsB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;;YACpE,IAAI,CAAC;gBACJ,MAAM,EAAC,IAAI,EAAE,aAAa,EAAC,GAAG,GAAG,CAAC,IAAyC,CAAC;gBAC5E,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAErD,MAAM,EAAE,GAAG,IAAI,sBAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAEhD,MAAM,MAAM,GAAG,4BAA4B,CAAA;gBAE3C,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAEnE,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC;oBACxC,MAAM;oBACN,MAAM,EAAE,IAAA,8BAAkB,EAAC,GAAG,CAAC;oBAC/B,cAAc,EAAE,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC;oBACrE,SAAS,EAAE,CAAA,MAAA,eAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC,0CAAE,SAAS,KAAI,EAAE;iBACtE,CAAC,CAAC;gBAEH,IAAA,iCAAoB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAGjC,KAAK,MAAM,YAAY,IAAI,IAAI,EAAE,CAAC;oBACjC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;wBACvB,YAAY;wBACZ,aAAa,EAAE,aAAa;wBAC5B,aAAa,EAAE,GAAG;qBAClB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpB,CAAC;gBAED,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEb,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAA;YACR,CAAC;;KACD;IAED,MAAM,CAAO,4BAA4B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC1E,IAAI,CAAC;gBAEJ,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAEzD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,OAAO,CAAiC,gBAAgB,EAAE,EAAE,CAAC,CAAC;gBAEnG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CACzB,WAAW,CAAC,QAAQ,CAAC,aAAa,EAAE;oBACnC,MAAM,EAAE,IAAA,gBAAM,EAAC;wBACd,YAAY,EAAE,QAAQ,CAAC,IAAI;wBAC3B,UAAU,EAAE,GAAG;qBACf,CAAC;iBACF,CAAC;qBACD,IAAI,CAAC,KAAK,CAAC,EAAE;oBACb,OAAO,iCACH,KAAK,KACR,YAAY,EAAE,QAAQ,CAAC,IAAI,IAC1B,CAAC;gBACJ,CAAC,CAAC,CACF,CACD,CAAA;gBAED,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAElB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;CACD;AAhFD,sCAgFC"}
1
+ {"version":3,"file":"executors-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/executors-controller.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAQ1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAmCrC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAc3C,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAYjE;;;;;;;;;;;;OAYG;WACU,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAUpE"}
1
+ {"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAyBrC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAc3C,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAYjE;;;;;;;;;;;;OAYG;WACU,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAUpE"}
@@ -14,32 +14,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
16
16
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
17
- const Store_1 = __importDefault(require("../../store/Store"));
18
- const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
19
17
  const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
20
18
  const list_setting_service_1 = __importDefault(require("../../services/list-setting-service"));
19
+ const criterion_1 = __importDefault(require("../../model/criterion"));
20
+ const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
21
+ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
21
22
  class MetadataController {
22
23
  static get(req, res, next) {
23
- var _a;
24
24
  return __awaiter(this, void 0, void 0, function* () {
25
25
  try {
26
26
  const context = (0, get_usage_context_1.default)(req.headers.referer);
27
27
  const { type, id } = req.query;
28
28
  const { entity } = req.params;
29
- const parsedType = type ? String(type) : 'criterion';
30
- const cs = new criterion_service_1.default(req.infoAccessToken);
31
29
  const parsedId = Number.parseInt(id, 10);
32
- const criterionConfig = ((_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a[parsedType]) ||
33
- ((yield metadata_service_1.default.checkFieldInEntity(entity, 'StatusCode')) ? ["StatusCode"] : []);
34
- const criterion = yield cs.get({
35
- entity,
36
- id: parsedId,
37
- criterion: criterionConfig,
38
- preset: {
39
- currentContextId: req.infoCurrentContextId
40
- },
41
- masterEntities: (0, get_master_entities_1.default)(req)
30
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity, type), {
31
+ primaryEntity: entity, primaryId: parsedId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
32
+ masterEntities: (0, get_master_entities_1.default)(req), accessToken: req.infoAccessToken
42
33
  });
34
+ const criterion = yield criterionObject.generate();
43
35
  const metadataService = new metadata_service_1.default(req.infoAccessToken);
44
36
  const metadata = yield metadataService.getFull(entity, criterion, context);
45
37
  if (id)
@@ -1 +1 @@
1
- {"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"view-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAErB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAYlD,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAW9C,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAatD,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA+BnD,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAUtD,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAkBjD,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAiC5D"}
1
+ {"version":3,"file":"view-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAU1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAErB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAYlD,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAW9C,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAatD,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA+BnD,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAUtD,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAkBjD,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAyB5D"}
@@ -17,8 +17,9 @@ const store_1 = require("../../store");
17
17
  const api_error_1 = __importDefault(require("../../errors/api-error"));
18
18
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
19
19
  const Store_1 = __importDefault(require("../../store/Store"));
20
- const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
21
20
  const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
21
+ const criterion_1 = __importDefault(require("../../model/criterion"));
22
+ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
22
23
  class ViewController {
23
24
  static getProcessWizard(req, res, next) {
24
25
  return __awaiter(this, void 0, void 0, function* () {
@@ -118,21 +119,14 @@ class ViewController {
118
119
  return __awaiter(this, void 0, void 0, function* () {
119
120
  try {
120
121
  const navigation = Store_1.default.viewNavigation;
121
- const cs = new criterion_service_1.default(req.infoAccessToken);
122
122
  const n = yield Promise.all(navigation.map(item => {
123
123
  if (!item.criterion)
124
124
  return item;
125
- return cs.get({
126
- entity: "Customer",
127
- // @ts-ignore
128
- id: req.currentContextId,
129
- criterion: item.criterion,
130
- preset: {
131
- // @ts-ignore
132
- currentContextId: req.currentContextId
133
- },
134
- masterEntities: (0, get_master_entities_1.default)(req)
135
- })
125
+ const criterionObject = new criterion_1.default(item.criterion, {
126
+ primaryEntity: "Customer", primaryId: req.infoCurrentContextId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
127
+ masterEntities: (0, get_master_entities_1.default)(req), accessToken: req.infoAccessToken
128
+ });
129
+ return criterionObject.generate()
136
130
  .then(result => {
137
131
  return result === null ? null : item;
138
132
  });
@@ -1 +1 @@
1
- {"version":3,"file":"view-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"view-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,mGAAyE;AACzE,uCAAkC;AAClC,uEAA8C;AAC9C,sFAA4D;AAC5D,8DAAsC;AACtC,0FAAgE;AAChE,sEAA8C;AAC9C,2EAA+E;AAE/E,MAAqB,cAAc;IAElC,MAAM,CAAO,gBAAgB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC9D,IAAI,CAAC;gBACJ,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBACrC,MAAM,EAAE,GAAG,IAAI,gCAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACzD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAE7D,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEhB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;IACD,MAAM,CAAO,YAAY,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC1D,IAAI,CAAC;gBACJ,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBACrC,MAAM,EAAE,GAAG,IAAI,gCAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACzD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAEpD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;IACD,MAAM,CAAO,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACrD,IAAI,CAAC;gBACJ,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBACrC,MAAM,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC3C,MAAM,EAAE,GAAG,IAAI,gCAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACzD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;gBAExE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;IAED,MAAM,CAAC,uBAAuB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;QAC/D,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;YAC/B,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErC,MAAM,YAAY,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CACnD,MAAM,CAAC,EAAE,CACR,MAAM,CAAC,QAAQ,KAAK,MAAM;gBAC1B,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CACrE,CAAA;YAED,IAAI,CAAC,YAAY;gBAAE,MAAM,mBAAQ,CAAC,UAAU,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAC;YAEzF,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;YAEvC,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;oBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAChE,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAAE,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;gBAC7D,OAAO,IAAI,CAAC;YACb,CAAC,CAAC,CAAA;YAEF,GAAG,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,YAAY,CAAC,IAAI;aACvB,CAAC,CAAA;QAEH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,CAAC,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAED,MAAM,CAAO,oBAAoB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;;YAClE,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAErD,GAAG,CAAC,IAAI,CAAC,CAAA,MAAA,eAAK,CAAC,aAAa,CAAC,kBAAkB,0CAAG,OAAO,CAAC,KAAI,EAAE,CAAC,CAAC;YACnE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;;KACD;IAED,MAAM,CAAO,eAAe,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC7D,IAAI,CAAC;gBACJ,MAAM,EAAC,MAAM,EAAE,IAAI,EAAC,GAAG,GAAG,CAAC,KAAK,CAAA;gBAEhC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;oBAAE,MAAM,mBAAQ,CAAC,oCAAoC,EAAE,CAAC;gBAE5E,aAAa;gBACb,MAAM,QAAQ,GAAG,eAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAA;gBAE7D,IAAI,CAAC,QAAQ;oBAAE,MAAM,mBAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAEjE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;IAED,MAAM,CAAO,aAAa,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC3D,IAAI,CAAC;gBACJ,MAAM,UAAU,GAAG,eAAK,CAAC,cAAc,CAAC;gBAExC,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAEjD,IAAI,CAAC,IAAI,CAAC,SAAS;wBAAE,OAAO,IAAI,CAAC;oBAEjC,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,SAAS,EAAE;wBACrD,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAA,oDAA6B,EAAC,GAAG,CAAC;wBAC1G,cAAc,EAAE,IAAA,6BAAiB,EAAC,GAAG,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,eAAe;qBACxE,CAAC,CAAA;oBACF,OAAO,eAAe,CAAC,QAAQ,EAAE;yBAChC,IAAI,CAAC,MAAM,CAAC,EAAE;wBACd,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;oBACrC,CAAC,CAAC,CAAA;gBACH,CAAC,CAAC,CAAC,CAAA;gBAGH,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,CAAC,CAAC,CAAC;YACT,CAAC;QACF,CAAC;KAAA;CAED;AA1HD,iCA0HC"}
@@ -1,4 +1,4 @@
1
1
  import { Request, Response } from "express";
2
- declare const _default: (err: any, req: Request, res: Response) => Promise<void>;
2
+ declare const _default: (err: any, req: Request, res: Response, next: any) => Promise<void>;
3
3
  export default _default;
4
4
  //# sourceMappingURL=error-middleware.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAOV,OAAO,OAAO,QAAQ;AAAtD,wBAyBE"}
1
+ {"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAOV,OAAO,OAAO,QAAQ;AAAtD,wBAwBE"}
@@ -18,8 +18,7 @@ const auth_middleware_1 = require("./auth-middleware");
18
18
  const use_logger_1 = require("../logger/use-logger");
19
19
  const auth_error_1 = __importDefault(require("../errors/auth-error"));
20
20
  const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
21
- exports.default = (err, req, res) => __awaiter(void 0, void 0, void 0, function* () {
22
- console.log('ERROR MIDDLEWARE');
21
+ exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
23
22
  use_logger_1.Logger.error('Error level %o', err);
24
23
  // Error bind with Authorization
25
24
  if (err instanceof auth_error_1.default || (req.method === "GET" && !req.infoUserId)) {
@@ -34,6 +33,6 @@ exports.default = (err, req, res) => __awaiter(void 0, void 0, void 0, function*
34
33
  .json((0, error_response_dto_1.default)(err.message, err.status));
35
34
  if (err instanceof Error)
36
35
  return void res.status(400).json((0, error_response_dto_1.default)(err.message, 400));
37
- res.redirect((0, get_auth_url_1.default)().login);
36
+ res.writeHead(302, { location: (0, get_auth_url_1.default)().login });
38
37
  });
39
38
  //# sourceMappingURL=error-middleware.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;AAE9C,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACzD,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC/B,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEpC,gCAAgC;IAChC,IACC,GAAG,YAAY,oBAAS,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EACpE,CAAC;QACF,IAAA,4BAAU,GAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,OAAO,GAAG,KAAK,QAAQ;QAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9D,IAAI,GAAG,YAAY,mBAAQ;QAC1B,OAAO,KAAK,GAAG;aACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,IAAI,GAAG,YAAY,KAAK;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEtE,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAA,CAAC"}
1
+ {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;AAE9C,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC/D,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEpC,gCAAgC;IAChC,IACC,GAAG,YAAY,oBAAS,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EACpE,CAAC;QACF,IAAA,4BAAU,GAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,OAAO,GAAG,KAAK,QAAQ;QAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9D,IAAI,GAAG,YAAY,mBAAQ;QAC1B,OAAO,KAAK,GAAG;aACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,IAAI,GAAG,YAAY,KAAK;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEtE,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,QAAQ,EAAE,IAAA,sBAAU,GAAE,CAAC,KAAK,EAAC,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC"}
@@ -18,11 +18,17 @@ export default class Criterion {
18
18
  /**
19
19
  * @description Названия сущности, которая является базовой для текущего критерия
20
20
  */
21
- primaryEntity: string;
21
+ private readonly primaryEntity;
22
22
  /**
23
23
  * @description Набор сущностей с их идентификаторами
24
24
  */
25
- masterEntities: Map<string, number>;
25
+ private readonly masterEntities;
26
+ /**
27
+ * @description Для упрощения работы с критериями был добавлен данный класс Collector. Его суть в том, что мы
28
+ * проходясь по нашей конфигурации, генерируем обратные функции и сохраняем их. Обратная функция - это функция результат
29
+ * которой используется для каждой ячейки критерия. Иными словами проходясь в методе 'collectExtendedInformation' мы
30
+ * собираем такой массив функций. А затем просто вызываем их.
31
+ */
26
32
  collector: CriterionCollector;
27
33
  /**
28
34
  * @description Конфигурация принимает массив критериев. Обратите внимание, что Критерии первого уровня, будут соединены
@@ -36,10 +42,14 @@ export default class Criterion {
36
42
  * рекурсивно.
37
43
  */
38
44
  private parseCriterion;
45
+ /**
46
+ * @description Метод используется для деления строки состоящей их нескольких полей.
47
+ * @example "StatusCode&Name" ["StatusCode", "Name"]
48
+ */
39
49
  private splitStringByFieldName;
40
50
  /**
41
51
  * @description Функция собирает все поля для каждой сущности. Это нудно для того, чтобы одним запросом загрузить
42
- * всю информацию и не запрашивать по одному полу. Также собирает
52
+ * всю информацию и не запрашивать по одному полу. Также именно тут устанавливается информация в collector.
43
53
  */
44
54
  private collectExtendedInformation;
45
55
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"criterion.d.ts","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,SAAS;IAE7B;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,EAAE,CAAM;IAE/B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,cAAc,sBAA4B;IAE1C,SAAS,EAAE,kBAAkB,CAAA;IAE7B;;;;OAIG;gBACS,aAAa,EAAE,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,iBAAiB;IAqB5F;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,sBAAsB;IAG9B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAqBlC;;OAEG;IACU,QAAQ;IAKrB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAIjE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,IAAI,eAAe,CAAC,yBAAyB,CAAC;CAGlG;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAA;AAGjF;;;;GAIG;AACH,KAAK,eAAe,GAAG,MAAM,CAAA;AAE7B;;;GAGG;AACH,KAAK,gBAAgB,GAAG;IACvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED;;;GAGG;AACH,KAAK,eAAe,CAAC,CAAC,GAAG,OAAO,IAAI;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,CAAC,CAAA;CACb,CAAA;AAOD;;;GAGG;AACH,KAAK,yBAAyB,GAAG;IAChC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAA;CAChJ,CAAA;AAUD,KAAK,wBAAwB,GAAG,MAAM,GAAG,uBAAuB,CAAA;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAGxD,UAAU,iBAAiB;IAC1B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAEpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC5B"}
1
+ {"version":3,"file":"criterion.d.ts","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,SAAS;IAE7B;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,EAAE,CAAM;IAE/B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAE3D;;;;;OAKG;IACH,SAAS,EAAE,kBAAkB,CAAA;IAE7B;;;;OAIG;gBACS,aAAa,EAAE,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,iBAAiB;IAqB5F;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAWtB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAG9B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAmBlC;;OAEG;IACU,QAAQ;IAKrB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAIjE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,IAAI,eAAe,CAAC,yBAAyB,CAAC;CAGlG;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAA;AAGjF;;;;GAIG;AACH,KAAK,eAAe,GAAG,MAAM,CAAA;AAE7B;;;GAGG;AACH,KAAK,gBAAgB,GAAG;IACvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED;;;GAGG;AACH,KAAK,eAAe,CAAC,CAAC,GAAG,OAAO,IAAI;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,CAAC,CAAA;CACb,CAAA;AAOD;;;GAGG;AACH,KAAK,yBAAyB,GAAG;IAChC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAA;CAChJ,CAAA;AAUD,KAAK,wBAAwB,GAAG,MAAM,GAAG,uBAAuB,CAAA;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAGxD,UAAU,iBAAiB;IAC1B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAEpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC5B"}
@@ -71,12 +71,16 @@ class Criterion {
71
71
  return [item];
72
72
  });
73
73
  }
74
+ /**
75
+ * @description Метод используется для деления строки состоящей их нескольких полей.
76
+ * @example "StatusCode&Name" ["StatusCode", "Name"]
77
+ */
74
78
  splitStringByFieldName(str) {
75
79
  return str.split(/[+&, |]/);
76
80
  }
77
81
  /**
78
82
  * @description Функция собирает все поля для каждой сущности. Это нудно для того, чтобы одним запросом загрузить
79
- * всю информацию и не запрашивать по одному полу. Также собирает
83
+ * всю информацию и не запрашивать по одному полу. Также именно тут устанавливается информация в collector.
80
84
  */
81
85
  collectExtendedInformation() {
82
86
  this.array.forEach(groupCriterion => {
@@ -88,9 +92,8 @@ class Criterion {
88
92
  if (Criterion.isNamedCriterion(item)) {
89
93
  if (Criterion.isEqualCriterion(item)) {
90
94
  const equal = [...item.expression.equal];
91
- // Приводим к единому виду
92
95
  if (equal.length === 2)
93
- equal.unshift(this.primaryEntity);
96
+ equal.unshift(this.primaryEntity); // Приводим к единому виду
94
97
  return this.collector.addEqualExpress(item.name, ...equal);
95
98
  }
96
99
  }
@@ -1 +1 @@
1
- {"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,UAAU,SAAS,SAmGhC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,OAAO,UAAU,SAAS,SA0FhC"}
@@ -27,8 +27,7 @@ const open_api_router_1 = __importDefault(require("./open/open-api-router"));
27
27
  const session_middleware_1 = require("../middleware/session-middleware");
28
28
  const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
29
29
  const criterion_1 = __importDefault(require("../model/criterion"));
30
- const criterion_service_1 = __importDefault(require("../services/criterion-service"));
31
- const get_criterion_preset_1 = __importDefault(require("../utils/get-criterion-preset"));
30
+ const get_criterion_preset_1 = require("../utils/get-criterion-preset");
32
31
  function useRouter() {
33
32
  const server = Server_1.default.getServer();
34
33
  const app = server.app;
@@ -77,21 +76,11 @@ function useRouter() {
77
76
  }
78
77
  ];
79
78
  const obj = new criterion_1.default(criterion, {
80
- primaryEntity: entity, primaryId: id, accessToken: req.infoAccessToken, masterEntities
79
+ primaryEntity: entity, primaryId: id, accessToken: req.infoAccessToken, masterEntities, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req)
81
80
  });
82
81
  const M = yield obj.generate();
83
- const criterionService = new criterion_service_1.default(req.infoAccessToken);
84
- const rules = yield criterionService.get({
85
- entity,
86
- id,
87
- preset: (0, get_criterion_preset_1.default)(req),
88
- masterEntities,
89
- // @ts-ignore
90
- criterion
91
- });
92
82
  res.json({
93
83
  M,
94
- S: rules
95
84
  });
96
85
  }
97
86
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"metadata-read-socket.d.ts","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAMhD,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,qDA0BxE;AAOD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACnC"}
1
+ {"version":3,"file":"metadata-read-socket.d.ts","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAOhD,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,qDAexE;AAOD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACnC"}
@@ -15,28 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.readMetadata = void 0;
16
16
  const api_error_1 = __importDefault(require("../errors/api-error"));
17
17
  const metadata_service_1 = __importDefault(require("../services/metadata-service"));
18
- const criterion_service_1 = __importDefault(require("../services/criterion-service"));
19
- const Store_1 = __importDefault(require("../store/Store"));
18
+ const criterion_1 = __importDefault(require("../model/criterion"));
19
+ const get_criterion_config_1 = __importDefault(require("../utils/get-criterion-config"));
20
+ const get_criterion_preset_1 = require("../utils/get-criterion-preset");
20
21
  function readMetadata(options, data) {
21
- var _a;
22
22
  return __awaiter(this, void 0, void 0, function* () {
23
23
  if (!isMetadataReadParams(data))
24
24
  throw api_error_1.default.SocketWrongEntityReadParams();
25
- // Установка значения по умолчанию
26
- if (!data.type)
27
- data.type = 'criterion';
28
- const criterionService = new criterion_service_1.default(options.token);
29
- const criterionConfig = ((_a = Store_1.default.getMetadataSettingsForEntity(data.entity)) === null || _a === void 0 ? void 0 : _a[data.type]) ||
30
- ((yield metadata_service_1.default.checkFieldInEntity(data.entity, 'StatusCode')) ? ["StatusCode"] : []);
31
- const criterion = yield criterionService.get({
32
- entity: data.entity,
33
- id: data.id,
34
- criterion: criterionConfig,
35
- preset: {
36
- currentContextId: options.contextId
37
- },
38
- masterEntities: data.masterEntities
25
+ const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(data.entity, data.type), {
26
+ primaryEntity: data.entity, primaryId: data.id, preset: (0, get_criterion_preset_1.getCriterionPresetFormSocketOptions)(options),
27
+ masterEntities: data.masterEntities, accessToken: options.token
39
28
  });
29
+ const criterion = yield criterionObject.generate();
40
30
  const metadataService = new metadata_service_1.default(options.token);
41
31
  const metadata = yield metadataService.getFull(data.entity, criterion, options.usageContext);
42
32
  if (data.id)
@@ -1 +1 @@
1
- {"version":3,"file":"metadata-read-socket.js","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oEAA2C;AAC3C,oFAA2D;AAC3D,sFAA6D;AAC7D,2DAAmC;AAEnC,SAAsB,YAAY,CAAC,OAAuB,EAAE,IAAa;;;QACxE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE9E,kCAAkC;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;QAExC,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,CAAA,MAAA,eAAK,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,IAAI,CAAC,IAAI,CAAC;YACnF,CAAC,CAAA,MAAM,0BAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAE5F,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE;gBACP,gBAAgB,EAAE,OAAO,CAAC,SAAS;aACnC;YACD,cAAc,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC,CAAA;QAGF,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,EAAE;YAAE,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAA;;CACf;AA1BD,oCA0BC;AAED,MAAM,oBAAoB,GAAG,CAAC,KAAc,EACd,EAAE,CAC/B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA6B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
1
+ {"version":3,"file":"metadata-read-socket.js","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oEAA2C;AAC3C,oFAA2D;AAC3D,mEAA2C;AAC3C,yFAA+D;AAC/D,wEAAkF;AAElF,SAAsB,YAAY,CAAC,OAAuB,EAAE,IAAa;;QACxE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE9E,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,MAAM,IAAA,8BAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YACvF,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAA,0DAAmC,EAAC,OAAO,CAAC;YACpG,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,OAAO,CAAC,KAAK;SAC/D,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAGnD,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,EAAE;YAAE,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAA;IAChB,CAAC;CAAA;AAfD,oCAeC;AAED,MAAM,oBAAoB,GAAG,CAAC,KAAc,EACd,EAAE,CAC/B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA6B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
@@ -0,0 +1,5 @@
1
+ /**
2
+ * @description Функция возвращает конфигурацию для критериев из хранилища
3
+ */
4
+ export default function getCriterionConfig(entity: string, type?: unknown): Promise<any>;
5
+ //# sourceMappingURL=get-criterion-config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-criterion-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAA8B,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,OAAqB,gBAQ3F"}
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ const Store_1 = __importDefault(require("../store/Store"));
16
+ const metadata_service_1 = __importDefault(require("../services/metadata-service"));
17
+ /**
18
+ * @description Функция возвращает конфигурацию для критериев из хранилища
19
+ */
20
+ function getCriterionConfig(entity, type = 'criterion') {
21
+ var _a;
22
+ return __awaiter(this, void 0, void 0, function* () {
23
+ const DEFAULT_NAME = 'StatusCode';
24
+ const parsedType = type ? String(type) : 'criterion';
25
+ const storeConfig = (_a = Store_1.default.getMetadataSettingsForEntity(entity)) === null || _a === void 0 ? void 0 : _a[parsedType];
26
+ if (storeConfig)
27
+ return storeConfig;
28
+ return (yield metadata_service_1.default.checkFieldInEntity(entity, DEFAULT_NAME)) ? [DEFAULT_NAME] : [];
29
+ });
30
+ }
31
+ exports.default = getCriterionConfig;
32
+ //# sourceMappingURL=get-criterion-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-criterion-config.js","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAmC;AACnC,oFAA2D;AAE3D;;GAEG;AACH,SAA8B,kBAAkB,CAAC,MAAc,EAAE,OAAgB,WAAW;;;QAC3F,MAAM,YAAY,GAAG,YAAY,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAErD,MAAM,WAAW,GAAG,MAAA,eAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC,0CAAG,UAAU,CAAC,CAAC;QAC7E,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QAEpC,OAAO,CAAA,MAAM,0BAAe,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,EAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;;CAC3F;AARD,qCAQC"}
@@ -1,5 +1,9 @@
1
1
  import { Request } from "express";
2
- export default function getCriterionPreset(request: Request): {
3
- currentContextId: number;
2
+ import { ISocketOptions } from "../socket/connect-socket";
3
+ export declare function getCriterionPresetFromRequest(req: Request): {
4
+ "@CCI": number;
5
+ };
6
+ export declare function getCriterionPresetFormSocketOptions(options: ISocketOptions): {
7
+ "@CCI": number;
4
8
  };
5
9
  //# sourceMappingURL=get-criterion-preset.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-criterion-preset.d.ts","sourceRoot":"","sources":["../../src/utils/get-criterion-preset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,OAAO,EAAE,OAAO;;EAI1D"}
1
+ {"version":3,"file":"get-criterion-preset.d.ts","sourceRoot":"","sources":["../../src/utils/get-criterion-preset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,OAAO;;EAIzD;AACD,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,cAAc;;EAI1E"}
@@ -1,9 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- function getCriterionPreset(request) {
3
+ exports.getCriterionPresetFormSocketOptions = exports.getCriterionPresetFromRequest = void 0;
4
+ function getCriterionPresetFromRequest(req) {
4
5
  return {
5
- currentContextId: request.infoCurrentContextId
6
+ "@CCI": req.infoCurrentContextId
6
7
  };
7
8
  }
8
- exports.default = getCriterionPreset;
9
+ exports.getCriterionPresetFromRequest = getCriterionPresetFromRequest;
10
+ function getCriterionPresetFormSocketOptions(options) {
11
+ return {
12
+ "@CCI": options.contextId
13
+ };
14
+ }
15
+ exports.getCriterionPresetFormSocketOptions = getCriterionPresetFormSocketOptions;
9
16
  //# sourceMappingURL=get-criterion-preset.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-criterion-preset.js","sourceRoot":"","sources":["../../src/utils/get-criterion-preset.ts"],"names":[],"mappings":";;AAEA,SAAwB,kBAAkB,CAAC,OAAgB;IAC1D,OAAO;QACN,gBAAgB,EAAE,OAAO,CAAC,oBAAoB;KAC9C,CAAA;AACF,CAAC;AAJD,qCAIC"}
1
+ {"version":3,"file":"get-criterion-preset.js","sourceRoot":"","sources":["../../src/utils/get-criterion-preset.ts"],"names":[],"mappings":";;;AAGA,SAAgB,6BAA6B,CAAC,GAAY;IACzD,OAAO;QACN,MAAM,EAAE,GAAG,CAAC,oBAAoB;KAChC,CAAA;AACF,CAAC;AAJD,sEAIC;AACD,SAAgB,mCAAmC,CAAC,OAAuB;IAC1E,OAAO;QACN,MAAM,EAAE,OAAO,CAAC,SAAS;KACzB,CAAA;AACF,CAAC;AAJD,kFAIC"}
@@ -1 +1 @@
1
- {"version":3,"file":"get-usage-context.d.ts","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,UAyCpD"}
1
+ {"version":3,"file":"get-usage-context.d.ts","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,UAyCpD"}
@@ -1 +1 @@
1
- {"version":3,"file":"get-usage-context.js","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":";;;;;AAAA,oCAA+B;AAC/B,sEAA8C;AAC9C,qDAA4C;AAE5C,sEAA6C;AAE7C;;GAEG;AACH,SAAwB,eAAe,CAAC,KAAa;IACjD,gDAAgD;IAChD,SAAS,UAAU,CAAC,KAAa,EAAE,KAAU;QACzC,sCAAsC;QACtC,IAAI,CAAC,KAAK;YAAE,MAAM,mBAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAExB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC9B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAExE,MAAM,WAAW,GAAG,OAAO,CAAC;QAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAI3E,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7C,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAA;QAGF,IAAI,CAAC,MAAM;YAAE,MAAM,mBAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;QAEpD,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,mBAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,MAAM,mBAAmB,GAAG,QAAQ,CAAC;QACrC,IAAI,CAAC,mBAAmB;YAAE,mBAAM,CAAC,KAAK,CAAC,mBAAQ,CAAC,2BAA2B,EAAE,CAAC,CAAA;QAE9E,OAAO,mBAAmB,CAAC;IAC/B,CAAC;AAEL,CAAC;AAzCD,kCAyCC"}
1
+ {"version":3,"file":"get-usage-context.js","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":";;;;;AAAA,oCAA+B;AAC/B,sEAA8C;AAC9C,qDAA4C;AAC5C,sEAA6C;AAE7C;;GAEG;AACH,SAAwB,eAAe,CAAC,KAAa;IACjD,gDAAgD;IAChD,SAAS,UAAU,CAAC,KAAa,EAAE,KAAU;QACzC,sCAAsC;QACtC,IAAI,CAAC,KAAK;YAAE,MAAM,mBAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAExB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC9B,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAExE,MAAM,WAAW,GAAG,OAAO,CAAC;QAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAI3E,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7C,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAA;QAGF,IAAI,CAAC,MAAM;YAAE,MAAM,mBAAS,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;QAEpD,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,mBAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,MAAM,mBAAmB,GAAG,QAAQ,CAAC;QACrC,IAAI,CAAC,mBAAmB;YAAE,mBAAM,CAAC,KAAK,CAAC,mBAAQ,CAAC,2BAA2B,EAAE,CAAC,CAAA;QAE9E,OAAO,mBAAmB,CAAC;IAC/B,CAAC;AAEL,CAAC;AAzCD,kCAyCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "1.5.6",
3
+ "version": "1.5.7",
4
4
  "description": "",
5
5
  "main": "dist/Server.js",
6
6
  "scripts": {