@futdevpro/nts-dynamo 1.9.29 → 1.9.30

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 (26) hide show
  1. package/build/_modules/custom-data/custom-data.data-service.d.ts.map +1 -1
  2. package/build/_modules/custom-data/custom-data.data-service.js +1 -1
  3. package/build/_modules/custom-data/custom-data.data-service.js.map +1 -1
  4. package/build/_modules/mock/app-extended-server.mock.js +4 -4
  5. package/build/_modules/mock/app-extended-server.mock.js.map +1 -1
  6. package/build/_modules/mock/app-server.mock.js +4 -4
  7. package/build/_modules/mock/app-server.mock.js.map +1 -1
  8. package/build/_modules/socket/_services/app-extended.server.d.ts +2 -2
  9. package/build/_modules/socket/_services/app-extended.server.js +2 -2
  10. package/build/_modules/usage/usage.data-service.d.ts.map +1 -1
  11. package/build/_modules/usage/usage.data-service.js +1 -1
  12. package/build/_modules/usage/usage.data-service.js.map +1 -1
  13. package/build/_services/base/data.service.d.ts +1 -1
  14. package/build/_services/base/data.service.d.ts.map +1 -1
  15. package/build/_services/base/data.service.js +37 -18
  16. package/build/_services/base/data.service.js.map +1 -1
  17. package/build/_services/server/app.server.d.ts +2 -2
  18. package/build/_services/server/app.server.js +2 -2
  19. package/package.json +2 -2
  20. package/src/_modules/custom-data/custom-data.data-service.ts +2 -2
  21. package/src/_modules/mock/app-extended-server.mock.ts +6 -6
  22. package/src/_modules/mock/app-server.mock.ts +6 -6
  23. package/src/_modules/socket/_services/app-extended.server.ts +2 -2
  24. package/src/_modules/usage/usage.data-service.ts +2 -2
  25. package/src/_services/base/data.service.ts +44 -18
  26. package/src/_services/server/app.server.ts +2 -2
package/build/_modules/custom-data/custom-data.data-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"custom-data.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.data-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACwB,eAAe,EAC7C,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,qBAAa,2BAA4B,SAAQ,iBAAiB,CAAC,eAAe,CAAC;gBAG/E,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,MAAM;CAQlB"}
1
+ {"version":3,"file":"custom-data.data-service.d.ts","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.data-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACuB,eAAe,EAC5C,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,qBAAa,2BAA4B,SAAQ,iBAAiB,CAAC,eAAe,CAAC;gBAG/E,UAAU,CAAC,EAAE,eAAe,EAC5B,MAAM,CAAC,EAAE,MAAM;CAQlB"}
package/build/_modules/custom-data/custom-data.data-service.js CHANGED
@@ -5,7 +5,7 @@ const custom_data_1 = require("@futdevpro/fsm-dynamo/custom-data");
5
5
  const data_service_1 = require("../../_services/base/data.service");
6
6
  class DyFM_CustomData_DataService extends data_service_1.DyNTS_DataService {
7
7
  constructor(customData, issuer) {
8
- super(new custom_data_1.DyFM_CustomData(customData), custom_data_1.DyFM_customDataModel_params, issuer);
8
+ super(new custom_data_1.DyFM_CustomData(customData), custom_data_1.DyFM_customData_dataParams, issuer);
9
9
  }
10
10
  }
11
11
  exports.DyFM_CustomData_DataService = DyFM_CustomData_DataService;
