@futdevpro/nts-dynamo 1.6.58 → 1.6.71

package/lib/_modules/test/test.controller.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestController = void 0;
-const tslib_1 = require("tslib");
 const test_module_1 = require("@futdevpro/fsm-dynamo/test-module");
 const http_call_type_enum_1 = require("../../_enums/http/http-call-type.enum");
 const controller_service_1 = require("../../_services/route/controller.service");
@@ -19,13 +18,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
                 endpoint: test_module_1.testModuleSettings.endPoints.testGet,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             url: req.url,
                             result: 'test-get call was successful!',
                             request: req.body
                         });
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -33,13 +32,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.post,
                 endpoint: test_module_1.testModuleSettings.endPoints.testPost,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             url: req.url,
                             result: 'test-post call was successful!',
                             request: req.body
                         });
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -47,13 +46,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.put,
                 endpoint: test_module_1.testModuleSettings.endPoints.testPut,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             url: req.url,
                             result: 'test-put call was successful!',
                             request: req.body
                         });
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -61,13 +60,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.patch,
                 endpoint: test_module_1.testModuleSettings.endPoints.testPatch,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             url: req.url,
                             result: 'test-patch call was successful!',
                             request: req.body
                         });
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -75,13 +74,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.delete,
                 endpoint: test_module_1.testModuleSettings.endPoints.testDelete,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             url: req.url,
                             result: 'test-delete call was successful!',
                             request: req.body
                         });
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -89,13 +88,13 @@ class TestController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
                 endpoint: test_module_1.testModuleSettings.endPoints.getServerStatus,
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         res.send({
                             status: 'ready',
                             version: global_service_1.DynamoNTS_GlobalService.params.version,
                             upTime: global_service_1.DynamoNTS_GlobalService.upTime,
                         });
-                    })
+                    }
                 ]
             }),
         ];

package/lib/_modules/test/test.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../../src/_modules/test/test.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../../src/_modules/test/test.controller.ts"],"names":[],"mappings":"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"}

package/lib/_modules/usage/usage.controller.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsageController = void 0;
-const tslib_1 = require("tslib");
 const usage_module_1 = require("@futdevpro/fsm-dynamo/usage-module");
 const http_call_type_enum_1 = require("../../_enums/http/http-call-type.enum");
 const controller_service_1 = require("../../_services/route/controller.service");
@@ -12,6 +11,8 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
     static getInstance() {
         return UsageController.getSingletonInstance();
     }
+    // SERVICES
+    authService;
     setupEndpoints() {
         this.authService = global_service_1.DynamoNTS_GlobalService.getAuthService();
         this.endpoints = [
@@ -20,7 +21,7 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
                 type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
                 endpoint: usage_module_1.usageModuleSettings.endPoints.newSession,
                 tasks: [
-                    (req, res, issuer) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res, issuer) => {
                         const authService = global_service_1.DynamoNTS_GlobalService.getAuthService();
                         const username = authService.getUsernameFromRequest(req);
                         const usageService = new usage_data_service_1.UsageService({
@@ -30,10 +31,10 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
                             }),
                             issuer
                         });
-                        yield usageService.getLocationDataFromRequest(req);
-                        yield usageService.saveData();
+                        await usageService.getLocationDataFromRequest(req);
+                        await usageService.saveData();
                         res.send(usageService.data);
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -42,15 +43,15 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
                 endpoint: usage_module_1.usageModuleSettings.endPoints.updateUsage,
                 logRequestsContent: false,
                 tasks: [
-                    (req, res, issuer) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res, issuer) => {
                         const usageService = new usage_data_service_1.UsageService({
                             usageSession: { _id: req.params.sessionId },
                             usageData: req.body,
                             issuer
                         });
-                        yield usageService.updateUsageData(req);
+                        await usageService.updateUsageData(req);
                         res.send(usageService.data);
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -59,14 +60,14 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
                 endpoint: usage_module_1.usageModuleSettings.endPoints.closeSession,
                 preProcessess: [this.authService.authTokenPermAccUsageData],
                 tasks: [
-                    (req, res, issuer) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res, issuer) => {
                         const usageService = new usage_data_service_1.UsageService({
                             usageSession: { _id: req.params.sessionId },
                             issuer
                         });
-                        yield usageService.closeSession(req);
+                        await usageService.closeSession(req);
                         res.send(usageService.data);
-                    })
+                    }
                 ]
             }),
             new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
