@futdevpro/nts-dynamo 1.5.51 → 1.5.52
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/_models/dynamo-nts-endpoint-params.js +3 -2
- package/lib/_models/dynamo-nts-endpoint-params.js.map +1 -1
- package/lib/_services/dynamo-nts-app-extended.d.ts +87 -7
- package/lib/_services/dynamo-nts-app-extended.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-app-extended.js +87 -7
- package/lib/_services/dynamo-nts-app-extended.js.map +1 -1
- package/lib/_services/dynamo-nts-app.d.ts +131 -22
- package/lib/_services/dynamo-nts-app.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-app.js +104 -1
- package/lib/_services/dynamo-nts-app.js.map +1 -1
- package/lib/_services/dynamo-nts-auth.service.d.ts +78 -5
- package/lib/_services/dynamo-nts-auth.service.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-auth.service.js.map +1 -1
- package/lib/_services/dynamo-nts-data.service.d.ts +23 -1
- package/lib/_services/dynamo-nts-data.service.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-data.service.js +73 -53
- package/lib/_services/dynamo-nts-data.service.js.map +1 -1
- package/lib/_services/dynamo-nts-db.service.d.ts +164 -119
- package/lib/_services/dynamo-nts-db.service.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-db.service.js +327 -277
- package/lib/_services/dynamo-nts-db.service.js.map +1 -1
- package/lib/_services/dynamo-nts-routing-module.service.d.ts +39 -0
- package/lib/_services/dynamo-nts-routing-module.service.d.ts.map +1 -1
- package/lib/_services/dynamo-nts-routing-module.service.js +39 -0
- package/lib/_services/dynamo-nts-routing-module.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -12
- package/src/_models/dynamo-nts-endpoint-params.ts +2 -2
- package/src/_services/dynamo-nts-app-extended.ts +87 -7
- package/src/_services/dynamo-nts-app.ts +131 -22
- package/src/_services/dynamo-nts-auth.service.ts +79 -5
- package/src/_services/dynamo-nts-data.service.ts +74 -54
- package/src/_services/dynamo-nts-db.service.ts +355 -281
- package/src/_services/dynamo-nts-routing-module.service.ts +39 -0
|
@@ -24,30 +24,103 @@ export declare abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonS
|
|
|
24
24
|
*/
|
|
25
25
|
static getTokenFromRequest(req: Request): string;
|
|
26
26
|
/**
|
|
27
|
+
* You need to implement a token validation logic,
|
|
28
|
+
* when if the token is invalid, or the authentication fails, it sends or throws an error
|
|
29
|
+
*
|
|
30
|
+
* @example
|
|
31
|
+
*
|
|
32
|
+
* async authenticateToken(req: Request, res: Response, next: NextFunction) {
|
|
33
|
+
* try {
|
|
34
|
+
* let token = AuthService.getTokenFromRequest(req);
|
|
35
|
+
* token = await AuthService.verifyToken(token);
|
|
36
|
+
*
|
|
37
|
+
* DynamoNTS_Shared.logSuccess('token authenticated');
|
|
38
|
+
* res.setHeader('authorization', `Bearer ${token}`);
|
|
39
|
+
* next();
|
|
40
|
+
* } catch (error) {
|
|
41
|
+
* error = new Dynamo_Error({
|
|
42
|
+
* status: 401,
|
|
43
|
+
* message: `authenticateToken (WB-ERROR)`,
|
|
44
|
+
* addECToUserMsg: true,
|
|
45
|
+
* userMessage: `Authorization failed.`,
|
|
46
|
+
* error
|
|
47
|
+
* });
|
|
48
|
+
* DynamoNTS_Shared.logError(error?.message, error);
|
|
49
|
+
*
|
|
50
|
+
* res.status(error.status);
|
|
51
|
+
* res.send(error);
|
|
52
|
+
* }
|
|
53
|
+
* }
|
|
54
|
+
* */
|
|
55
|
+
abstract authenticateToken(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
56
|
+
/**
|
|
57
|
+
* You need to implement a token validation logic,
|
|
58
|
+
* when if the token is invalid, or the authentication fails, it sends or throws an error
|
|
27
59
|
*
|
|
28
60
|
* @param req
|
|
29
61
|
* @param res
|
|
30
62
|
* @param next
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
63
|
+
*
|
|
64
|
+
* @example
|
|
65
|
+
*
|
|
66
|
+
* async authenticateTokenSelf(req: Request, res: Response, next: NextFunction): Promise<void> {
|
|
67
|
+
* try {
|
|
68
|
+
* let token = AuthService.getTokenFromRequest(req);
|
|
69
|
+
* token = await AuthService.verifyTokenSelf(token, req?.params?.userId);
|
|
70
|
+
* DynamoNTS_Shared.logSuccess('selftoken authenticated');
|
|
71
|
+
*
|
|
72
|
+
* res.setHeader('authorization', `Bearer ${token}`);
|
|
73
|
+
* next();
|
|
74
|
+
* } catch (error) {
|
|
75
|
+
* error = new Dynamo_Error({
|
|
76
|
+
* status: 401,
|
|
77
|
+
* message: `authenticateTokenSelf (WB-ERROR)`,
|
|
78
|
+
* addECToUserMsg: true,
|
|
79
|
+
* userMessage: `Authorization failed.`,
|
|
80
|
+
* error
|
|
81
|
+
* });
|
|
82
|
+
* DynamoNTS_Shared.logError(error?.message, error);
|
|
83
|
+
*
|
|
84
|
+
* res.status(error.status);
|
|
85
|
+
* res.send(error);
|
|
86
|
+
* }
|
|
87
|
+
* }
|
|
34
88
|
*
|
|
35
89
|
*/
|
|
36
|
-
abstract
|
|
90
|
+
abstract authenticateTokenSelf(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
37
91
|
/**
|
|
38
92
|
* Authenticate Token for Permission to Access UsageData
|
|
39
93
|
* @param req
|
|
40
94
|
* @param res
|
|
41
95
|
* @param next
|
|
96
|
+
*
|
|
97
|
+
* @example
|
|
98
|
+
* You need to implement a token validation logic,
|
|
99
|
+
* when if the token is invalid, or the authentication fails, it sends or throws an error
|
|
100
|
+
*
|
|
101
|
+
* async authTokenPermAccUsageData(req: Request, res: Response, next: NextFunction): Promise<void> {
|
|
102
|
+
* AuthService.authTokenAndPerm(req, res, next, Permission.accessUsageData);
|
|
103
|
+
* }
|
|
42
104
|
*/
|
|
43
105
|
abstract authTokenPermAccUsageData(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
44
106
|
/**
|
|
45
107
|
* The DynamoBE System is using this to get issuer, that will be set on DBServices
|
|
46
108
|
* @param req
|
|
109
|
+
*
|
|
110
|
+
* @example
|
|
111
|
+
* getAccountIdFromRequest(req: Request): string {
|
|
112
|
+
* try {
|
|
113
|
+
* const authHeader = req.headers['authorization'];
|
|
114
|
+
* const token = authHeader.split(' ')[1];
|
|
115
|
+
* return this.getAccountIdFromToken(token);
|
|
116
|
+
* } catch {
|
|
117
|
+
* return undefined;
|
|
118
|
+
* }
|
|
119
|
+
* }
|
|
47
120
|
*/
|
|
48
121
|
abstract getAccountIdFromRequest(req: Request): string;
|
|
49
122
|
/**
|
|
50
|
-
*
|
|
123
|
+
* Basic Module: UsageModule uses this function
|
|
51
124
|
* @param req
|
|
52
125
|
*/
|
|
53
126
|
abstract getUsernameFromRequest(req: Request): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-nts-auth.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E;;;;;;;;;;;;GAYG;AACH,8BAAsB,qBAAsB,SAAQ,0BAA0B;IAE5E,MAAM,CAAC,mBAAmB,SAAqG;IAE/H;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IA0BhD
|
|
1
|
+
{"version":3,"file":"dynamo-nts-auth.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E;;;;;;;;;;;;GAYG;AACH,8BAAsB,qBAAsB,SAAQ,0BAA0B;IAE5E,MAAM,CAAC,mBAAmB,SAAqG;IAE/H;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IA0BhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA4BK;IACL,QAAQ,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAE1F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,QAAQ,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9F;;;;;;;;;;;;;OAaG;IACH,QAAQ,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAElG;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IACtD;;;OAGG;IACH,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;CACtD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-nts-auth.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-auth.service.ts"],"names":[],"mappings":";;;AAEA,sDAAqD;AAErD,iFAA4E;AAE5E;;;;;;;;;;;;GAYG;AACH,MAAsB,qBAAsB,SAAQ,yDAA0B;IAI5E;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,GAAY;QACrC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,qBAAqB;gBAC9B,WAAW,EAAE,IAAI,CAAC,mBAAmB;aACtC,CAAC,CAAC;SACJ;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,gBAAgB;gBACzB,WAAW,EAAE,IAAI,CAAC,mBAAmB;aACtC,CAAC,CAAC;SACJ;QAED,OAAO,KAAK,CAAC;IACf,CAAC;;AAnCH,
|
|
1
|
+
{"version":3,"file":"dynamo-nts-auth.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-auth.service.ts"],"names":[],"mappings":";;;AAEA,sDAAqD;AAErD,iFAA4E;AAE5E;;;;;;;;;;;;GAYG;AACH,MAAsB,qBAAsB,SAAQ,yDAA0B;IAI5E;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,GAAY;QACrC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,qBAAqB;gBAC9B,WAAW,EAAE,IAAI,CAAC,mBAAmB;aACtC,CAAC,CAAC;SACJ;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,gBAAgB;gBACzB,WAAW,EAAE,IAAI,CAAC,mBAAmB;aACtC,CAAC,CAAC;SACJ;QAED,OAAO,KAAK,CAAC;IACf,CAAC;;AAnCH,sDA6IC;AA3IQ,yCAAmB,GAAG,kGAAkG,CAAA"}
|
|
@@ -26,6 +26,7 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
|
|
|
26
26
|
issuer?: string;
|
|
27
27
|
depKey?: string;
|
|
28
28
|
depDBServiceKey?: string;
|
|
29
|
+
private depDataDBService;
|
|
29
30
|
dataParams: DynamoNTS_DataParams;
|
|
30
31
|
defaultErrorUserMsg: string;
|
|
31
32
|
defaultValidationErrorUserMsg: string;
|
|
@@ -35,7 +36,19 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
|
|
|
35
36
|
*/
|
|
36
37
|
getAll(): Promise<void>;
|
|
37
38
|
/**
|
|
39
|
+
* @description
|
|
38
40
|
* returns data from database by id
|
|
41
|
+
* also if dontSetToService is false or not setted,
|
|
42
|
+
* the data will be saved to the service
|
|
43
|
+
*
|
|
44
|
+
* @remarks
|
|
45
|
+
* If you need to get-save a data, if possible,
|
|
46
|
+
* use db-service update instead.
|
|
47
|
+
*
|
|
48
|
+
* @param {string} id
|
|
49
|
+
* @param dontSetToService
|
|
50
|
+
*
|
|
51
|
+
* @return {T} data: T
|
|
39
52
|
*/
|
|
40
53
|
getDataById(id?: string, dontSetToService?: boolean): Promise<T>;
|
|
41
54
|
/**
|
|
@@ -48,10 +61,19 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
|
|
|
48
61
|
* @param dependencyId
|
|
49
62
|
*/
|
|
50
63
|
getDataListByDependencyId(dependencyId?: string): Promise<void>;
|
|
64
|
+
updateData(set: {
|
|
65
|
+
updateBy?: any;
|
|
66
|
+
update: any;
|
|
67
|
+
}): Promise<void>;
|
|
51
68
|
/**
|
|
52
69
|
* modifies data if the data have ID and already exists in the DB,
|
|
53
70
|
* creates new if the ID is not present or cant find in DB,
|
|
54
|
-
* and if dependency data setted up, will check before creation
|
|
71
|
+
* and if dependency data setted up, will check before creation,
|
|
72
|
+
* @warning
|
|
73
|
+
* but the proper way to update data, if you use update method instead,
|
|
74
|
+
* this way, you can avoid data override errors
|
|
75
|
+
* (when you simultaneously trying to change the same data's
|
|
76
|
+
* different values from different flows)
|
|
55
77
|
*/
|
|
56
78
|
saveData(): Promise<void>;
|
|
57
79
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-nts-data.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAA8C,MAAM,uBAAuB,CAAC;AAE1H,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,eAAe;IAC1D,aAAa,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,CAAC,EAAE,CAAM;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamo-nts-data.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAA8C,MAAM,uBAAuB,CAAC;AAE1H,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,eAAe;IAC1D,aAAa,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,CAAC,EAAE,CAAM;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,gBAAgB,CAA2B;IAGnD,UAAU,EAAE,oBAAoB,CAAC;IAEjC,mBAAmB,SAA8F;IACjH,6BAA6B,SAAoG;gBAG/H,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,oBAAoB,EAChC,MAAM,CAAC,EAAE,MAAM;IAUjB;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7B;;;;;;;;;;;;;;OAcG;IACG,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IA6BtE;;;OAGG;IACG,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAuC1F;;;OAGG;IACG,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/D,UAAU,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrE;;;;;;;;;OASG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD/B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CtC;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAUrC;;;OAGG;IACH,0BAA0B,IAAI,mBAAmB,CAAC,GAAG,CAAC;CAkBvD"}
|
|
@@ -41,16 +41,14 @@ class DynamoNTS_DataService {
|
|
|
41
41
|
getAll() {
|
|
42
42
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
43
43
|
try {
|
|
44
|
-
yield this.dataDBService.getAll()
|
|
45
|
-
this.dataList = dataList;
|
|
46
|
-
});
|
|
44
|
+
this.dataList = yield this.dataDBService.getAll();
|
|
47
45
|
}
|
|
48
46
|
catch (error) {
|
|
49
47
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
50
48
|
status: 417,
|
|
51
49
|
errorCode: 'NTS-DS0-GA0',
|
|
52
50
|
addECToUserMsg: true,
|
|
53
|
-
message:
|
|
51
|
+
message: `getAll was unsuccessful (${this.dataParams.dataName})`,
|
|
54
52
|
userMessage: this.defaultErrorUserMsg,
|
|
55
53
|
error: error
|
|
56
54
|
});
|
|
@@ -58,19 +56,28 @@ class DynamoNTS_DataService {
|
|
|
58
56
|
});
|
|
59
57
|
}
|
|
60
58
|
/**
|
|
59
|
+
* @description
|
|
61
60
|
* returns data from database by id
|
|
61
|
+
* also if dontSetToService is false or not setted,
|
|
62
|
+
* the data will be saved to the service
|
|
63
|
+
*
|
|
64
|
+
* @remarks
|
|
65
|
+
* If you need to get-save a data, if possible,
|
|
66
|
+
* use db-service update instead.
|
|
67
|
+
*
|
|
68
|
+
* @param {string} id
|
|
69
|
+
* @param dontSetToService
|
|
70
|
+
*
|
|
71
|
+
* @return {T} data: T
|
|
62
72
|
*/
|
|
63
73
|
getDataById(id, dontSetToService) {
|
|
64
74
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
75
|
try {
|
|
66
76
|
if (id || this.data._id) {
|
|
67
|
-
let dataExists;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
dataExists = data;
|
|
73
|
-
});
|
|
77
|
+
let dataExists = yield this.dataDBService.getDataById(id ? id : this.data._id);
|
|
78
|
+
if (!dontSetToService && dataExists) {
|
|
79
|
+
this.data = dataExists;
|
|
80
|
+
}
|
|
74
81
|
return dataExists;
|
|
75
82
|
}
|
|
76
83
|
else {
|
|
@@ -78,7 +85,7 @@ class DynamoNTS_DataService {
|
|
|
78
85
|
status: 417,
|
|
79
86
|
errorCode: 'NTS-DS0-GI1',
|
|
80
87
|
addECToUserMsg: true,
|
|
81
|
-
message: `ID is missing! (maybe you wanted to use getDataByDependencyId instead...)`,
|
|
88
|
+
message: `ID is missing! (maybe you wanted to use getDataByDependencyId() instead...) (${this.dataParams.dataName})`,
|
|
82
89
|
userMessage: this.defaultErrorUserMsg
|
|
83
90
|
});
|
|
84
91
|
}
|
|
@@ -88,7 +95,7 @@ class DynamoNTS_DataService {
|
|
|
88
95
|
status: 417,
|
|
89
96
|
errorCode: 'NTS-DS0-GI0',
|
|
90
97
|
addECToUserMsg: true,
|
|
91
|
-
message:
|
|
98
|
+
message: `getDataById was unsuccessful (${this.dataParams.dataName})`,
|
|
92
99
|
userMessage: this.defaultErrorUserMsg,
|
|
93
100
|
error: error
|
|
94
101
|
});
|
|
@@ -104,13 +111,10 @@ class DynamoNTS_DataService {
|
|
|
104
111
|
try {
|
|
105
112
|
if (this.depKey) {
|
|
106
113
|
if (dependencyId || this.data[this.depKey]) {
|
|
107
|
-
let dataExists;
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
112
|
-
dataExists = data;
|
|
113
|
-
});
|
|
114
|
+
let dataExists = yield this.dataDBService.getDataByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]);
|
|
115
|
+
if (!dontSetToService && dataExists) {
|
|
116
|
+
this.data = dataExists;
|
|
117
|
+
}
|
|
114
118
|
return dataExists;
|
|
115
119
|
}
|
|
116
120
|
else {
|
|
@@ -118,7 +122,7 @@ class DynamoNTS_DataService {
|
|
|
118
122
|
status: 417,
|
|
119
123
|
errorCode: 'NTS-DS0-GD3',
|
|
120
124
|
addECToUserMsg: true,
|
|
121
|
-
message: `${this.depKey} is missing
|
|
125
|
+
message: `${this.depKey} is missing! (${this.dataParams.dataName})`,
|
|
122
126
|
userMessage: this.defaultErrorUserMsg
|
|
123
127
|
});
|
|
124
128
|
}
|
|
@@ -128,7 +132,7 @@ class DynamoNTS_DataService {
|
|
|
128
132
|
status: 417,
|
|
129
133
|
errorCode: 'NTS-DS0-GD2',
|
|
130
134
|
addECToUserMsg: true,
|
|
131
|
-
message: 'dependencyDataIdKey is missing from service!
|
|
135
|
+
message: `'dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
|
|
132
136
|
userMessage: this.defaultErrorUserMsg
|
|
133
137
|
});
|
|
134
138
|
}
|
|
@@ -138,7 +142,7 @@ class DynamoNTS_DataService {
|
|
|
138
142
|
status: 417,
|
|
139
143
|
errorCode: 'NTS-DS0-GD0',
|
|
140
144
|
addECToUserMsg: true,
|
|
141
|
-
message:
|
|
145
|
+
message: `getDataByDependencyId was unsuccessful (${this.dataParams.dataName})`,
|
|
142
146
|
userMessage: this.defaultErrorUserMsg,
|
|
143
147
|
error: error
|
|
144
148
|
});
|
|
@@ -154,16 +158,14 @@ class DynamoNTS_DataService {
|
|
|
154
158
|
try {
|
|
155
159
|
if (this.depKey) {
|
|
156
160
|
if (dependencyId || this.data[this.depKey]) {
|
|
157
|
-
yield this.dataDBService.getDataListByDependencyId(dependencyId ? dependencyId : this.data[this.depKey])
|
|
158
|
-
this.dataList = data;
|
|
159
|
-
});
|
|
161
|
+
this.dataList = yield this.dataDBService.getDataListByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]);
|
|
160
162
|
}
|
|
161
163
|
else {
|
|
162
164
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
163
165
|
status: 417,
|
|
164
166
|
errorCode: 'NTS-DS0-GLD3',
|
|
165
167
|
addECToUserMsg: true,
|
|
166
|
-
message: `${this.depKey} is missing
|
|
168
|
+
message: `${this.depKey} is missing (${this.dataParams.dataName})`,
|
|
167
169
|
userMessage: this.defaultErrorUserMsg
|
|
168
170
|
});
|
|
169
171
|
}
|
|
@@ -173,7 +175,7 @@ class DynamoNTS_DataService {
|
|
|
173
175
|
status: 417,
|
|
174
176
|
errorCode: 'NTS-DS0-GLD2',
|
|
175
177
|
addECToUserMsg: true,
|
|
176
|
-
message:
|
|
178
|
+
message: `dependencyDataIdKey is missing from service! (${this.dataParams.dataName})`,
|
|
177
179
|
userMessage: this.defaultErrorUserMsg
|
|
178
180
|
});
|
|
179
181
|
}
|
|
@@ -183,7 +185,26 @@ class DynamoNTS_DataService {
|
|
|
183
185
|
status: 417,
|
|
184
186
|
errorCode: 'NTS-DS0-GLD0',
|
|
185
187
|
addECToUserMsg: true,
|
|
186
|
-
message:
|
|
188
|
+
message: `getDataListByDependencyId was unsuccessful (${this.dataParams.dataName})`,
|
|
189
|
+
userMessage: this.defaultErrorUserMsg,
|
|
190
|
+
error: error
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
updateData(set) {
|
|
196
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
197
|
+
try {
|
|
198
|
+
if (set.updateBy) {
|
|
199
|
+
this.data = yield this.dataDBService.updateOne(set.updateBy, set.update, this.issuer);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
catch (error) {
|
|
203
|
+
throw new fsm_dynamo_1.Dynamo_Error({
|
|
204
|
+
status: 417,
|
|
205
|
+
errorCode: 'NTS-DS0-UD0',
|
|
206
|
+
addECToUserMsg: true,
|
|
207
|
+
message: `updateData was unsuccessful (${this.dataParams.dataName})`,
|
|
187
208
|
userMessage: this.defaultErrorUserMsg,
|
|
188
209
|
error: error
|
|
189
210
|
});
|
|
@@ -193,25 +214,24 @@ class DynamoNTS_DataService {
|
|
|
193
214
|
/**
|
|
194
215
|
* modifies data if the data have ID and already exists in the DB,
|
|
195
216
|
* creates new if the ID is not present or cant find in DB,
|
|
196
|
-
* and if dependency data setted up, will check before creation
|
|
217
|
+
* and if dependency data setted up, will check before creation,
|
|
218
|
+
* @warning
|
|
219
|
+
* but the proper way to update data, if you use update method instead,
|
|
220
|
+
* this way, you can avoid data override errors
|
|
221
|
+
* (when you simultaneously trying to change the same data's
|
|
222
|
+
* different values from different flows)
|
|
197
223
|
*/
|
|
198
224
|
saveData() {
|
|
199
225
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
200
226
|
try {
|
|
201
227
|
if (this.data._id) {
|
|
202
228
|
// check if already exists
|
|
203
|
-
let dataExists;
|
|
204
|
-
yield this.getDataById(null, true).then((data) => {
|
|
205
|
-
dataExists = data;
|
|
206
|
-
}).catch(() => { });
|
|
229
|
+
let dataExists = yield this.getDataById(null, true).catch(() => null);
|
|
207
230
|
if (!dataExists) {
|
|
208
231
|
// if data not exists check that dependency already exists for this
|
|
209
232
|
if (this.depKey) {
|
|
210
233
|
if (this.data[this.depKey]) {
|
|
211
|
-
let dependencyExists =
|
|
212
|
-
yield this.getDependencyDataDBService().getDataById(this.data[this.depKey]).then((dep) => {
|
|
213
|
-
dependencyExists = !!dep;
|
|
214
|
-
});
|
|
234
|
+
let dependencyExists = yield this.getDependencyDataDBService().getDataById(this.data[this.depKey]);
|
|
215
235
|
if (!dependencyExists) {
|
|
216
236
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
217
237
|
status: 417,
|
|
@@ -233,22 +253,16 @@ class DynamoNTS_DataService {
|
|
|
233
253
|
}
|
|
234
254
|
}
|
|
235
255
|
// if data not exists create new data
|
|
236
|
-
yield this.dataDBService.createData(this.data, this.issuer)
|
|
237
|
-
this.data = data;
|
|
238
|
-
});
|
|
256
|
+
this.data = yield this.dataDBService.createData(this.data, this.issuer);
|
|
239
257
|
}
|
|
240
258
|
else {
|
|
241
259
|
// if data exists do modify
|
|
242
|
-
yield this.dataDBService.modifyData(this.data, this.issuer)
|
|
243
|
-
this.data = data;
|
|
244
|
-
});
|
|
260
|
+
this.data = yield this.dataDBService.modifyData(this.data, this.issuer);
|
|
245
261
|
}
|
|
246
262
|
}
|
|
247
263
|
else {
|
|
248
264
|
// if ID is not present, data not exists, create new data
|
|
249
|
-
yield this.dataDBService.createData(this.data, this.issuer)
|
|
250
|
-
this.data = data;
|
|
251
|
-
});
|
|
265
|
+
this.data = yield this.dataDBService.createData(this.data, this.issuer);
|
|
252
266
|
}
|
|
253
267
|
}
|
|
254
268
|
catch (error) {
|
|
@@ -277,7 +291,7 @@ class DynamoNTS_DataService {
|
|
|
277
291
|
status: 417,
|
|
278
292
|
errorCode: 'NTS-DS0-DD1',
|
|
279
293
|
addECToUserMsg: true,
|
|
280
|
-
message:
|
|
294
|
+
message: `ID is missing! (${this.dataParams.dataName})`,
|
|
281
295
|
userMessage: this.defaultErrorUserMsg,
|
|
282
296
|
});
|
|
283
297
|
}
|
|
@@ -287,7 +301,7 @@ class DynamoNTS_DataService {
|
|
|
287
301
|
status: 417,
|
|
288
302
|
errorCode: 'NTS-DS0-DD0',
|
|
289
303
|
addECToUserMsg: true,
|
|
290
|
-
message:
|
|
304
|
+
message: `deleteData was unsuccessful (${this.dataParams.dataName})`,
|
|
291
305
|
userMessage: this.defaultErrorUserMsg,
|
|
292
306
|
error: error
|
|
293
307
|
});
|
|
@@ -335,7 +349,7 @@ class DynamoNTS_DataService {
|
|
|
335
349
|
status: 422,
|
|
336
350
|
errorCode: 'NTS-DS0-VD0',
|
|
337
351
|
addECToUserMsg: true,
|
|
338
|
-
message:
|
|
352
|
+
message: `validateForSave was unsuccessful (${this.dataParams.dataName})`,
|
|
339
353
|
userMessage: this.defaultErrorUserMsg,
|
|
340
354
|
error: error
|
|
341
355
|
});
|
|
@@ -349,8 +363,8 @@ class DynamoNTS_DataService {
|
|
|
349
363
|
const dependencyParam = this.dataParams.modelParams.find((modelParams) => modelParams.isDependencyHook);
|
|
350
364
|
if (dependencyParam) {
|
|
351
365
|
this.depKey = dependencyParam.key;
|
|
352
|
-
if (dependencyParam.
|
|
353
|
-
this.depDBServiceKey = dependencyParam.
|
|
366
|
+
if (dependencyParam.dependencyDataName) {
|
|
367
|
+
this.depDBServiceKey = dependencyParam.dependencyDataName;
|
|
354
368
|
}
|
|
355
369
|
}
|
|
356
370
|
}
|
|
@@ -360,7 +374,13 @@ class DynamoNTS_DataService {
|
|
|
360
374
|
*/
|
|
361
375
|
getDependencyDataDBService() {
|
|
362
376
|
if (this.depDBServiceKey) {
|
|
363
|
-
|
|
377
|
+
if (this.depDataDBService) {
|
|
378
|
+
return this.depDataDBService;
|
|
379
|
+
}
|
|
380
|
+
else {
|
|
381
|
+
this.depDataDBService = dynamo_nts_global_service_1.DynamoNTS_GlobalService.getDBServiceByKey(this.depDBServiceKey);
|
|
382
|
+
return this.depDataDBService;
|
|
383
|
+
}
|
|
364
384
|
}
|
|
365
385
|
else {
|
|
366
386
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-nts-data.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-data.service.ts"],"names":[],"mappings":";;;;AACA,sDAA0H;AAG1H,2EAAsE;AAEtE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"dynamo-nts-data.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-data.service.ts"],"names":[],"mappings":"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"}
|