package/build/_modules/custom-data/custom-data.data-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"custom-data.data-service.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.data-service.ts"],"names":[],"mappings":";;;AAGA,mEAE2C;AAC3C,oEAAsE;AAEtE,MAAa,2BAA4B,SAAQ,gCAAkC;IAEjF,YACE,UAA4B,EAC5B,MAAe;QAEf,KAAK,CACH,IAAI,6BAAe,CAAC,UAAU,CAAC,EAC/B,yCAA2B,EAC3B,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAZD,kEAYC"}
1
+ {"version":3,"file":"custom-data.data-service.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.data-service.ts"],"names":[],"mappings":";;;AAGA,mEAE2C;AAC3C,oEAAsE;AAEtE,MAAa,2BAA4B,SAAQ,gCAAkC;IAEjF,YACE,UAA4B,EAC5B,MAAe;QAEf,KAAK,CACH,IAAI,6BAAe,CAAC,UAAU,CAAC,EAC/B,wCAA0B,EAC1B,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAZD,kEAYC"}
package/build/_modules/mock/app-extended-server.mock.js CHANGED
@@ -69,8 +69,8 @@ class DyNTS_AppExtendedFull_Mock extends app_extended_server_1.DyNTS_AppExtended
69
69
  dbModels: [
70
70
  data_model_mock_1.dependency_mock_DataParams,
71
71
  data_model_mock_1.dependent_mock_DataParams,
72
- usage_1.DyFM_usageSessionModel_params,
73
- custom_data_1.DyFM_customDataModel_params,
72
+ usage_1.DyFM_usageSession_dataParams,
73
+ custom_data_1.DyFM_customData_dataParams,
74
74
  ],
75
75
  };
76
76
  }
@@ -129,8 +129,8 @@ class DyNTS_AppWbMock_Mock extends app_extended_server_1.DyNTS_AppExtended {
129
129
  dbModels: [
130
130
  data_model_mock_1.dependency_mock_DataParams,
131
131
  data_model_mock_1.dependent_mock_DataParams,
132
- usage_1.DyFM_usageSessionModel_params,
133
- custom_data_1.DyFM_customDataModel_params,
132
+ usage_1.DyFM_usageSession_dataParams,
133
+ custom_data_1.DyFM_customData_dataParams,
134
134
  ],
135
135
  };
136
136
  }
package/build/_modules/mock/app-extended-server.mock.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-extended-server.mock.js","sourceRoot":"","sources":["../../../src/_modules/mock/app-extended-server.mock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-extended-server.mock.js","sourceRoot":"","sources":["../../../src/_modules/mock/app-extended-server.mock.ts"],"names":[],"mappings":"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"}
package/build/_modules/mock/app-server.mock.js CHANGED
@@ -61,8 +61,8 @@ class DyNTS_AppFull_Mock extends app_server_1.DyNTS_App {
61
61
  dbModels: [
62
62
  data_model_mock_1.dependency_mock_DataParams,
63
63
  data_model_mock_1.dependent_mock_DataParams,
64
- usage_1.DyFM_usageSessionModel_params,
65
- custom_data_1.DyFM_customDataModel_params,
64
+ usage_1.DyFM_usageSession_dataParams,
65
+ custom_data_1.DyFM_customData_dataParams,
66
66
  ],
67
67
  };
68
68
  }
@@ -125,8 +125,8 @@ class DyNTS_AppTEST_Mock extends app_server_1.DyNTS_App {
125
125
  dbModels: [
126
126
  data_model_mock_1.dependency_mock_DataParams,
127
127
  data_model_mock_1.dependent_mock_DataParams,
128
- usage_1.DyFM_usageSessionModel_params,
129
- custom_data_1.DyFM_customDataModel_params,
128
+ usage_1.DyFM_usageSession_dataParams,
129
+ custom_data_1.DyFM_customData_dataParams,
130
130
  ],
131
131
  };
132
132
  }
package/build/_modules/mock/app-server.mock.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-server.mock.js","sourceRoot":"","sources":["../../../src/_modules/mock/app-server.mock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-server.mock.js","sourceRoot":"","sources":["../../../src/_modules/mock/app-server.mock.ts"],"names":[],"mappings":"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"}
package/build/_modules/socket/_services/app-extended.server.d.ts CHANGED
@@ -46,8 +46,8 @@ import { DyNTS_SocketServerService } from './socket-server.service';
46
46
  * matchStatisticsModelParams,