@@ -75,11 +76,11 @@ class UsageController extends controller_service_1.DynamoNTS_Controller {
                 endpoint: usage_module_1.usageModuleSettings.endPoints.getAllUsageData,
                 preProcessess: [this.authService.authTokenPermAccUsageData],
                 tasks: [
-                    (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    async (req, res) => {
                         const usageService = new usage_data_service_1.UsageService();
-                        yield usageService.getLastWeekUsage();
+                        await usageService.getLastWeekUsage();
                         res.send(usageService.simplifiedDailyUsage);
-                    })
+                    }
                 ]
             }),
         ];

package/lib/_modules/usage/usage.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}

package/lib/_modules/usage/usage.data-service.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsageService = void 0;
-const tslib_1 = require("tslib");
 const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
 const usage_module_1 = require("@futdevpro/fsm-dynamo/usage-module");
 const data_service_1 = require("../../_services/base/data.service");
 const shared_static_service_1 = require("../../_services/shared.static-service");
 class UsageService extends data_service_1.DynamoNTS_DataService {
+    usageData = [];
+    simplifiedDailyUsage = [];
     constructor(set) {
-        super(new usage_module_1.Dynamo_UsageSession(set === null || set === void 0 ? void 0 : set.usageSession), usage_module_1.usageSessionModelParams, set === null || set === void 0 ? void 0 : set.issuer);
-        this.usageData = [];
-        this.simplifiedDailyUsage = [];
-        this.usageData = (set === null || set === void 0 ? void 0 : set.usageData) ? set === null || set === void 0 ? void 0 : set.usageData : [];
+        super(new usage_module_1.Dynamo_UsageSession(set?.usageSession), usage_module_1.usageSessionModelParams, set?.issuer);
+        this.usageData = set?.usageData ? set?.usageData : [];
     }
     getLocationDataFromRequest(req) {
         try {
@@ -29,104 +28,97 @@ class UsageService extends data_service_1.DynamoNTS_DataService {
             });
         }
     }
