@futdevpro/nts-dynamo 1.7.27 → 1.8.5
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/lib/_constants/global-settings.const.d.ts +2 -2
- package/lib/_constants/global-settings.const.d.ts.map +1 -1
- package/lib/_constants/global-settings.const.js +2 -2
- package/lib/_constants/global-settings.const.js.map +1 -1
- package/lib/_constants/mocks/app-extended-server.mock.d.ts +12 -12
- package/lib/_constants/mocks/app-extended-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-extended-server.mock.js +16 -16
- package/lib/_constants/mocks/app-extended-server.mock.js.map +1 -1
- package/lib/_constants/mocks/app-params.mock.d.ts +2 -2
- package/lib/_constants/mocks/app-params.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-params.mock.js +1 -1
- package/lib/_constants/mocks/app-params.mock.js.map +1 -1
- package/lib/_constants/mocks/app-server.mock.d.ts +15 -15
- package/lib/_constants/mocks/app-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-server.mock.js +10 -10
- package/lib/_constants/mocks/app-server.mock.js.map +1 -1
- package/lib/_constants/mocks/data-model.mock.d.ts +3 -3
- package/lib/_constants/mocks/data-model.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/data-model.mock.js +22 -22
- package/lib/_constants/mocks/data-model.mock.js.map +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.d.ts +2 -2
- package/lib/_constants/mocks/email-service-collection.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.js +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.js.map +1 -1
- package/lib/_constants/mocks/endpoint.mock.d.ts +8 -8
- package/lib/_constants/mocks/endpoint.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/endpoint.mock.js +18 -18
- package/lib/_constants/mocks/endpoint.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-client.mock.d.ts +2 -2
- package/lib/_constants/mocks/socket-client.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/socket-client.mock.js +1 -1
- package/lib/_constants/mocks/socket-client.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-server.mock.d.ts +2 -2
- package/lib/_constants/mocks/socket-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/socket-server.mock.js +1 -1
- package/lib/_constants/mocks/socket-server.mock.js.map +1 -1
- package/lib/_enums/data-model-type.enum.d.ts +1 -0
- package/lib/_enums/data-model-type.enum.d.ts.map +1 -1
- package/lib/_enums/data-model-type.enum.js +1 -0
- package/lib/_enums/data-model-type.enum.js.map +1 -1
- package/lib/_models/control-models/api-call-params.control-model.d.ts +3 -3
- package/lib/_models/control-models/api-call-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/api-call-params.control-model.js +5 -5
- package/lib/_models/control-models/api-call-params.control-model.js.map +1 -1
- package/lib/_models/control-models/{app-system-controls.control-model copy.d.ts → app-ext-system-controls.control-model.d.ts} +1 -1
- package/lib/_models/control-models/app-ext-system-controls.control-model.d.ts.map +1 -0
- package/lib/_models/control-models/{app-system-controls.control-model copy.js → app-ext-system-controls.control-model.js} +1 -1
- package/lib/_models/control-models/app-ext-system-controls.control-model.js.map +1 -0
- package/lib/_models/control-models/app-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/app-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/app-params.control-model.js +3 -3
- package/lib/_models/control-models/app-params.control-model.js.map +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.d.ts +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.js +8 -8
- package/lib/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/lib/_models/control-models/http-settings.control-model.d.ts +2 -2
- package/lib/_models/control-models/http-settings.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/http-settings.control-model.js +3 -3
- package/lib/_models/control-models/http-settings.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-client-service-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/socket-client-service-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-client-service-params.control-model.js +3 -3
- package/lib/_models/control-models/socket-client-service-params.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-event.control-model.js +4 -4
- package/lib/_models/control-models/socket-presence.control-model.d.ts +12 -0
- package/lib/_models/control-models/socket-presence.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-presence.control-model.js +14 -3
- package/lib/_models/control-models/socket-presence.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-server-service-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/socket-server-service-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-server-service-params.control-model.js +4 -4
- package/lib/_models/control-models/socket-server-service-params.control-model.js.map +1 -1
- package/lib/_models/interfaces/certification-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/certification-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/global-service-settings.interface.d.ts +6 -6
- package/lib/_models/interfaces/global-service-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/global-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/routing-module-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/routing-module-settings.interface.d.ts.map +1 -1
- package/lib/_models/types/db-filter.type.d.ts.map +1 -1
- package/lib/_models/types/db-update.type.d.ts +2 -1
- package/lib/_models/types/db-update.type.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.controller.d.ts +2 -2
- package/lib/_modules/custom-data/custom-data.controller.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.controller.js +18 -16
- package/lib/_modules/custom-data/custom-data.controller.js.map +1 -1
- package/lib/_modules/custom-data/custom-data.data-service.d.ts +1 -1
- package/lib/_modules/custom-data/custom-data.data-service.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.data-service.js +4 -4
- package/lib/_modules/custom-data/custom-data.data-service.js.map +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.d.ts +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.js +5 -5
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.js.map +1 -1
- package/lib/_modules/test/get-test-routing-module.util.d.ts +1 -1
- package/lib/_modules/test/get-test-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/test/get-test-routing-module.util.js +5 -5
- package/lib/_modules/test/get-test-routing-module.util.js.map +1 -1
- package/lib/_modules/test/test.controller.d.ts +2 -2
- package/lib/_modules/test/test.controller.d.ts.map +1 -1
- package/lib/_modules/test/test.controller.js +33 -33
- package/lib/_modules/test/test.controller.js.map +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.d.ts +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.js +5 -5
- package/lib/_modules/usage/get-usage-routing-module.util.js.map +1 -1
- package/lib/_modules/usage/usage.controller.d.ts +2 -2
- package/lib/_modules/usage/usage.controller.d.ts.map +1 -1
- package/lib/_modules/usage/usage.controller.js +16 -16
- package/lib/_modules/usage/usage.controller.js.map +1 -1
- package/lib/_modules/usage/usage.data-service.d.ts +1 -1
- package/lib/_modules/usage/usage.data-service.d.ts.map +1 -1
- package/lib/_modules/usage/usage.data-service.js +4 -4
- package/lib/_modules/usage/usage.data-service.js.map +1 -1
- package/lib/_services/base/data.service.d.ts +4 -3
- package/lib/_services/base/data.service.d.ts.map +1 -1
- package/lib/_services/base/data.service.js +22 -18
- package/lib/_services/base/data.service.js.map +1 -1
- package/lib/_services/base/db.service.d.ts +3 -3
- package/lib/_services/base/db.service.d.ts.map +1 -1
- package/lib/_services/base/db.service.js +11 -7
- package/lib/_services/base/db.service.js.map +1 -1
- package/lib/_services/core/api.service.d.ts +4 -4
- package/lib/_services/core/api.service.d.ts.map +1 -1
- package/lib/_services/core/api.service.js +9 -9
- package/lib/_services/core/api.service.js.map +1 -1
- package/lib/_services/core/email.service.d.ts +4 -4
- package/lib/_services/core/email.service.d.ts.map +1 -1
- package/lib/_services/core/email.service.js.map +1 -1
- package/lib/_services/core/global.service.d.ts +12 -12
- package/lib/_services/core/global.service.d.ts.map +1 -1
- package/lib/_services/core/global.service.js +14 -1
- package/lib/_services/core/global.service.js.map +1 -1
- package/lib/_services/core/service-collection.service.d.ts +1 -1
- package/lib/_services/core/service-collection.service.d.ts.map +1 -1
- package/lib/_services/core/service-collection.service.js +3 -3
- package/lib/_services/core/service-collection.service.js.map +1 -1
- package/lib/_services/route/controller.service.d.ts +2 -2
- package/lib/_services/route/controller.service.d.ts.map +1 -1
- package/lib/_services/route/controller.service.js.map +1 -1
- package/lib/_services/route/routing-module.service.d.ts +4 -4
- package/lib/_services/route/routing-module.service.d.ts.map +1 -1
- package/lib/_services/route/routing-module.service.js +2 -2
- package/lib/_services/route/routing-module.service.js.map +1 -1
- package/lib/_services/server/app-extended.server.d.ts +2 -2
- package/lib/_services/server/app-extended.server.js +5 -5
- package/lib/_services/server/app-extended.server.js.map +1 -1
- package/lib/_services/server/app-extended.server.spec.js +3 -3
- package/lib/_services/server/app-extended.server.spec.js.map +1 -1
- package/lib/_services/server/app.server.d.ts +14 -14
- package/lib/_services/server/app.server.d.ts.map +1 -1
- package/lib/_services/server/app.server.js +8 -8
- package/lib/_services/server/app.server.js.map +1 -1
- package/lib/_services/server/app.server.spec.js +3 -3
- package/lib/_services/server/app.server.spec.js.map +1 -1
- package/lib/_services/shared.static-service.d.ts +3 -3
- package/lib/_services/shared.static-service.d.ts.map +1 -1
- package/lib/_services/shared.static-service.js +1 -1
- package/lib/_services/shared.static-service.js.map +1 -1
- package/lib/_services/socket/socket-client.service.d.ts +3 -3
- package/lib/_services/socket/socket-client.service.d.ts.map +1 -1
- package/lib/_services/socket/socket-client.service.js +24 -18
- package/lib/_services/socket/socket-client.service.js.map +1 -1
- package/lib/_services/socket/socket-server.service.d.ts +3 -3
- package/lib/_services/socket/socket-server.service.d.ts.map +1 -1
- package/lib/_services/socket/socket-server.service.js +5 -5
- package/lib/_services/socket/socket-server.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/_constants/global-settings.const.ts +2 -2
- package/src/_constants/mocks/app-extended-server.mock.ts +34 -35
- package/src/_constants/mocks/app-params.mock.ts +2 -2
- package/src/_constants/mocks/app-server.mock.ts +30 -30
- package/src/_constants/mocks/data-model.mock.ts +23 -23
- package/src/_constants/mocks/email-service-collection.mock.ts +2 -2
- package/src/_constants/mocks/endpoint.mock.ts +22 -22
- package/src/_constants/mocks/socket-client.mock.ts +3 -3
- package/src/_constants/mocks/socket-server.mock.ts +3 -3
- package/src/_enums/data-model-type.enum.ts +1 -0
- package/src/_models/control-models/api-call-params.control-model.ts +3 -3
- package/src/_models/control-models/app-params.control-model.ts +2 -2
- package/src/_models/control-models/endpoint-params.control-model.ts +7 -7
- package/src/_models/control-models/http-settings.control-model.ts +2 -2
- package/src/_models/control-models/socket-client-service-params.control-model.ts +2 -2
- package/src/_models/control-models/socket-event.control-model.ts +5 -5
- package/src/_models/control-models/socket-presence.control-model.ts +24 -4
- package/src/_models/control-models/socket-server-service-params.control-model.ts +4 -4
- package/src/_models/interfaces/certification-settings.interface.ts +1 -1
- package/src/_models/interfaces/global-service-settings.interface.ts +6 -6
- package/src/_models/interfaces/global-settings.interface.ts +1 -1
- package/src/_models/interfaces/routing-module-settings.interface.ts +1 -1
- package/src/_models/types/db-filter.type.ts +5 -2
- package/src/_models/types/db-update.type.ts +3 -2
- package/src/_modules/custom-data/custom-data.controller.ts +20 -18
- package/src/_modules/custom-data/custom-data.data-service.ts +6 -4
- package/src/_modules/custom-data/get-custom-data-routing-module.util.ts +7 -7
- package/src/_modules/test/get-test-routing-module.util.ts +7 -7
- package/src/_modules/test/test.controller.ts +34 -34
- package/src/_modules/usage/get-usage-routing-module.util.ts +7 -7
- package/src/_modules/usage/usage.controller.ts +18 -19
- package/src/_modules/usage/usage.data-service.ts +3 -3
- package/src/_services/base/data.service.ts +32 -25
- package/src/_services/base/db.service.ts +17 -14
- package/src/_services/core/api.service.ts +22 -22
- package/src/_services/core/email.service.ts +4 -4
- package/src/_services/core/global.service.ts +29 -15
- package/src/_services/core/service-collection.service.ts +1 -1
- package/src/_services/route/controller.service.ts +2 -2
- package/src/_services/route/routing-module.service.ts +12 -12
- package/src/_services/server/app-extended.server.spec.ts +4 -4
- package/src/_services/server/app-extended.server.ts +5 -5
- package/src/_services/server/app.server.spec.ts +4 -4
- package/src/_services/server/app.server.ts +27 -27
- package/src/_services/shared.static-service.ts +7 -4
- package/src/_services/socket/socket-client.service.ts +69 -37
- package/src/_services/socket/socket-server.service.ts +9 -9
- package/tsconfig.json +1 -0
- package/lib/_models/control-models/app-system-controls.control-model copy.d.ts.map +0 -1
- package/lib/_models/control-models/app-system-controls.control-model copy.js.map +0 -1
- /package/src/_models/control-models/{app-system-controls.control-model copy.ts → app-ext-system-controls.control-model.ts} +0 -0
|
@@ -1,92 +1,92 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DynamoNTS_Test_Controller = void 0;
|
|
4
4
|
const test_module_1 = require("@futdevpro/fsm-dynamo/test-module");
|
|
5
5
|
const http_call_type_enum_1 = require("../../_enums/http/http-call-type.enum");
|
|
6
6
|
const controller_service_1 = require("../../_services/route/controller.service");
|
|
7
7
|
const endpoint_params_control_model_1 = require("../../_models/control-models/endpoint-params.control-model");
|
|
8
8
|
const global_service_1 = require("../../_services/core/global.service");
|
|
9
|
-
class
|
|
9
|
+
class DynamoNTS_Test_Controller extends controller_service_1.DynamoNTS_Controller {
|
|
10
10
|
static getInstance() {
|
|
11
|
-
return
|
|
11
|
+
return DynamoNTS_Test_Controller.getSingletonInstance();
|
|
12
12
|
}
|
|
13
13
|
setupEndpoints() {
|
|
14
14
|
this.endpoints = [
|
|
15
15
|
// TESTS
|
|
16
|
-
new endpoint_params_control_model_1.
|
|
16
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
17
17
|
name: 'testGet',
|
|
18
18
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
19
|
-
endpoint: test_module_1.
|
|
19
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.testGet,
|
|
20
20
|
tasks: [
|
|
21
21
|
async (req, res) => {
|
|
22
22
|
res.send({
|
|
23
23
|
url: req.url,
|
|
24
24
|
result: 'test-get call was successful!',
|
|
25
|
-
request: req.body
|
|
25
|
+
request: req.body,
|
|
26
26
|
});
|
|
27
|
-
}
|
|
28
|
-
]
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
29
|
}),
|
|
30
|
-
new endpoint_params_control_model_1.
|
|
30
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
31
31
|
name: 'testPost',
|
|
32
32
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.post,
|
|
33
|
-
endpoint: test_module_1.
|
|
33
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.testPost,
|
|
34
34
|
tasks: [
|
|
35
35
|
async (req, res) => {
|
|
36
36
|
res.send({
|
|
37
37
|
url: req.url,
|
|
38
38
|
result: 'test-post call was successful!',
|
|
39
|
-
request: req.body
|
|
39
|
+
request: req.body,
|
|
40
40
|
});
|
|
41
|
-
}
|
|
42
|
-
]
|
|
41
|
+
},
|
|
42
|
+
],
|
|
43
43
|
}),
|
|
44
|
-
new endpoint_params_control_model_1.
|
|
44
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
45
45
|
name: 'testPut',
|
|
46
46
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.put,
|
|
47
|
-
endpoint: test_module_1.
|
|
47
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.testPut,
|
|
48
48
|
tasks: [
|
|
49
49
|
async (req, res) => {
|
|
50
50
|
res.send({
|
|
51
51
|
url: req.url,
|
|
52
52
|
result: 'test-put call was successful!',
|
|
53
|
-
request: req.body
|
|
53
|
+
request: req.body,
|
|
54
54
|
});
|
|
55
|
-
}
|
|
56
|
-
]
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
57
|
}),
|
|
58
|
-
new endpoint_params_control_model_1.
|
|
58
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
59
59
|
name: 'testPatch',
|
|
60
60
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.patch,
|
|
61
|
-
endpoint: test_module_1.
|
|
61
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.testPatch,
|
|
62
62
|
tasks: [
|
|
63
63
|
async (req, res) => {
|
|
64
64
|
res.send({
|
|
65
65
|
url: req.url,
|
|
66
66
|
result: 'test-patch call was successful!',
|
|
67
|
-
request: req.body
|
|
67
|
+
request: req.body,
|
|
68
68
|
});
|
|
69
|
-
}
|
|
70
|
-
]
|
|
69
|
+
},
|
|
70
|
+
],
|
|
71
71
|
}),
|
|
72
|
-
new endpoint_params_control_model_1.
|
|
72
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
73
73
|
name: 'testDelete',
|
|
74
74
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.delete,
|
|
75
|
-
endpoint: test_module_1.
|
|
75
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.testDelete,
|
|
76
76
|
tasks: [
|
|
77
77
|
async (req, res) => {
|
|
78
78
|
res.send({
|
|
79
79
|
url: req.url,
|
|
80
80
|
result: 'test-delete call was successful!',
|
|
81
|
-
request: req.body
|
|
81
|
+
request: req.body,
|
|
82
82
|
});
|
|
83
|
-
}
|
|
84
|
-
]
|
|
83
|
+
},
|
|
84
|
+
],
|
|
85
85
|
}),
|
|
86
|
-
new endpoint_params_control_model_1.
|
|
86
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
87
87
|
name: 'getServerStatus',
|
|
88
88
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
89
|
-
endpoint: test_module_1.
|
|
89
|
+
endpoint: test_module_1.Dynamo_testModule_settings.endPoints.getServerStatus,
|
|
90
90
|
tasks: [
|
|
91
91
|
async (req, res) => {
|
|
92
92
|
res.send({
|
|
@@ -94,11 +94,11 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
|
|
|
94
94
|
version: global_service_1.DynamoNTS_GlobalService.params.version,
|
|
95
95
|
upTime: global_service_1.DynamoNTS_GlobalService.upTime,
|
|
96
96
|
});
|
|
97
|
-
}
|
|
98
|
-
]
|
|
97
|
+
},
|
|
98
|
+
],
|
|
99
99
|
}),
|
|
100
100
|
];
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
exports.
|
|
103
|
+
exports.DynamoNTS_Test_Controller = DynamoNTS_Test_Controller;
|
|
104
104
|
//# sourceMappingURL=test.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../../src/_modules/test/test.controller.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../../src/_modules/test/test.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
|
|
2
2
|
import { DynamoNTS_RoutingModule } from '../../_services/route/routing-module.service';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function DynamoNTS_getUsageRoutingModule(securityOverride?: DynamoNTS_RouteSecurity): DynamoNTS_RoutingModule;
|
|
4
4
|
//# sourceMappingURL=get-usage-routing-module.util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-usage-routing-module.util.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/get-usage-routing-module.util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAGvF,wBAAgB,
|
|
1
|
+
{"version":3,"file":"get-usage-routing-module.util.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/get-usage-routing-module.util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAGvF,wBAAgB,+BAA+B,CAC7C,gBAAgB,CAAC,EAAE,uBAAuB,GACzC,uBAAuB,CAWzB"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DynamoNTS_getUsageRoutingModule = void 0;
|
|
4
4
|
const usage_module_1 = require("@futdevpro/fsm-dynamo/usage-module");
|
|
5
5
|
const routing_module_service_1 = require("../../_services/route/routing-module.service");
|
|
6
6
|
const usage_controller_1 = require("./usage.controller");
|
|
7
|
-
function
|
|
7
|
+
function DynamoNTS_getUsageRoutingModule(securityOverride) {
|
|
8
8
|
const set = {
|
|
9
|
-
route: usage_module_1.
|
|
10
|
-
controllers: [usage_controller_1.
|
|
9
|
+
route: usage_module_1.Dynamo_usageModule_settings.mainRoute,
|
|
10
|
+
controllers: [usage_controller_1.DynamoNTS_Usage_Controller.getInstance()],
|
|
11
11
|
};
|
|
12
12
|
if (securityOverride) {
|
|
13
13
|
set.securityOverride = securityOverride;
|
|
14
14
|
}
|
|
15
15
|
return new routing_module_service_1.DynamoNTS_RoutingModule(set);
|
|
16
16
|
}
|
|
17
|
-
exports.
|
|
17
|
+
exports.DynamoNTS_getUsageRoutingModule = DynamoNTS_getUsageRoutingModule;
|
|
18
18
|
//# sourceMappingURL=get-usage-routing-module.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-usage-routing-module.util.js","sourceRoot":"","sources":["../../../src/_modules/usage/get-usage-routing-module.util.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"get-usage-routing-module.util.js","sourceRoot":"","sources":["../../../src/_modules/usage/get-usage-routing-module.util.ts"],"names":[],"mappings":";;;AACA,qEAAiF;AAKjF,yFAAuF;AACvF,yDAAgE;AAEhE,SAAgB,+BAA+B,CAC7C,gBAA0C;IAE1C,MAAM,GAAG,GAAqC;QAC5C,KAAK,EAAE,0CAA2B,CAAC,SAAS;QAC5C,WAAW,EAAE,CAAE,6CAA0B,CAAC,WAAW,EAAE,CAAE;KAC1D,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,GAAG,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,gDAAuB,CAAC,GAAG,CAAC,CAAC;AAC1C,CAAC;AAbD,0EAaC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DynamoNTS_Controller } from '../../_services/route/controller.service';
|
|
2
|
-
export declare class
|
|
3
|
-
static getInstance():
|
|
2
|
+
export declare class DynamoNTS_Usage_Controller extends DynamoNTS_Controller {
|
|
3
|
+
static getInstance(): DynamoNTS_Usage_Controller;
|
|
4
4
|
private authService;
|
|
5
5
|
setupEndpoints(): void;
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAOhF,qBAAa,
|
|
1
|
+
{"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAOhF,qBAAa,0BAA2B,SAAQ,oBAAoB;IAElE,MAAM,CAAC,WAAW,IAAI,0BAA0B;IAKhD,OAAO,CAAC,WAAW,CAAwB;IAE3C,cAAc,IAAI,IAAI;CA6FvB"}
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DynamoNTS_Usage_Controller = void 0;
|
|
4
4
|
const usage_module_1 = require("@futdevpro/fsm-dynamo/usage-module");
|
|
5
5
|
const http_call_type_enum_1 = require("../../_enums/http/http-call-type.enum");
|
|
6
6
|
const controller_service_1 = require("../../_services/route/controller.service");
|
|
7
7
|
const global_service_1 = require("../../_services/core/global.service");
|
|
8
8
|
const endpoint_params_control_model_1 = require("../../_models/control-models/endpoint-params.control-model");
|
|
9
9
|
const usage_data_service_1 = require("./usage.data-service");
|
|
10
|
-
class
|
|
10
|
+
class DynamoNTS_Usage_Controller extends controller_service_1.DynamoNTS_Controller {
|
|
11
11
|
static getInstance() {
|
|
12
|
-
return
|
|
12
|
+
return DynamoNTS_Usage_Controller.getSingletonInstance();
|
|
13
13
|
}
|
|
14
14
|
// SERVICES
|
|
15
15
|
authService;
|
|
16
16
|
setupEndpoints() {
|
|
17
17
|
this.authService = global_service_1.DynamoNTS_GlobalService.getAuthService();
|
|
18
18
|
this.endpoints = [
|
|
19
|
-
new endpoint_params_control_model_1.
|
|
19
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
20
20
|
name: 'newSession',
|
|
21
21
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
22
|
-
endpoint: usage_module_1.
|
|
22
|
+
endpoint: usage_module_1.Dynamo_usageModule_settings.endPoints.newSession,
|
|
23
23
|
tasks: [
|
|
24
24
|
async (req, res, issuer) => {
|
|
25
25
|
const authService = global_service_1.DynamoNTS_GlobalService.getAuthService();
|
|
26
26
|
const username = authService.getUsernameFromRequest(req);
|
|
27
|
-
const usageService = new usage_data_service_1.
|
|
27
|
+
const usageService = new usage_data_service_1.DynamoNTS_Usage_DataService({
|
|
28
28
|
usageSession: new usage_module_1.Dynamo_UsageSession({
|
|
29
29
|
sessionStart: new Date(),
|
|
30
30
|
issuer: username,
|
|
@@ -37,14 +37,14 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
|
|
|
37
37
|
},
|
|
38
38
|
],
|
|
39
39
|
}),
|
|
40
|
-
new endpoint_params_control_model_1.
|
|
40
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
41
41
|
name: 'updateUsage',
|
|
42
42
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.post,
|
|
43
|
-
endpoint: usage_module_1.
|
|
43
|
+
endpoint: usage_module_1.Dynamo_usageModule_settings.endPoints.updateUsage,
|
|
44
44
|
logRequestsContent: false,
|
|
45
45
|
tasks: [
|
|
46
46
|
async (req, res, issuer) => {
|
|
47
|
-
const usageService = new usage_data_service_1.
|
|
47
|
+
const usageService = new usage_data_service_1.DynamoNTS_Usage_DataService({
|
|
48
48
|
usageSession: { _id: req.params.sessionId },
|
|
49
49
|
usageData: req.body,
|
|
50
50
|
issuer,
|
|
@@ -54,13 +54,13 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
|
|
|
54
54
|
},
|
|
55
55
|
],
|
|
56
56
|
}),
|
|
57
|
-
new endpoint_params_control_model_1.
|
|
57
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
58
58
|
name: 'closeSession',
|
|
59
59
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
60
|
-
endpoint: usage_module_1.
|
|
60
|
+
endpoint: usage_module_1.Dynamo_usageModule_settings.endPoints.closeSession,
|
|
61
61
|
tasks: [
|
|
62
62
|
async (req, res, issuer) => {
|
|
63
|
-
const usageService = new usage_data_service_1.
|
|
63
|
+
const usageService = new usage_data_service_1.DynamoNTS_Usage_DataService({
|
|
64
64
|
usageSession: { _id: req.params.sessionId },
|
|
65
65
|
issuer,
|
|
66
66
|
});
|
|
@@ -69,15 +69,15 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
|
|
|
69
69
|
},
|
|
70
70
|
],
|
|
71
71
|
}),
|
|
72
|
-
new endpoint_params_control_model_1.
|
|
72
|
+
new endpoint_params_control_model_1.DynamoNTS_Endpoint_Params({
|
|
73
73
|
name: 'getUsageData',
|
|
74
74
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
75
|
-
endpoint: usage_module_1.
|
|
75
|
+
endpoint: usage_module_1.Dynamo_usageModule_settings.endPoints.getUsageData,
|
|
76
76
|
preProcessess: [this.authService.authTokenPermAccUsageData],
|
|
77
77
|
tasks: [
|
|
78
78
|
async (req, res) => {
|
|
79
79
|
const range = req.params.range;
|
|
80
|
-
const usageService = new usage_data_service_1.
|
|
80
|
+
const usageService = new usage_data_service_1.DynamoNTS_Usage_DataService();
|
|
81
81
|
await usageService.getUsage(range);
|
|
82
82
|
res.send(usageService.simplifiedDailyUsage);
|
|
83
83
|
},
|
|
@@ -86,5 +86,5 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
|
|
|
86
86
|
];
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
exports.
|
|
89
|
+
exports.DynamoNTS_Usage_Controller = DynamoNTS_Usage_Controller;
|
|
90
90
|
//# sourceMappingURL=usage.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":";;;AAGA,qEAE4C;AAE5C,+EAA+E;AAE/E,iFAAgF;AAChF,wEAA8E;AAC9E,8GAEoE;AACpE,
|
|
1
|
+
{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Request } from 'express';
|
|
|
2
2
|
import { Dynamo_RelativeDate } from '@futdevpro/fsm-dynamo';
|
|
3
3
|
import { Dynamo_UsageSession, Dynamo_UsageData, Dynamo_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
|
|
4
4
|
import { DynamoNTS_DataService } from '../../_services/base/data.service';
|
|
5
|
-
export declare class
|
|
5
|
+
export declare class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_UsageSession> {
|
|
6
6
|
usageData: Dynamo_UsageData[];
|
|
7
7
|
simplifiedDailyUsage: Dynamo_DailyUsageData[];
|
|
8
8
|
constructor(set?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAA6B,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"usage.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAA6B,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAmC,gBAAgB,EAC7E,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,qBAAa,2BAA4B,SAAQ,qBAAqB,CAAC,mBAAmB,CAAC;IACzF,SAAS,EAAE,gBAAgB,EAAE,CAAM;IACnC,oBAAoB,EAAE,qBAAqB,EAAE,CAAM;gBAGjD,GAAG,CAAC,EAAE;QACJ,YAAY,CAAC,EAAE,mBAAmB,CAAC;QACnC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAUH,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAgBxC,QAAQ,CAAC,KAAK,GAAE,mBAAkD,GAAG,OAAO,CAAC,IAAI,CAAC;IA4DlF,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5C,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B/C,OAAO,CAAC,uBAAuB;CAchC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DynamoNTS_Usage_DataService = void 0;
|
|
4
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
5
5
|
const usage_module_1 = require("@futdevpro/fsm-dynamo/usage-module");
|
|
6
6
|
const data_service_1 = require("../../_services/base/data.service");
|
|
7
7
|
const shared_static_service_1 = require("../../_services/shared.static-service");
|
|
8
|
-
class
|
|
8
|
+
class DynamoNTS_Usage_DataService extends data_service_1.DynamoNTS_DataService {
|
|
9
9
|
usageData = [];
|
|
10
10
|
simplifiedDailyUsage = [];
|
|
11
11
|
constructor(set) {
|
|
12
|
-
super(new usage_module_1.Dynamo_UsageSession(set?.usageSession), usage_module_1.
|
|
12
|
+
super(new usage_module_1.Dynamo_UsageSession(set?.usageSession), usage_module_1.Dynamo_usageSessionModel_params, set?.issuer);
|
|
13
13
|
this.usageData = set?.usageData ? set?.usageData : [];
|
|
14
14
|
}
|
|
15
15
|
getLocationDataFromRequest(req) {
|
|
@@ -129,5 +129,5 @@ class UsageService extends data_service_1.DynamoNTS_DataService {
|
|
|
129
129
|
};
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
exports.
|
|
132
|
+
exports.DynamoNTS_Usage_DataService = DynamoNTS_Usage_DataService;
|
|
133
133
|
//# sourceMappingURL=usage.data-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":";;;AAEA,sDAAuF;AACvF,qEACoE;AAEpE,oEAA0E;AAC1E,iFAAyE;AAEzE,MAAa,
|
|
1
|
+
{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Dynamo_Metadata,
|
|
1
|
+
import { Dynamo_Metadata, Dynamo_DataModel_Params } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
|
|
3
3
|
import { DynamoNTS_DBUpdate } from '../../_models/types/db-update.type';
|
|
4
4
|
import { DynamoNTS_DBService } from './db.service';
|
|
@@ -30,8 +30,9 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
|
|
|
30
30
|
depKey?: string;
|
|
31
31
|
depDBServiceKey?: string;
|
|
32
32
|
depKeyIsUnique?: boolean;
|
|
33
|
+
depKeyIsRequired?: boolean;
|
|
33
34
|
private depDataDBService;
|
|
34
|
-
dataParams:
|
|
35
|
+
dataParams: Dynamo_DataModel_Params;
|
|
35
36
|
defaultErrorUserMsg: string;
|
|
36
37
|
defaultValidationErrorUserMsg: string;
|
|
37
38
|
constructor(
|
|
@@ -42,7 +43,7 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
|
|
|
42
43
|
/**
|
|
43
44
|
* DB data prams will be used to connect to usable dbService on GlobalService
|
|
44
45
|
*/
|
|
45
|
-
dataParams:
|
|
46
|
+
dataParams: Dynamo_DataModel_Params,
|
|
46
47
|
/**
|
|
47
48
|
* Initial set for issuer to be able to follow the issuer's activity
|
|
48
49
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ class DynamoNTS_DataService {
|
|
|
31
31
|
depKey;
|
|
32
32
|
depDBServiceKey;
|
|
33
33
|
depKeyIsUnique;
|
|
34
|
+
depKeyIsRequired;
|
|
34
35
|
depDataDBService;
|
|
35
36
|
dataParams;
|
|
36
37
|
defaultErrorUserMsg = `We encountered an unhandled Data Service Error, ` +
|
|
@@ -147,7 +148,7 @@ class DynamoNTS_DataService {
|
|
|
147
148
|
if (ids.length === 0) {
|
|
148
149
|
return [];
|
|
149
150
|
}
|
|
150
|
-
const datas = await this.dataDBService.find({ _id: { $in: ids
|
|
151
|
+
const datas = await this.dataDBService.find({ _id: { $in: ids } });
|
|
151
152
|
if (!dontSetToService) {
|
|
152
153
|
this.dataList = datas;
|
|
153
154
|
}
|
|
@@ -541,11 +542,11 @@ class DynamoNTS_DataService {
|
|
|
541
542
|
this.data = await this.dataDBService.modifyData(this.data, this.issuer);
|
|
542
543
|
return this.data;
|
|
543
544
|
}
|
|
544
|
-
else {
|
|
545
|
+
else if (this.depKeyIsRequired) {
|
|
545
546
|
// if data not exists check that dependency already exists for this
|
|
546
547
|
const dependencyExists = await this.getDependencyDataDBService()
|
|
547
548
|
.getDataById(this.data[this.depKey])
|
|
548
|
-
.catch(
|
|
549
|
+
.catch();
|
|
549
550
|
if (!dependencyExists) {
|
|
550
551
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
551
552
|
...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: dependency data not exists ` +
|
|
@@ -603,16 +604,16 @@ class DynamoNTS_DataService {
|
|
|
603
604
|
*/
|
|
604
605
|
async validateForSave() {
|
|
605
606
|
try {
|
|
606
|
-
for (let i = 0; i < this.dataParams.
|
|
607
|
+
for (let i = 0; i < this.dataParams.properties.length; i++) {
|
|
607
608
|
// basic required validations
|
|
608
|
-
if ((this.dataParams.
|
|
609
|
-
(this.data[this.dataParams.
|
|
610
|
-
this.data[this.dataParams.
|
|
611
|
-
(this.dataParams.
|
|
612
|
-
(this.data[this.dataParams.
|
|
613
|
-
this.data[this.dataParams.
|
|
609
|
+
if ((this.dataParams.properties[i].required &&
|
|
610
|
+
(this.data[this.dataParams.properties[i].key] === null ||
|
|
611
|
+
this.data[this.dataParams.properties[i].key] === undefined)) ||
|
|
612
|
+
(this.dataParams.properties[i].index &&
|
|
613
|
+
(this.data[this.dataParams.properties[i].key] === null ||
|
|
614
|
+
this.data[this.dataParams.properties[i].key] === undefined))) {
|
|
614
615
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
615
|
-
...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${this.dataParams.
|
|
616
|
+
...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${this.dataParams.properties[i].key} is missing! ` +
|
|
616
617
|
`(${this.dataParams.dataName})`)),
|
|
617
618
|
status: 422,
|
|
618
619
|
errorCode: 'NTS-DS0-VD1',
|
|
@@ -620,10 +621,10 @@ class DynamoNTS_DataService {
|
|
|
620
621
|
});
|
|
621
622
|
}
|
|
622
623
|
// specific Date validation
|
|
623
|
-
if (this.dataParams.
|
|
624
|
-
!(new Date(this.data[this.dataParams.
|
|
624
|
+
if (this.dataParams.properties[i].type === 'Date' &&
|
|
625
|
+
!(new Date(this.data[this.dataParams.properties[i].key]) instanceof Date)) {
|
|
625
626
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
626
|
-
...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${this.dataParams.
|
|
627
|
+
...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, ${this.dataParams.properties[i].key} is not a date! ` +
|
|
627
628
|
`(${this.dataParams.dataName})`)),
|
|
628
629
|
status: 422,
|
|
629
630
|
errorCode: 'NTS-DS0-VD2',
|
|
@@ -631,9 +632,9 @@ class DynamoNTS_DataService {
|
|
|
631
632
|
});
|
|
632
633
|
}
|
|
633
634
|
// call additional validators
|
|
634
|
-
if (this.dataParams.
|
|
635
|
-
for (let j = 0; j < this.dataParams.
|
|
636
|
-
this.dataParams.
|
|
635
|
+
if (this.dataParams.properties[i].additionalValidators) {
|
|
636
|
+
for (let j = 0; j < this.dataParams.properties[i].additionalValidators.length; j++) {
|
|
637
|
+
this.dataParams.properties[i].additionalValidators[j](this.data[this.dataParams.properties[i].key]);
|
|
637
638
|
}
|
|
638
639
|
}
|
|
639
640
|
}
|
|
@@ -655,7 +656,7 @@ class DynamoNTS_DataService {
|
|
|
655
656
|
* setting up dependency dataHook by DynamoBEDataModelParams
|
|
656
657
|
*/
|
|
657
658
|
lookForDependencyDataSettings() {
|
|
658
|
-
const dependencyParam = this.dataParams.
|
|
659
|
+
const dependencyParam = this.dataParams.properties.find((modelParams) => modelParams.isDependencyHook);
|
|
659
660
|
if (dependencyParam) {
|
|
660
661
|
this.depKey = dependencyParam.key;
|
|
661
662
|
if (dependencyParam.dependencyDataName) {
|
|
@@ -664,6 +665,9 @@ class DynamoNTS_DataService {
|
|
|
664
665
|
if (dependencyParam.unique) {
|
|
665
666
|
this.depKeyIsUnique = true;
|
|
666
667
|
}
|
|
668
|
+
if (dependencyParam.required) {
|
|
669
|
+
this.depKeyIsRequired = true;
|
|
670
|
+
}
|
|
667
671
|
}
|
|
668
672
|
}
|
|
669
673
|
/**
|