47
47
  * matchDataModelParams,
48
48
 
49
- * DyFM_usageSessionModel_params,
50
- * DyFM_customDataModel_params,
49
+ * DyFM_usageSession_dataParams,
50
+ * DyFM_customData_dataParams,
51
51
  * ]
52
52
  * });
53
53
  * }
package/build/_modules/socket/_services/app-extended.server.js CHANGED
@@ -56,8 +56,8 @@ const global_settings_const_1 = require("../../../_collections/global-settings.c
56
56
  * matchStatisticsModelParams,
57
57
  * matchDataModelParams,
58
58
 
59
- * DyFM_usageSessionModel_params,
60
- * DyFM_customDataModel_params,
59
+ * DyFM_usageSession_dataParams,
60
+ * DyFM_customData_dataParams,
61
61
  * ]
62
62
  * });
63
63
  * }
package/build/_modules/usage/usage.data-service.d.ts.map CHANGED
@@ -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,EAAyB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAiC,cAAc,EACvE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAGtE,qBAAa,uBAAwB,SAAQ,iBAAiB,CAAC,iBAAiB,CAAC;IAC/E,SAAS,EAAE,cAAc,EAAE,CAAM;IACjC,oBAAoB,EAAE,mBAAmB,EAAE,CAAM;gBAG/C,GAAG,CAAC,EAAE;QACJ,YAAY,CAAC,EAAE,iBAAiB,CAAC;QACjC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAUH,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAgBxC,QAAQ,CAAC,KAAK,GAAE,iBAA8C,GAAG,OAAO,CAAC,IAAI,CAAC;IA4D9E,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
+ {"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,EAAyB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAgC,cAAc,EACtE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAGtE,qBAAa,uBAAwB,SAAQ,iBAAiB,CAAC,iBAAiB,CAAC;IAC/E,SAAS,EAAE,cAAc,EAAE,CAAM;IACjC,oBAAoB,EAAE,mBAAmB,EAAE,CAAM;gBAG/C,GAAG,CAAC,EAAE;QACJ,YAAY,CAAC,EAAE,iBAAiB,CAAC;QACjC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAUH,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAgBxC,QAAQ,CAAC,KAAK,GAAE,iBAA8C,GAAG,OAAO,CAAC,IAAI,CAAC;IA4D9E,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"}
package/build/_modules/usage/usage.data-service.js CHANGED
@@ -9,7 +9,7 @@ class DyNTS_Usage_DataService extends data_service_1.DyNTS_DataService {
9
9
  usageData = [];
10
10
  simplifiedDailyUsage = [];
11
11
  constructor(set) {
12
- super(new usage_1.DyFM_UsageSession(set?.usageSession), usage_1.DyFM_usageSessionModel_params, set?.issuer);
12
+ super(new usage_1.DyFM_UsageSession(set?.usageSession), usage_1.DyFM_usageSession_dataParams, set?.issuer);
13
13
  this.usageData = set?.usageData ? set?.usageData : [];
14
14
  }
15
15
  getLocationDataFromRequest(req) {
package/build/_modules/usage/usage.data-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.d.ts CHANGED
@@ -215,7 +215,7 @@ export declare class DyNTS_DataService<T extends DyFM_Metadata> {
215
215
  * (when you simultaneously trying to change the same data's
216
216
  * different values from different flows)
217
217
  */
218
- saveData(): Promise<T>;
218
+ saveData(data?: T, dontSetToService?: boolean): Promise<T>;
219
219
  /**
220
220
  * permanently deletes data from database by data._id
221
221
  */
package/build/_services/base/data.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EAAE,qBAAqB,EAErC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,iBAAiB,CAAC,CAAC,SAAS,aAAa;IAEpD,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,CAAC,EAAE,CAAM;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,gBAAgB,CAAuB;IAE/C,UAAU,EAAE,qBAAqB,CAAC;IAElC,mBAAmB,EAAE,MAAM,CAE4B;IACvD,6BAA6B,EAAE,MAAM,CAEkB;;IAGrD;;OAEG;IACH,IAAI,EAAE,CAAC;IACP;;OAEG;IACH,UAAU,EAAE,qBAAqB;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM;IA8BhB;;OAEG;IACG,MAAM,CAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IA0BtD;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAoChE,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAiC3E;;;;OAIG;IACG,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IA+DpF,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAsDhG;;;OAGG;IACG,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAgEhG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IA0BnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IA0BtF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuDG;IACG,UAAU,CACd,GAAG,EAAE;QAAE,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC;IA+ChB;;;;;;;;;;OAUG;IACG,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;IAoH5B;;OAEG;IACG,UAAU,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B5C;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAyEtC;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;OAGG;IACH,0BAA0B,IAAI,eAAe,CAAC,GAAG,CAAC;IAyBlD,OAAO,CAAC,wBAAwB;CAgBjC"}
1
+ {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DyNTS_DataService = void 0;
4
4
  const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
5
5
  const global_service_1 = require("../core/global.service");
6
+ // TODO: 2 type of archiving service system (within list, or separate db elements)
6
7
  /**
7
8
  * Basic Data Service that is connected to the relevant DBServices
8
9
  *
@@ -508,39 +509,48 @@ class DyNTS_DataService {
508
509
  * (when you simultaneously trying to change the same data's
509
510
  * different values from different flows)
510
511
  */
511
- async saveData() {
512
+ async saveData(data, dontSetToService) {
512
513
  try {
513
- if (!this.data) {
514
+ if (!data && this.data) {
515
+ data = this.data;
516
+ }
517
+ if (!data) {
514
518
  throw new fsm_dynamo_1.DyFM_Error({
515
519
  ...this._getDefaultErrorSettings('saveData', new Error(`no data to save! (${this.dataParams.dataName})`)),
516
520
  errorCode: 'NTS-DS0-SD4',
517
521
  });
518
522
  }
519
523
  await this.validateForSave();
520
- if (!this.data._id && (!this.depKey || !this.data[this.depKey])) {
524
+ if (!data._id && (!this.depKey || !data[this.depKey])) {
521
525
  // if ID of dependencyID is not present, data not exists, create new data
522
- this.data = await this.dataDBService.createData(this.data, this.issuer);
523
- return this.data;
526
+ data = await this.dataDBService.createData(data, this.issuer);
527
+ if (!dontSetToService) {
528
+ this.data = data;
529
+ }
530
+ return data;
524
531
  }
525
532
  let dataExists;
526
533
  // check if data already exists with the specific ID
527
- if (this.data._id) {
534
+ if (data._id) {
528
535
  dataExists = await this.getDataById(null, true);
529
536
  if (dataExists) {
530
537
  // if data exists do modify
531
- this.data = await this.dataDBService.modifyData(this.data, this.issuer);
532
- return this.data;
538
+ data = await this.dataDBService.modifyData(data, this.issuer);
539
+ if (!dontSetToService) {
540
+ this.data = data;
541
+ }
542
+ return data;
533
543
  }
534
544
  else {
535
545
  throw new fsm_dynamo_1.DyFM_Error({
536
546
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: provided ID not exists ` +
537
- `(id: ${this.data._id}, ${this.dataParams.dataName})`)),
547
+ `(id: ${data._id}, ${this.dataParams.dataName})`)),
538
548
  errorCode: 'NTS-DS0-SD1',
539
549
  });
540
550
  }
541
551
  }
542
552
  if (this.depKey) {
543
- if (!this.data[this.depKey]) {
553
+ if (!data[this.depKey]) {
544
554
  throw new fsm_dynamo_1.DyFM_Error({
545
555
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: dependency data id missing from data ` +
546
556
  `(key: ${this.depKey}, ${this.dataParams.dataName})`)),
@@ -551,18 +561,21 @@ class DyNTS_DataService {
551
561
  dataExists = await this.getDataByDependencyId(null, true);
552
562
  if (dataExists) {
553
563
  // if data exists do modify
554
- this.data = await this.dataDBService.modifyData(this.data, this.issuer);
555
- return this.data;
564
+ data = await this.dataDBService.modifyData(data, this.issuer);
565
+ if (!dontSetToService) {
566
+ this.data = data;
567
+ }
568
+ return data;
556
569
  }
557
570
  else if (this.depKeyIsRequired) {
558
571
  // if data not exists check that dependency already exists for this
559
572
  const dependencyExists = await this.getDependencyDataDBService()
560
- .getDataById(this.data[this.depKey])
573
+ .getDataById(data[this.depKey])
561
574
  .catch();
562
575
  if (!dependencyExists) {
563
576
  throw new fsm_dynamo_1.DyFM_Error({
564
577
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: dependency data not exists ` +
565
- `(key: ${this.depKey}, id: ${this.data[this.depKey]}, ` +
578
+ `(key: ${this.depKey}, id: ${data[this.depKey]}, ` +
566
579
  `${this.dataParams.dataName})`)),
567
580
  errorCode: 'NTS-DS0-SD3',
568
581
  });
@@ -571,8 +584,11 @@ class DyNTS_DataService {
571
584
  }
572
585
  }
573
586
  // if data not exists create new data
574
- this.data = await this.dataDBService.createData(this.data, this.issuer);
575
- return this.data;
587
+ data = await this.dataDBService.createData(data, this.issuer);
588
+ if (!dontSetToService) {
589
+ this.data = data;
590
+ }
591
+ return data;
576
592
  }
577
593
  catch (error) {
578
594
  if (['NTS-DS0-SD1', 'NTS-DS0-SD2'].includes(error?.errorCode)) {
@@ -591,13 +607,16 @@ class DyNTS_DataService {
591
607
  */
592
608
  async deleteData(id) {
593
609
  try {
594
- if (!id && !this.data._id) {
610
+ if (!id && this.data._id) {
611
+ id = this.data._id;
612
+ }
613
+ if (!id) {
595
614
  throw new fsm_dynamo_1.DyFM_Error({
596
615
  ...this._getDefaultErrorSettings('deleteData', new Error(`deleteData failed, ID is missing! (${this.dataParams.dataName})`)),
597
616
  errorCode: 'NTS-DS0-DD1',
598
617
  });
599
618
  }
600
- await this.dataDBService.deleteDataById(id ?? this.data._id);
619
+ await this.dataDBService.deleteDataById(id);
601
620
  }
602
621
  catch (error) {
603
622
  if (error?.errorCode == 'NTS-DS0-DD1') {
package/build/_services/base/data.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/build/_services/server/app.server.d.ts CHANGED
@@ -57,8 +57,8 @@ import { DyNTS_AppSystemControls } from '../../_models/control-models/app-system
57
57
  * matchStatisticsModelParams,
58
58
  * matchDataModelParams,
59
59
 
60
- * DyFM_usageSessionModel_params,
61
- * DyFM_customDataModel_params,
60
+ * DyFM_usageSession_dataParams,
61
+ * DyFM_customData_dataParams,
62
62
  * ]
63
63
  * });
64
64
  * }
package/build/_services/server/app.server.js CHANGED
@@ -59,8 +59,8 @@ const global_settings_const_1 = require("../../_collections/global-settings.cons
59
59
  * matchStatisticsModelParams,
60
60
  * matchDataModelParams,
61
61
 
62
- * DyFM_usageSessionModel_params,
63
- * DyFM_customDataModel_params,
62
+ * DyFM_usageSession_dataParams,
63
+ * DyFM_customData_dataParams,
64
64
  * ]
65
65
  * });
66
66
  * }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/nts-dynamo",
3
- "version": "01.09.29",
3
+ "version": "01.09.30",
4
4
  "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
5
5
  "scripts": {
6
6
  "prep": "npm i rimraf nodemon -g",
@@ -94,7 +94,7 @@
94
94
  "empty": ""
95
95
  },
96
96
  "peerDependencies": {
97
- "@futdevpro/fsm-dynamo": "~1.9.30",
97
+ "@futdevpro/fsm-dynamo": "~1.9.31",
98
98
 
99
99
  "@types/express": "~4.17.17",
100
100
  "@types/geoip-lite": "~1.4.1",
package/src/_modules/custom-data/custom-data.data-service.ts CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
 
4
4
  import {
5
- DyFM_customDataModel_params, DyFM_CustomData
5
+ DyFM_customData_dataParams, DyFM_CustomData
6
6
  } from '@futdevpro/fsm-dynamo/custom-data';
7
7
  import { DyNTS_DataService } from '../../_services/base/data.service';
8
8
 
@@ -14,7 +14,7 @@ export class DyFM_CustomData_DataService extends DyNTS_DataService<DyFM_CustomDa
14
14
  ) {
15
15
  super(
16
16
  new DyFM_CustomData(customData),
17
- DyFM_customDataModel_params,
17
+ DyFM_customData_dataParams,
18
18
  issuer
19
19
  );
20
20
  }
package/src/_modules/mock/app-extended-server.mock.ts CHANGED
@@ -1,8 +1,8 @@
1
1
 
2
2
 
3
3
  import { DyFM_error_defaults } from '@futdevpro/fsm-dynamo';
4
- import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage';
5
- import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data';
4
+ import { DyFM_usageSession_dataParams } from '@futdevpro/fsm-dynamo/usage';
5
+ import { DyFM_customData_dataParams } from '@futdevpro/fsm-dynamo/custom-data';
6
6
 
7
7
  import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
8
8
  import {
@@ -86,8 +86,8 @@ export class DyNTS_AppExtendedFull_Mock extends DyNTS_AppExtended {
86
86
  dependency_mock_DataParams,
87
87
  dependent_mock_DataParams,
88
88
 
89
- DyFM_usageSessionModel_params,
90
- DyFM_customDataModel_params,
89
+ DyFM_usageSession_dataParams,
90
+ DyFM_customData_dataParams,
91
91
  ],
92
92
  };
93
93
  }
@@ -156,8 +156,8 @@ export class DyNTS_AppWbMock_Mock extends DyNTS_AppExtended {
156
156
  dependency_mock_DataParams,
157
157
  dependent_mock_DataParams,
158
158
 
159
- DyFM_usageSessionModel_params,
160
- DyFM_customDataModel_params,
159
+ DyFM_usageSession_dataParams,
160
+ DyFM_customData_dataParams,
161
161
  ],
162
162
  };
163
163
  }
package/src/_modules/mock/app-server.mock.ts CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
 
3
- import { DyFM_usageSessionModel_params } from '@futdevpro/fsm-dynamo/usage';
4
- import { DyFM_customDataModel_params } from '@futdevpro/fsm-dynamo/custom-data';
3
+ import { DyFM_usageSession_dataParams } from '@futdevpro/fsm-dynamo/usage';
4
+ import { DyFM_customData_dataParams } from '@futdevpro/fsm-dynamo/custom-data';
5
5
 
6
6
  import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
7
7
  import {
@@ -75,8 +75,8 @@ export class DyNTS_AppFull_Mock extends DyNTS_App {
75
75
  dependency_mock_DataParams,
76
76
  dependent_mock_DataParams,
77
77
 
78
- DyFM_usageSessionModel_params,
79
- DyFM_customDataModel_params,
78
+ DyFM_usageSession_dataParams,
79
+ DyFM_customData_dataParams,
80
80
  ],
81
81
  };
82
82
  }
@@ -161,8 +161,8 @@ export class DyNTS_AppTEST_Mock extends DyNTS_App {
161
161
  dependency_mock_DataParams,
162
162
  dependent_mock_DataParams,
163
163
 
164
- DyFM_usageSessionModel_params,
165
- DyFM_customDataModel_params,
164
+ DyFM_usageSession_dataParams,
165
+ DyFM_customData_dataParams,
166
166
  ],
167
167
  };
168
168
  }
package/src/_modules/socket/_services/app-extended.server.ts CHANGED
@@ -59,8 +59,8 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
59
59
  * matchStatisticsModelParams,
60
60
  * matchDataModelParams,
61
61
 
62
- * DyFM_usageSessionModel_params,
63
- * DyFM_customDataModel_params,
62
+ * DyFM_usageSession_dataParams,
63
+ * DyFM_customData_dataParams,
64
64
  * ]
65
65
  * });
66
66
  * }
package/src/_modules/usage/usage.data-service.ts CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  import { Request } from 'express';
3
3
  import { DyFM_Error, DyFM_Time, DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
4
- import { DyFM_UsageSession, DyFM_usageSessionModel_params, DyFM_UsageData,
4
+ import { DyFM_UsageSession, DyFM_usageSession_dataParams, DyFM_UsageData,
5
5
  DyFM_DailyUsageData } from '@futdevpro/fsm-dynamo/usage';
6
6
 
7
7
  import { DyNTS_DataService } from '../../_services/base/data.service';
@@ -20,7 +20,7 @@ export class DyNTS_Usage_DataService extends DyNTS_DataService<DyFM_UsageSession
20
20
  ) {
21
21
  super(
22
22
  new DyFM_UsageSession(set?.usageSession),
23
- DyFM_usageSessionModel_params,
23
+ DyFM_usageSession_dataParams,
24
24
  set?.issuer
25
25
  );
26
26
  this.usageData = set?.usageData ? set?.usageData : [];
package/src/_services/base/data.service.ts CHANGED
@@ -9,6 +9,8 @@ import { DyNTS_DBUpdate } from '../../_models/types/db-update.type';
9
9
  import { DyNTS_DBService } from './db.service';
10
10
  import { DyNTS_GlobalService } from '../core/global.service';
11
11
 
12
+ // TODO: 2 type of archiving service system (within list, or separate db elements)
13
+
12
14
  /**
13
15
  * Basic Data Service that is connected to the relevant DBServices
14
16
  *
@@ -626,9 +628,13 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
626
628
  * (when you simultaneously trying to change the same data's
627
629
  * different values from different flows)
628
630
  */
629
- async saveData(): Promise<T> {
631
+ async saveData(data?: T, dontSetToService?: boolean): Promise<T> {
630
632
  try {
631
- if (!this.data) {
633
+ if (!data && this.data) {
634
+ data = this.data;
635
+ }
636
+
637
+ if (!data) {
632
638
  throw new DyFM_Error({
633
639
  ...this._getDefaultErrorSettings(
634
640
  'saveData',
@@ -641,24 +647,32 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
641
647
 
642
648
  await this.validateForSave();
643
649
 
644
- if (!this.data._id && (!this.depKey || !this.data[this.depKey])) {
650
+ if (!data._id && (!this.depKey || !data[this.depKey])) {
645
651
  // if ID of dependencyID is not present, data not exists, create new data
646
- this.data = await this.dataDBService.createData(this.data, this.issuer);
652
+ data = await this.dataDBService.createData(data, this.issuer);
653
+
654
+ if (!dontSetToService) {
655
+ this.data = data;
656
+ }
647
657
 
648
- return this.data;
658
+ return data;
649
659
  }
650
660
 
651
661
  let dataExists: T;
652
662
 
653
663
  // check if data already exists with the specific ID
654
- if (this.data._id) {
664
+ if (data._id) {
655
665
  dataExists = await this.getDataById(null, true);
656
666
 
657
667
  if (dataExists) {
658
668
  // if data exists do modify
659
- this.data = await this.dataDBService.modifyData(this.data, this.issuer);
669
+ data = await this.dataDBService.modifyData(data, this.issuer);
670
+
671
+ if (!dontSetToService) {
672
+ this.data = data;
673
+ }
660
674
 
661
- return this.data;
675
+ return data;
662
676
 
663
677
  } else {
664
678
  throw new DyFM_Error({
@@ -666,7 +680,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
666
680
  'saveData',
667
681
  new Error(
668
682
  `saveData was unsuccessful: provided ID not exists ` +
669
- `(id: ${this.data._id}, ${this.dataParams.dataName})`
683
+ `(id: ${data._id}, ${this.dataParams.dataName})`
670
684
  )
671
685
  ),
672
686
 
@@ -676,7 +690,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
676
690
  }
677
691
 
678
692
  if (this.depKey) {
679
- if (!this.data[this.depKey]) {
693
+ if (!data[this.depKey]) {
680
694
  throw new DyFM_Error({
681
695
  ...this._getDefaultErrorSettings(
682
696
  'saveData',
@@ -695,14 +709,18 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
695
709
 
696
710
  if (dataExists) {
697
711
  // if data exists do modify
698
- this.data = await this.dataDBService.modifyData(this.data, this.issuer);
712
+ data = await this.dataDBService.modifyData(data, this.issuer);
699
713
 
700
- return this.data;
714
+ if (!dontSetToService) {
715
+ this.data = data;
716
+ }
717
+
718
+ return data;
701
719
 
702
720
  } else if (this.depKeyIsRequired) {
703
721
  // if data not exists check that dependency already exists for this
704
722
  const dependencyExists = await this.getDependencyDataDBService()
705
- .getDataById(this.data[this.depKey])
723
+ .getDataById(data[this.depKey])
706
724
  .catch();
707
725
 
708
726
  if (!dependencyExists) {
@@ -711,7 +729,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
711
729
  'saveData',
712
730
  new Error(
713
731
  `saveData was unsuccessful: dependency data not exists ` +
714
- `(key: ${this.depKey}, id: ${this.data[this.depKey]}, ` +
732
+ `(key: ${this.depKey}, id: ${data[this.depKey]}, ` +
715
733
  `${this.dataParams.dataName})`
716
734
  )
717
735
  ),
@@ -724,9 +742,13 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
724
742
  }
725
743
 
726
744
  // if data not exists create new data
727
- this.data = await this.dataDBService.createData(this.data, this.issuer);
745
+ data = await this.dataDBService.createData(data, this.issuer);
746
+
747
+ if (!dontSetToService) {
748
+ this.data = data;
749
+ }
728
750
 
729
- return this.data;
751
+ return data;
730
752
 
731
753
  } catch (error) {
732
754
  if ([ 'NTS-DS0-SD1', 'NTS-DS0-SD2' ].includes(error?.errorCode)) {
@@ -747,7 +769,11 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
747
769
  */
748
770
  async deleteData(id?: string): Promise<void> {
749
771
  try {
750
- if (!id && !this.data._id) {
772
+ if (!id && this.data._id) {
773
+ id = this.data._id;
774
+ }
775
+
776
+ if (!id) {
751
777
  throw new DyFM_Error({
752
778
  ...this._getDefaultErrorSettings(
753
779
  'deleteData',
@@ -758,7 +784,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
758
784
  });
759
785
  }
760
786
 
761
- await this.dataDBService.deleteDataById(id ?? this.data._id);
787
+ await this.dataDBService.deleteDataById(id);
762
788
  } catch (error) {
763
789
  if (error?.errorCode == 'NTS-DS0-DD1') {
764
790
  throw error;
package/src/_services/server/app.server.ts CHANGED
@@ -83,8 +83,8 @@ import { DyNTS_global_settings } from '../../_collections/global-settings.const'
83
83
  * matchStatisticsModelParams,
84
84
  * matchDataModelParams,
85
85
 
86
- * DyFM_usageSessionModel_params,
87
- * DyFM_customDataModel_params,
86
+ * DyFM_usageSession_dataParams,
87
+ * DyFM_customData_dataParams,
88
88
  * ]
89
89
  * });
90
90
  * }