-    getLastWeekUsage() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.dataDBService.find({
-                    sessionStart: { $gte: fsm_dynamo_1.Dynamo_Time.oneWeekAgo() }
-                }).then((res) => {
-                    this.dataList = res;
-                });
-                this.simplifiedDailyUsage = [];
-                this.dataList.forEach((session) => {
-                    var _a;
-                    let dateIndex = this.simplifiedDailyUsage.findIndex((dailyData) => dailyData.date === session.date);
-                    if (-1 < dateIndex) {
-                        this.simplifiedDailyUsage[dateIndex].visitations.push(session);
+    async getLastWeekUsage() {
+        try {
+            await this.dataDBService.find({
+                sessionStart: { $gte: fsm_dynamo_1.Dynamo_Time.oneWeekAgo() }
+            }).then((res) => {
+                this.dataList = res;
+            });
+            this.simplifiedDailyUsage = [];
+            this.dataList.forEach((session) => {
+                let dateIndex = this.simplifiedDailyUsage.findIndex((dailyData) => dailyData.date === session.date);
+                if (-1 < dateIndex) {
+                    this.simplifiedDailyUsage[dateIndex].visitations.push(session);
+                }
+                else {
+                    const newUsageSimple = new usage_module_1.Dynamo_DailyUsageData({ date: session.date, visitations: [session] });
+                    this.simplifiedDailyUsage.push(newUsageSimple);
+                    dateIndex = this.simplifiedDailyUsage.length - 1;
+                }
+                if (session?.locationData?.country) {
+                    if (session.locationData.country === 'HU') {
+                        this.simplifiedDailyUsage[dateIndex].visitorsHun++;
                     }
                     else {
-                        const newUsageSimple = new usage_module_1.Dynamo_DailyUsageData({ date: session.date, visitations: [session] });
-                        this.simplifiedDailyUsage.push(newUsageSimple);
-                        dateIndex = this.simplifiedDailyUsage.length - 1;
-                    }
-                    if ((_a = session === null || session === void 0 ? void 0 : session.locationData) === null || _a === void 0 ? void 0 : _a.country) {
-                        if (session.locationData.country === 'HU') {
-                            this.simplifiedDailyUsage[dateIndex].visitorsHun++;
-                        }
-                        else {
-                            this.simplifiedDailyUsage[dateIndex].visitorsElse++;
-                        }
+                        this.simplifiedDailyUsage[dateIndex].visitorsElse++;
                     }
-                    this.simplifiedDailyUsage[dateIndex].totalVisitTime += session.totalSessionTime;
-                    this.simplifiedDailyUsage[dateIndex].averageVisitTime = Math.round((this.simplifiedDailyUsage[dateIndex].totalVisitTime /
-                        this.simplifiedDailyUsage[dateIndex].visitations.length) * 100) / 100;
-                });
-                this.simplifiedDailyUsage.sort((a, b) => +new Date(b.date) - +new Date(a.date));
-                this.simplifiedDailyUsage.forEach((daily) => {
-                    daily.visitations.sort((a, b) => +a.sessionStart - +b.sessionStart);
-                });
-            }
-            catch (error) {
-                throw new fsm_dynamo_1.Dynamo_Error({
-                    status: 417,
-                    errorCode: 'NTS-US0-GLW',
-                    message: 'getDailyUsage was unsuccessful',
-                    userMessage: `We've failed to collect last week's usage data.`,
-                    error
-                });
-            }
-        });
-    }
-    updateUsageData(req) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.getDataById();
-                this.data.usageData = this.usageData;
-                let totalTime = 0;
-                this.data.usageData.forEach((data) => {
-                    totalTime += data.timeSpentOnPage;
-                });
-                if (!this.data.locationData) {
-                    this.getLocationDataFromRequest(req);
                 }
-                this.data.totalSessionTime = totalTime;
-                yield this.saveData();
-            }
-            catch (error) {
-                throw new fsm_dynamo_1.Dynamo_Error({
-                    status: 417,
-                    errorCode: 'NTS-US0-UU0',
-                    message: 'updateSessionData was unsuccessful',
-                    userMessage: `The attempt to update Usage Data was unsuccessful.`,
-                    error
-                });
-            }
-        });
+                this.simplifiedDailyUsage[dateIndex].totalVisitTime += session.totalSessionTime;
+                this.simplifiedDailyUsage[dateIndex].averageVisitTime = Math.round((this.simplifiedDailyUsage[dateIndex].totalVisitTime /
+                    this.simplifiedDailyUsage[dateIndex].visitations.length) * 100) / 100;
+            });
+            this.simplifiedDailyUsage.sort((a, b) => +new Date(b.date) - +new Date(a.date));
+            this.simplifiedDailyUsage.forEach((daily) => {
+                daily.visitations.sort((a, b) => +a.sessionStart - +b.sessionStart);
+            });
+        }
+        catch (error) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                status: 417,
+                errorCode: 'NTS-US0-GLW',
+                message: 'getDailyUsage was unsuccessful',
+                userMessage: `We've failed to collect last week's usage data.`,
+                error
+            });
+        }
     }
