@futdevpro/nts-dynamo 1.5.17 → 1.5.18
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/_services/dynamobe-data.service.d.ts +2 -2
- package/lib/_services/dynamobe-data.service.d.ts.map +1 -1
- package/lib/_services/dynamobe-data.service.js +11 -6
- package/lib/_services/dynamobe-data.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +2 -2
- package/package.json +1 -1
- package/src/_services/dynamobe-data.service.ts +11 -6
|
@@ -16,12 +16,12 @@ export declare class DynamoBEDataService<T extends Metadata> {
|
|
|
16
16
|
/**
|
|
17
17
|
* returns data from database by id
|
|
18
18
|
*/
|
|
19
|
-
getDataById(dontSetToService?: boolean): Promise<T>;
|
|
19
|
+
getDataById(id?: string, dontSetToService?: boolean): Promise<T>;
|
|
20
20
|
/**
|
|
21
21
|
* returns data from database by dependencyId to the service
|
|
22
22
|
* @param dependencyId
|
|
23
23
|
*/
|
|
24
|
-
getDataByDependencyId(dependencyId?: string): Promise<
|
|
24
|
+
getDataByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T>;
|
|
25
25
|
/**
|
|
26
26
|
* returns dataList from database by dependencyId to the service
|
|
27
27
|
* @param dependencyId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamobe-data.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamobe-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,0BAA0B,EAAiB,MAAM,uBAAuB,CAAC;AAEhH,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBAAa,mBAAmB,CAAC,CAAC,SAAS,QAAQ;IACjD,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,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;IAEzB,eAAe,CAAC,EAAE,0BAA0B,EAAE,CAAM;gBAGlD,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,kBAAkB,EAC9B,MAAM,CAAC,EAAE,MAAM;IASjB;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B;;OAEG;IACG,WAAW,CAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dynamobe-data.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamobe-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,0BAA0B,EAAiB,MAAM,uBAAuB,CAAC;AAEhH,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBAAa,mBAAmB,CAAC,CAAC,SAAS,QAAQ;IACjD,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpC,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;IAEzB,eAAe,CAAC,EAAE,0BAA0B,EAAE,CAAM;gBAGlD,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,kBAAkB,EAC9B,MAAM,CAAC,EAAE,MAAM;IASjB;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B;;OAEG;IACG,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAmBtE;;;OAGG;IACG,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAuB1F;;;OAGG;IACG,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrE;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC/B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAYjC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtC;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAUrC,0BAA0B,IAAI,iBAAiB,CAAC,GAAG,CAAC;CAOrD"}
|
|
@@ -32,12 +32,12 @@ class DynamoBEDataService {
|
|
|
32
32
|
/**
|
|
33
33
|
* returns data from database by id
|
|
34
34
|
*/
|
|
35
|
-
getDataById(dontSetToService) {
|
|
35
|
+
getDataById(id, dontSetToService) {
|
|
36
36
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
37
|
try {
|
|
38
|
-
if (this.data._id) {
|
|
38
|
+
if (id || this.data._id) {
|
|
39
39
|
let dataExists;
|
|
40
|
-
yield this.dataDBService.getDataById(this.data._id).then((data) => {
|
|
40
|
+
yield this.dataDBService.getDataById(id ? id : this.data._id).then((data) => {
|
|
41
41
|
if (!dontSetToService) {
|
|
42
42
|
this.data = data;
|
|
43
43
|
}
|
|
@@ -58,14 +58,19 @@ class DynamoBEDataService {
|
|
|
58
58
|
* returns data from database by dependencyId to the service
|
|
59
59
|
* @param dependencyId
|
|
60
60
|
*/
|
|
61
|
-
getDataByDependencyId(dependencyId) {
|
|
61
|
+
getDataByDependencyId(dependencyId, dontSetToService) {
|
|
62
62
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
63
63
|
try {
|
|
64
64
|
if (this.depKey) {
|
|
65
65
|
if (dependencyId || this.data[this.depKey]) {
|
|
66
|
+
let dataExists;
|
|
66
67
|
yield this.dataDBService.getDataByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]).then((data) => {
|
|
67
|
-
|
|
68
|
+
if (!dontSetToService) {
|
|
69
|
+
this.data = data;
|
|
70
|
+
}
|
|
71
|
+
dataExists = data;
|
|
68
72
|
});
|
|
73
|
+
return dataExists;
|
|
69
74
|
}
|
|
70
75
|
else {
|
|
71
76
|
throw new fsm_dynamo_1.DynamoBEError({ status: 417, message: `${this.depKey} is missing!` });
|
|
@@ -117,7 +122,7 @@ class DynamoBEDataService {
|
|
|
117
122
|
if (this.data._id) {
|
|
118
123
|
// check if already exists
|
|
119
124
|
let dataExists;
|
|
120
|
-
yield this.getDataById(true).then((data) => {
|
|
125
|
+
yield this.getDataById(null, true).then((data) => {
|
|
121
126
|
dataExists = data;
|
|
122
127
|
}).catch(() => { });
|
|
123
128
|
if (!dataExists) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamobe-data.service.js","sourceRoot":"","sources":["../../src/_services/dynamobe-data.service.ts"],"names":[],"mappings":";;;;AACA,sDAAgH;AAGhH,uEAAyD;AAEzD,MAAa,mBAAmB;IAW9B,YACE,IAAO,EACP,UAA8B,EAC9B,MAAe;QAXjB,aAAQ,GAAQ,EAAE,CAAC;QAMnB,oBAAe,GAAkC,EAAE,CAAC;QAOlD,IAAI,CAAC,aAAa,GAAG,sCAAY,CAAC,YAAY,CAAI,UAAU,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC;QAC9C,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;OAEG;IACG,MAAM;;YACV,IAAI;gBACF,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,QAAa,EAAE,EAAE;oBACvD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC3B,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,IAAI,0BAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,yBAAyB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5F;QACH,CAAC;KAAA;IAED;;OAEG;IACG,WAAW,CAAC,gBAA0B;;
|
|
1
|
+
{"version":3,"file":"dynamobe-data.service.js","sourceRoot":"","sources":["../../src/_services/dynamobe-data.service.ts"],"names":[],"mappings":"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"}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -817,8 +817,8 @@
|
|
|
817
817
|
"affectsGlobalScope": false
|
|
818
818
|
},
|
|
819
819
|
"../src/_services/dynamobe-data.service.ts": {
|
|
820
|
-
"version": "
|
|
821
|
-
"signature": "
|
|
820
|
+
"version": "8c6a7b93d1a54de62f0a6195d28de06b83a4e52440310c75a674982a81efc710",
|
|
821
|
+
"signature": "e6acd5f382f1fae691313eb5b2bfadbbdfdf4b9b6cbf3d99b5a652bfb3aef76a",
|
|
822
822
|
"affectsGlobalScope": false
|
|
823
823
|
},
|
|
824
824
|
"../src/_modules/test/custom-data.service.ts": {
|
package/package.json
CHANGED
|
@@ -43,11 +43,11 @@ export class DynamoBEDataService<T extends Metadata> {
|
|
|
43
43
|
/**
|
|
44
44
|
* returns data from database by id
|
|
45
45
|
*/
|
|
46
|
-
async getDataById(dontSetToService?: boolean): Promise<T> {
|
|
46
|
+
async getDataById(id?: string, dontSetToService?: boolean): Promise<T> {
|
|
47
47
|
try {
|
|
48
|
-
if (this.data._id) {
|
|
48
|
+
if (id || this.data._id) {
|
|
49
49
|
let dataExists: T;
|
|
50
|
-
await this.dataDBService.getDataById(this.data._id).then((data: T) => {
|
|
50
|
+
await this.dataDBService.getDataById(id ? id : this.data._id).then((data: T) => {
|
|
51
51
|
if (!dontSetToService) {
|
|
52
52
|
this.data = data;
|
|
53
53
|
}
|
|
@@ -66,13 +66,18 @@ export class DynamoBEDataService<T extends Metadata> {
|
|
|
66
66
|
* returns data from database by dependencyId to the service
|
|
67
67
|
* @param dependencyId
|
|
68
68
|
*/
|
|
69
|
-
async getDataByDependencyId(dependencyId?: string): Promise<
|
|
69
|
+
async getDataByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T> {
|
|
70
70
|
try {
|
|
71
71
|
if (this.depKey) {
|
|
72
72
|
if (dependencyId || this.data[this.depKey]) {
|
|
73
|
+
let dataExists: T;
|
|
73
74
|
await this.dataDBService.getDataByDependencyId(dependencyId ? dependencyId : this.data[this.depKey]).then((data: T) => {
|
|
74
|
-
|
|
75
|
+
if (!dontSetToService) {
|
|
76
|
+
this.data = data;
|
|
77
|
+
}
|
|
78
|
+
dataExists = data;
|
|
75
79
|
});
|
|
80
|
+
return dataExists;
|
|
76
81
|
} else {
|
|
77
82
|
throw new DynamoBEError({ status: 417, message: `${this.depKey} is missing!` });
|
|
78
83
|
}
|
|
@@ -116,7 +121,7 @@ export class DynamoBEDataService<T extends Metadata> {
|
|
|
116
121
|
if (this.data._id) {
|
|
117
122
|
// check if already exists
|
|
118
123
|
let dataExists: T;
|
|
119
|
-
await this.getDataById(true).then((data: T) => {
|
|
124
|
+
await this.getDataById(null, true).then((data: T) => {
|
|
120
125
|
dataExists = data;
|
|
121
126
|
}).catch(() => {});
|
|
122
127
|
if (!dataExists) {
|