@futdevpro/nts-dynamo 1.8.5 → 1.9.1

package/src/_modules/usage/usage.data-service.ts

@@ -1,26 +1,26 @@
 
 import { Request } from 'express';
-import { Dynamo_Error, Dynamo_Time, Dynamo_RelativeDate } from '@futdevpro/fsm-dynamo';
-import { Dynamo_UsageSession, Dynamo_usageSessionModel_params, Dynamo_UsageData, 
-  Dynamo_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
+import { DynamoFM_Error, DynamoFM_Time, DynamoFM_RelativeDate } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_UsageSession, DynamoFM_usageSessionModel_params, DynamoFM_UsageData, 
+  DynamoFM_DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoNTS_DataService } from '../../_services/base/data.service';
 import { DynamoNTS_Shared } from '../../_services/shared.static-service';
 
-export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_UsageSession> {
-  usageData: Dynamo_UsageData[] = [];
-  simplifiedDailyUsage: Dynamo_DailyUsageData[] = [];
+export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<DynamoFM_UsageSession> {
+  usageData: DynamoFM_UsageData[] = [];
+  simplifiedDailyUsage: DynamoFM_DailyUsageData[] = [];
 
   constructor(
     set?: {
-      usageSession?: Dynamo_UsageSession,
-      usageData?: Dynamo_UsageData[],
+      usageSession?: DynamoFM_UsageSession,
+      usageData?: DynamoFM_UsageData[],
       issuer?: string,
     }
   ) {
     super(
-      new Dynamo_UsageSession(set?.usageSession),
-      Dynamo_usageSessionModel_params,
+      new DynamoFM_UsageSession(set?.usageSession),
+      DynamoFM_usageSessionModel_params,
       set?.issuer
     );
     this.usageData = set?.usageData ? set?.usageData : [];
@@ -33,7 +33,7 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
 
       /* console.log(`...getLocationDataFromRequest... ip: ${this.data.address}`, this.data.locationData); */
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('getLocationDataFromRequest', error),
         
         errorCode: 'NTS-US0-GLD',
@@ -42,23 +42,23 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
     }
   }
 
-  async getUsage(range: Dynamo_RelativeDate = Dynamo_RelativeDate.lastWeek): Promise<void> {
+  async getUsage(range: DynamoFM_RelativeDate = DynamoFM_RelativeDate.lastWeek): Promise<void> {
     try {
       await this.dataDBService.find({
-        sessionStart: { $gte: Dynamo_Time.getDateByRelativeDate(range) },
-      }).then((res: Dynamo_UsageSession[]): void => {
+        sessionStart: { $gte: DynamoFM_Time.getDateByRelativeDate(range) },
+      }).then((res: DynamoFM_UsageSession[]): void => {
         this.dataList = res;
       });
       this.simplifiedDailyUsage = [];
-      this.dataList.forEach((session: Dynamo_UsageSession): void => {
+      this.dataList.forEach((session: DynamoFM_UsageSession): void => {
         let dateIndex = this.simplifiedDailyUsage.findIndex(
-          (dailyData: Dynamo_DailyUsageData): boolean => dailyData.date === session.date
+          (dailyData: DynamoFM_DailyUsageData): boolean => dailyData.date === session.date
         );
 
         if (-1 < dateIndex) {
           this.simplifiedDailyUsage[dateIndex].visitations.push(session);
         } else {
-          const newUsageSimple = new Dynamo_DailyUsageData({ 
+          const newUsageSimple = new DynamoFM_DailyUsageData({ 
             date: session.date, 
             visitations: [ session ],
           });
@@ -82,18 +82,18 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
       });
 
       this.simplifiedDailyUsage.sort(
-        (a: Dynamo_DailyUsageData, b: Dynamo_DailyUsageData): number => 
+        (a: DynamoFM_DailyUsageData, b: DynamoFM_DailyUsageData): number => 
           +new Date(b.date) - +new Date(a.date)
       );
-      this.simplifiedDailyUsage.forEach((daily: Dynamo_DailyUsageData): void => {
+      this.simplifiedDailyUsage.forEach((daily: DynamoFM_DailyUsageData): void => {
         daily.visitations.sort(
-          (a: Dynamo_UsageSession, b: Dynamo_UsageSession): number => 
+          (a: DynamoFM_UsageSession, b: DynamoFM_UsageSession): number => 
             +a.sessionStart - +b.sessionStart
         );
       });
 
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('getLastWeekUsage', error),
         
         errorCode: 'NTS-US0-GLW',
@@ -108,7 +108,7 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
       this.data.usageData = this.usageData;
       let totalTime = 0;
 
-      this.data.usageData.forEach((data: Dynamo_UsageData): void => {
+      this.data.usageData.forEach((data: DynamoFM_UsageData): void => {
         totalTime += data.timeSpentOnPage;
       });
 
@@ -118,7 +118,7 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
       this.data.totalSessionTime = totalTime;
       await this.saveData();
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('updateUsageData', error),
         
         errorCode: 'NTS-US0-UU0',
@@ -140,12 +140,12 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
         this.getLocationDataFromRequest(req);
       }
       this.data.usageData.sort(
-        (a: Dynamo_UsageData, b: Dynamo_UsageData): number => +a.opened - +b.opened
+        (a: DynamoFM_UsageData, b: DynamoFM_UsageData): number => +a.opened - +b.opened
       );
       this.data.totalSessionTime = newTotalSessionTime;
       await this.saveData();
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this.getDefaultErrorSettings('closeSession', error),
         
         errorCode: 'NTS-US0-CS0',
@@ -157,10 +157,10 @@ export class DynamoNTS_Usage_DataService extends DynamoNTS_DataService<Dynamo_Us
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   private getDefaultErrorSettings(
     fnName: string, 
-    error: Error | Dynamo_Error
-  )/* : Dynamo_ErrorSettings */ {
+    error: Error | DynamoFM_Error
+  )/* : DynamoFM_ErrorSettings */ {
     return {
-      status: (error as Dynamo_Error)?.___status ?? 417,
+      status: (error as DynamoFM_Error)?.___status ?? 417,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
       addECToUserMsg: true,
       userMessage: this.defaultErrorUserMsg,

package/src/_services/base/data.service.ts

@@ -1,7 +1,7 @@
 
 import { 
-  Dynamo_Metadata, Dynamo_DataModel_Params, Dynamo_DataProperty_Params, Dynamo_Error,
-  Dynamo_Log, Dynamo_AnyError, Dynamo_Error_Settings 
+  DynamoFM_Metadata, DynamoFM_DataModel_Params, DynamoFM_DataProperty_Params, DynamoFM_Error,
+  DynamoFM_Log, DynamoFM_AnyError, DynamoFM_Error_Settings 
 } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
 import { DynamoNTS_DBUpdate } from '../../_models/types/db-update.type';
@@ -28,7 +28,7 @@ import { DynamoNTS_GlobalService } from '../core/global.service';
  *   }
  * }
  */
-export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
+export class DynamoNTS_DataService<T extends DynamoFM_Metadata> {
 
   serviceName: string;
 
@@ -43,7 +43,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   depKeyIsRequired?: boolean;
   private depDataDBService: DynamoNTS_DBService<any>;
 
-  dataParams: Dynamo_DataModel_Params;
+  dataParams: DynamoFM_DataModel_Params;
 
   defaultErrorUserMsg: string = 
     `We encountered an unhandled Data Service Error, ` +
@@ -60,7 +60,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     /**
      * DB data prams will be used to connect to usable dbService on GlobalService
      */
-    dataParams: Dynamo_DataModel_Params,
+    dataParams: DynamoFM_DataModel_Params,
     /**
      * Initial set for issuer to be able to follow the issuer's activity
      */
@@ -74,7 +74,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       this.lookForDependencyDataSettings();
       this.issuer = issuer;
     } catch (error) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `\nDynamoNTS_DataService ERROR: ` +
         `\nThe dataService construction failed for ` +
         `${dataParams?.dataName}. ${this.serviceName} (${this.constructor.name})` +
@@ -92,7 +92,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.getAll().catch((error): T[] => {
         if (error?.errorCode === 'NTS-DBS-GA1') {
-          Dynamo_Log.warn(`getAll ${this.dataParams.dataName} didn't found any.`);
+          DynamoFM_Log.warn(`getAll ${this.dataParams.dataName} didn't found any.`);
 
           return [];
         } else {
@@ -106,7 +106,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       return dataListExists;
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings('getAll', error),
 
         errorCode: 'NTS-DS0-GA0',
@@ -133,7 +133,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async getDataById(id?: string, dontSetToService?: boolean): Promise<T> {
     try {
       if (!id && !this.data._id) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'getDataById', 
             new Error(
@@ -158,7 +158,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if (error?.errorCode == 'NTS-DS0-GI1') {
         throw error;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataById', error),
           errorCode: 'NTS-DS0-GI0',
         });
@@ -169,7 +169,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async getDataByIds(ids: string[], dontSetToService?: boolean): Promise<T[]> {
     try {
       if (!ids) {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings(
             'getDataByIds',
             new Error(`getDataByIds failed, ids is missing! (${this.dataParams.dataName})`)
@@ -191,7 +191,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       return datas;
     } catch (error) {
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings('getDataByIds', error),
 
         errorCode: 'NTS-DS0-GIS0',
@@ -207,7 +207,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async getDataByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T> {
     try {
       if (!this.depKey) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'getDataByDependencyId',
             new Error(
@@ -221,7 +221,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       }
 
       if (!dependencyId && !this.data[this.depKey]) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'getDataByDependencyId',
             new Error(
@@ -238,7 +238,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         dependencyId ?? this.data[this.depKey]
       ).catch((error): null => {
         if (error?.errorCode === 'NTS-DBS-GD2') {
-          Dynamo_Log.warn(
+          DynamoFM_Log.warn(
             `getDataByDependencyId failed; ${this.dataParams.dataName} ` +
             `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`
           );
@@ -258,7 +258,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if ([ 'NTS-DS0-GD1', 'NTS-DS0-GD2' ].includes(error?.errorCode)) {
         throw error;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataByDependencyId', error),
           
           errorCode: 'NTS-DS0-GD0',
@@ -270,7 +270,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async getDatasByDependencyIds(dependencyIds: string[], dontSetToService?: boolean): Promise<T[]> {
     try {
       if (!this.depKey) {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings(
             'getDatasByDependencyIds',
             new Error(
@@ -284,7 +284,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       }
 
       if (!dependencyIds) {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings(
             'getDatasByDependencyIds',
             new Error(
@@ -312,7 +312,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if ([ 'NTS-DS0-GDS1', 'NTS-DS0-GDS2' ].includes(error?.errorCode)) {
         throw error;
       } else {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings('getDatasByDependencyIds', error),
 
           errorCode: 'NTS-DS0-GDS0',
@@ -328,7 +328,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async getDataListByDependencyId(dependencyId?: string, dontSetToService?: boolean): Promise<T[]> {
     try {
       if (!this.depKey) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'getDataListByDependencyId',
             new Error(
@@ -342,7 +342,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       }
 
       if (!dependencyId && !this.data[this.depKey]) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'getDataListByDependencyId',
             new Error(
@@ -359,7 +359,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         dependencyId ?? this.data[this.depKey]
       ).catch((error): T[] => {
         if (error?.errorCode === 'NTS-DBS-GLD2') {
-          Dynamo_Log.warn(
+          DynamoFM_Log.warn(
             `getDataListByDependencyId ${this.dataParams.dataName} ` +
             `(${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`
           );
@@ -379,7 +379,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if (['NTS-DS0-GLD1', 'NTS-DS0-GLD2'].includes(error?.errorCode)) {
         throw error;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
           
           errorCode: 'NTS-DS0-GLD0',
@@ -423,7 +423,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataExists: T = await this.dataDBService.findOne(filterBy).catch((error): null => {
         if (error?.errorCode === 'NTS-DBS-FO1') {
-          Dynamo_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
+          DynamoFM_Log.warn(`findData ${this.dataParams.dataName} didn't found any.`);
 
           return null;
         } else {
@@ -437,7 +437,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       return dataExists;
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings('findData', error),
         
         errorCode: 'NTS-DS0-FD0',
@@ -479,7 +479,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.find(filterBy).catch((error): T[] => {
         if (error?.errorCode === 'NTS-DBS-F1') {
-          Dynamo_Log.warn(`findDatas ${this.dataParams.dataName} didn't found any.`);
+          DynamoFM_Log.warn(`findDatas ${this.dataParams.dataName} didn't found any.`);
 
           return [];
         } else {
@@ -493,7 +493,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       return dataListExists;
     } catch (error) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings('findDatas', error),
         
         errorCode: 'NTS-DS0-FDS0',
@@ -579,7 +579,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         );
 
       } else {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings(
             'updateData',
             new Error(
@@ -597,7 +597,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         throw error;
 
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('updateData', error),
           
           errorCode: 'NTS-DS0-UD0',
@@ -620,7 +620,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async saveData(): Promise<T> {
     try {
       if (!this.data) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'saveData', 
             new Error(`no data to save! (${this.dataParams.dataName})`)
@@ -650,7 +650,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           return this.data;
 
         } else {
-          throw new Dynamo_Error({ 
+          throw new DynamoFM_Error({ 
             ...this._getDefaultErrorSettings(
               'saveData',
               new Error(
@@ -666,7 +666,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       if (this.depKey) {
         if (!this.data[this.depKey]) {
-          throw new Dynamo_Error({ 
+          throw new DynamoFM_Error({ 
             ...this._getDefaultErrorSettings(
               'saveData',
               new Error(
@@ -695,7 +695,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
               .catch();
 
             if (!dependencyExists) {
-              throw new Dynamo_Error({ 
+              throw new DynamoFM_Error({ 
                 ...this._getDefaultErrorSettings(
                   'saveData',
                   new Error(
@@ -722,7 +722,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         throw error;
 
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('saveData', error),
           
           errorCode: 'NTS-DS0-SD0',
@@ -737,7 +737,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   async deleteData(): Promise<void> {
     try {
       if (!this.data._id) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'deleteData',
             new Error(`deleteData failed, ID is missing! (${this.dataParams.dataName})`)
@@ -752,7 +752,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if (error?.errorCode == 'NTS-DS0-DD1') {
         throw error;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('deleteData', error),
           
           errorCode: 'NTS-DS0-DD0',
@@ -780,7 +780,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
             )
           )
         ) {
-          throw new Dynamo_Error({ 
+          throw new DynamoFM_Error({ 
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
@@ -799,7 +799,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
         if (this.dataParams.properties[i].type === 'Date' && 
           !(new Date(this.data[this.dataParams.properties[i].key]) instanceof Date)
         ) {
-          throw new Dynamo_Error({
+          throw new DynamoFM_Error({
             ...this._getDefaultErrorSettings(
               'validateForSave',
               new Error(
@@ -827,7 +827,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if (['NTS-DS0-VD1', 'NTS-DS0-VD2'].includes(error?.errorCode)) {
         throw error;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('validateForSave', error),
 
           status: 422, 
@@ -841,8 +841,8 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * setting up dependency dataHook by DynamoBEDataModelParams
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: Dynamo_DataProperty_Params = this.dataParams.properties.find(
-      (modelParams: Dynamo_DataProperty_Params): boolean => modelParams.isDependencyHook
+    const dependencyParam: DynamoFM_DataProperty_Params = this.dataParams.properties.find(
+      (modelParams: DynamoFM_DataProperty_Params): boolean => modelParams.isDependencyHook
     );
 
     if (dependencyParam) {
@@ -868,7 +868,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    */
   getDependencyDataDBService(): DynamoNTS_DBService<any> {
     if (!this.depDBServiceKey) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDependencyDataDBService',
           new Error(
@@ -891,14 +891,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     }
   }
   
-  private _getDefaultErrorSettings(fnName: string, error: Dynamo_AnyError): Dynamo_Error_Settings {
+  private _getDefaultErrorSettings(fnName: string, error: DynamoFM_AnyError): DynamoFM_Error_Settings {
     return {
-      status: (error as Dynamo_Error)?.___status ?? 500,
+      status: (error as DynamoFM_Error)?.___status ?? 500,
       message: 
         (error as Error)?.message ?? 
         `${fnName} was UNSUCCESFUL (NTS; ${this.dataParams.dataName})`,
-      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
-      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as DynamoFM_Error)?.__userMessage,
+      userMessage: (error as DynamoFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuer: this.issuer,
       issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_DataService)`,
       error: error,