-    closeSession(req) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.getDataById();
-                this.data.sessionEnd = new Date();
-                const newTotalSessionTime = +this.data.sessionEnd - +this.data.sessionStart;
-                this.data.usageData[this.data.usageData.length - 1].timeSpentOnPage = newTotalSessionTime - this.data.totalSessionTime;
-                if (!this.data.locationData) {
-                    this.getLocationDataFromRequest(req);
-                }
-                this.data.usageData.sort((a, b) => +a.opened - +b.opened);
-                this.data.totalSessionTime = newTotalSessionTime;
-                yield this.saveData();
+    async updateUsageData(req) {
+        try {
+            await this.getDataById();
+            this.data.usageData = this.usageData;
+            let totalTime = 0;
+            this.data.usageData.forEach((data) => {
+                totalTime += data.timeSpentOnPage;
+            });
+            if (!this.data.locationData) {
+                this.getLocationDataFromRequest(req);
             }
-            catch (error) {
-                throw new fsm_dynamo_1.Dynamo_Error({
-                    status: 417,
-                    errorCode: 'NTS-US0-CS0',
-                    message: 'closeSession was unsuccessful',
-                    userMessage: `The attempt to close Usage Session was unsuccessful.`,
-                    error
-                });
+            this.data.totalSessionTime = totalTime;
+            await this.saveData();
+        }
+        catch (error) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                status: 417,
+                errorCode: 'NTS-US0-UU0',
+                message: 'updateSessionData was unsuccessful',
+                userMessage: `The attempt to update Usage Data was unsuccessful.`,
+                error
+            });
+        }
+    }
+    async closeSession(req) {
+        try {
+            await this.getDataById();
+            this.data.sessionEnd = new Date();
+            const newTotalSessionTime = +this.data.sessionEnd - +this.data.sessionStart;
+            this.data.usageData[this.data.usageData.length - 1].timeSpentOnPage = newTotalSessionTime - this.data.totalSessionTime;
+            if (!this.data.locationData) {
+                this.getLocationDataFromRequest(req);
             }
-        });
+            this.data.usageData.sort((a, b) => +a.opened - +b.opened);
+            this.data.totalSessionTime = newTotalSessionTime;
+            await this.saveData();
+        }
+        catch (error) {
+            throw new fsm_dynamo_1.Dynamo_Error({
+                status: 417,
+                errorCode: 'NTS-US0-CS0',
+                message: 'closeSession was unsuccessful',
+                userMessage: `The attempt to close Usage Session was unsuccessful.`,
+                error
+            });
+        }
     }
 }
 exports.UsageService = UsageService;

package/lib/_modules/usage/usage.data-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usage.data-service.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.data-service.ts"],"names":[],"mappings":"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"}

package/lib/_services/base/data.service.d.ts

@@ -68,12 +68,14 @@ export declare class DynamoNTS_DataService<T extends Dynamo_Metadata> {
      * @return {T} data: T
      */
     getDataById(id?: string, dontSetToService?: boolean): Promise<T>;
+    getDataByIds(ids: string[], dontSetToService?: boolean): Promise<T[]>;
     /**
      * returns data from database by dependencyId to the service
      * (using id from service.data, if not provided)
      * @param dependencyId
      */
     getDataByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T>;
+    getDatasByDependencyIds(dependencyIds: string[], dontSetToService?: boolean): Promise<T[]>;
     /**
      * returns dataList from database by dependencyId to the service
      * @param dependencyId

package/lib/_services/base/data.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAuD,MAAM,uBAAuB,CAAC;AAChI,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,eAAe;IAE1D,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACtC,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,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,UAAU,EAAE,iBAAiB,CAAC;IAE9B,mBAAmB,EAAE,MAAM,CAE4B;IACvD,6BAA6B,EAAE,MAAM,CAEkB;;IAGrD;;OAEG;IACH,IAAI,EAAE,CAAC;IACP;;OAEG;IACH,UAAU,EAAE,iBAAiB;IAC7B;;OAEG;IACH,MAAM,EAAE,MAAM;IAchB;;OAEG;IACG,MAAM,CAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAwBtD;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAgCtE;;;;OAIG;IACG,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAkD1F;;;OAGG;IACG,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAkDhG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAwBvF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACG,SAAS,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAwB1F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuDG;IACG,UAAU,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCzG;;;;;;;;;;OAUG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyF/B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BjC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAgEtC;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAerC;;;OAGG;IACH,0BAA0B,IAAI,mBAAmB,CAAC,GAAG,CAAC;IAqBtD,OAAO,CAAC,wBAAwB;CAWjC"}
+{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}