@futdevpro/nts-dynamo 1.7.28 → 1.9.1

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

@@ -3,8 +3,8 @@ import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, 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';
@@ -12,7 +12,7 @@ import { DynamoNTS_DBUpdate } from '../../_models/types/db-update.type';
 /**
  * DB Service for MongoDB
  */
-export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
+export class DynamoNTS_DBService<T extends DynamoFM_Metadata> {
 
   serviceName: string;
 
@@ -26,12 +26,12 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   /**
    * @param dataName name the model
-   * @param typeSample sample data for scheme creation (dont include Dynamo_Metadata!)
+   * @param typeSample sample data for scheme creation (dont include DynamoFM_Metadata!)
    * @param schemaSettings additional settings for specific parameters as unique, required, minlength or maxlength
    * schemaSettings also MUST contain specific types that differs from the listed above (Array, Date)
    */
   constructor(
-    public dataParams: Dynamo_DataParams
+    public dataParams: DynamoFM_DataModel_Params
   ){
     try {
       this.serviceName = this.constructor?.name;
@@ -48,10 +48,10 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
       this.lookForDependencyDataSettings();
     } catch (error) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `\nDynamoNTS_DBService ERROR, ` +
-        `The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}`, 
-        error,
+        `The dbService construction failed for ${dataParams.dataName}. ${this.serviceName}` +
+        `\nERROR: `, error,
         new Error()
       );
     }
@@ -74,7 +74,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         return res?.toObject() as T;
         
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'createData', 
             new Error(
@@ -94,7 +94,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         throw error;
 
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('createData', error, issuer),
 
           status: 422, 
@@ -129,7 +129,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       /* if (res) {
         //return res?.toObject() as T;
       } else {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'modifyData', 
             new Error(`modifyData failed, modify ${this.dataParams.dbName} result not found! (NTS DB)`),
@@ -143,7 +143,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         });
       } */
     }).catch((error): void => {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings('modifyData', error, issuer),
 
         errorCode: 'NTS-DBS-FU0',
@@ -165,7 +165,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async getDataById(id: string): Promise<T> {
     if (!id) { 
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings('getDataById', new Error(`No ID provided! (NTS DB)`)),
 
         errorCode: 'NTS-DBS-GI1',
@@ -177,7 +177,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .findById(id)
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataById', error),
 
           errorCode: 'NTS-DBS-GI0',
@@ -200,7 +200,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async getDataByDependencyId(dependencyId: string): Promise<T> {
     if (!this.depDataName) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDataByDependencyId', 
           new Error(
@@ -218,7 +218,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .findOne({ [this.depDataName]: dependencyId })
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataByDependencyId', error),
 
           errorCode: 'NTS-DBS-GD1',
@@ -242,17 +242,20 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async getDataListByDependencyId(dependencyId: string): Promise<T[]> {
     if (!this.depDataName) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDataListByDependencyId',
           new Error(
-            `dependencyDataIdKey not setted up for this db-service (${this.dataParams.dbName}) ` +
+            `isDependencyHook not setted up for this dataModel (${this.dataParams.dbName}) ` +
             `(NTS DB)`
           )
         ),
 
         status: 501, 
         errorCode: 'NTS-DBS-GLD0',
+        additionalContent: {
+          dataModel: this.dataModel,
+        },
       });
     }
 
@@ -260,7 +263,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find({ [this.depDataName]: dependencyId })
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
           
           errorCode: 'NTS-DBS-GLD1',
@@ -279,7 +282,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   async getDatasByDependencyIds(dependencyIds: string[]): Promise<T[]> {
     if (!this.depDataName) {
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           'getDatasByDependencyIds',
           new Error(
@@ -297,7 +300,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find({ [this.depDataName]: { $in: dependencyIds }})
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings('getDatasByDependencyIds', error),
 
           errorCode: 'NTS-DBS-GLDS1',
@@ -322,7 +325,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async getDataListByDependencyIds(ids: string[]): Promise<T[]> {
     if (!this.depDataName) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDataListByDependencyIds',
           new Error(
@@ -340,7 +343,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find({ [this.depDataName]: { $in: ids } })
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getDataListByDependencyIds', error),
           
           errorCode: 'NTS-DBS-GLDS1',
@@ -368,7 +371,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find({})
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('getAll', error),
           
           errorCode: 'NTS-DBS-GA0',
@@ -391,7 +394,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     await this.dataModel
       .findByIdAndDelete(id)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('deleteDataById', error),
           
           errorCode: 'NTS-DBS-DD0',
@@ -407,7 +410,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    */
   async deleteDataByDependencyId(dependencyId: string): Promise<void> {
     if (!this.depDataName) {
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_Error({ 
         ...this._getDefaultErrorSettings(
           'deleteDataByDependencyId',
           new Error(
@@ -424,7 +427,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     await this.dataModel
       .deleteMany({ [this.depDataName]: dependencyId })
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('deleteDataByDependencyId', error),
 
           errorCode: 'NTS-DBS-DDD1',
@@ -451,7 +454,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
     if (0 < narrowByDependencyIds.length) {
       if (!this.depDataName) {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings(
             'searchData',
             new Error(
@@ -468,7 +471,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       filter[this.depDataName] = { $in: narrowByDependencyIds };      
     }
 
-    await this.dataParams.modelParams.forEach((modelParam: Dynamo_DataPropertyParams): void => {
+    await this.dataParams.properties.forEach((modelParam: DynamoFM_DataProperty_Params): void => {
       if (
         (filterBy[modelParam.key] !== null && filterBy[modelParam.key] !== undefined) || 
         filterBy[modelParam.key + 'Range']
@@ -522,7 +525,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find(filter)
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('searchData', error),
           
           errorCode: 'NTS-DBS-SD1',
@@ -574,7 +577,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .findOne(filterBy)
       .then((res): T => res as T ?? null)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('findOne', error),
 
           errorCode: 'NTS-DBS-FO0',
@@ -620,7 +623,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .find(filterBy)
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('find', error),
           
           errorCode: 'NTS-DBS-F0',
@@ -682,7 +685,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .limit(pageSize)
       .then((res): T => res ?? [])
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('findWithPaging', error),
           
           errorCode: 'NTS-DBS-WP0',
@@ -715,7 +718,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
       .findByIdAndUpdate(id, update)
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('findByIdAndUpdate', error, issuer),
           
           errorCode: 'NTS-DBS-FIU0',
@@ -793,7 +796,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     await this.dataModel
       .updateOne(filterBy, update)
       .catch((error): void => {
-        throw new Dynamo_Error({
+        throw new DynamoFM_Error({
           ...this._getDefaultErrorSettings('updateOne', error, issuer),
           
           errorCode: 'NTS-DBS-UO0',
@@ -866,7 +869,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     await this.dataModel
       .updateMany(filterBy, update)
       .catch((error): void => {
-        throw new Dynamo_Error({ 
+        throw new DynamoFM_Error({ 
           ...this._getDefaultErrorSettings('updateMany', error, issuer),
           
           errorCode: 'NTS-DBS-UM0',
@@ -890,7 +893,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         data = JSON.parse(JSON.stringify(data));
 
         if (typeof data._id !== 'string' || typeof data._id === 'object') {
-          Dynamo_Log.error(
+          DynamoFM_Log.error(
             `data._id stringifying failed! Please notfiy the DynamoNTS developers! ` +
             `(${fnName})`, 
             new Error()
@@ -904,14 +907,14 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
 
   private _getDefaultErrorSettings(
     fnName: string, 
-    error: Dynamo_AnyError, 
+    error: DynamoFM_AnyError, 
     issuer?: string
-  ): Dynamo_Error_Settings {
+  ): 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-DB)`,
-      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: issuer,
       issuerService: this.serviceName,
       error: error,
@@ -928,7 +931,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
   private getSchema(): mongoose.Schema {
     let schema: any = this.buildMongooseSchemaByModelParams();
 
-    schema = this.addDynamo_MetadataToSchema(schema);
+    schema = this.addDynamoFM_MetadataToSchema(schema);
 
     // tslint:disable-next-line: no-string-literal
     if (schema['_id']) {
@@ -944,14 +947,14 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * @param params DynamoBEDataPropertyParams
    * @returns mongoose schema object
    */
-  private buildMongooseSchemaByModelParams(params?: Dynamo_DataPropertyParams[]): any {
+  private buildMongooseSchemaByModelParams(params?: DynamoFM_DataProperty_Params[]): any {
     const schemaSettingsObj = {};
 
     if (!params) {
-      params = this.dataParams.modelParams;
+      params = this.dataParams.properties;
     }
 
-    params.forEach((property: Dynamo_DataPropertyParams): void => {
+    params.forEach((property: DynamoFM_DataProperty_Params): void => {
       const beType = this.getBEType(property.type);
 
       if (
@@ -960,7 +963,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         property?.subObjectParams?.length == 0
       ) {
         schemaSettingsObj[property.key] = {
-          type: beType
+          type: beType,
         };
 
         if (property.index) {
@@ -1028,7 +1031,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * @param schema schema to update
    * @returns updated schema
    */
-  private addDynamo_MetadataToSchema(schema: any): any {
+  private addDynamoFM_MetadataToSchema(schema: any): any {
     schema.__created = { type: Date };
     schema.__createdBy = { type: String };
     schema.__lastModified = { type: Date };
@@ -1041,8 +1044,8 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
    * sets depDataKey
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: Dynamo_DataPropertyParams = this.dataParams.modelParams.find(
-      (modelParams: Dynamo_DataPropertyParams): boolean => modelParams.isDependencyHook
+    const dependencyParam: DynamoFM_DataProperty_Params = this.dataParams.properties.find(
+      (modelParams: DynamoFM_DataProperty_Params): boolean => modelParams.isDependencyHook
     );
     
     if (dependencyParam) {

package/src/_services/core/api.service.ts

@@ -1,17 +1,17 @@
 
 import * as Axios from 'axios';
 import { 
-  Dynamo_AnyError, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log 
+  DynamoFM_AnyError, DynamoFM_Error, DynamoFM_Error_Settings, DynamoFM_Log 
 } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
 import {
-  DynamoNTS_ApiCallParams
+  DynamoNTS_ApiCall_Params
 } from '../../_models/control-models/api-call-params.control-model';
-import { dynamoNTS_globalSettings } from '../../_constants';
+import { DynamoNTS_globalSettings } from '../../_constants';
 
-export interface DynamoNTS_ApiCallInputParams<T_Body = any> {
+export interface DynamoNTS_ApiCallInput_Params<T_Body = any> {
   pathParams?: {
     /**
      * path params setted in endpoint
@@ -47,11 +47,11 @@ export class DynamoNTS_ApiService {
      * you must setup the basic api call params with this.
      * follow the instructions in the constructor: new DynamoNTS_ApiCallParams({ ... })
      */
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     /**
      * you can pass data and other inputs in this section
      */
-    inputParams?: DynamoNTS_ApiCallInputParams<T_Body>
+    inputParams?: DynamoNTS_ApiCallInput_Params<T_Body>
   ): Promise<T_Response /* | Axios.AxiosResponse */> {
     try {
       let a: T_Response;
@@ -70,14 +70,14 @@ export class DynamoNTS_ApiService {
         this.setupQueryParams<T_Body>(inputParams, callParams);
       } */
 
-      if (dynamoNTS_globalSettings.logApiEvents) {
+      if (DynamoNTS_globalSettings.logApiEvents) {
         this.logEvent(url, inputParams, callParams);
       }
 
       switch (callParams.type) {
         case DynamoNTS_HttpCallType.get:
           if (inputParams?.body) {
-            Dynamo_Log.warn('WARNING you cant send body in get calls');
+            DynamoFM_Log.warn('WARNING you cant send body in get calls');
           }
 
           a = await this.get<T_Response>(axios, url, callParams);
@@ -85,7 +85,7 @@ export class DynamoNTS_ApiService {
 
         case DynamoNTS_HttpCallType.delete:
           if (inputParams?.body) {
-            Dynamo_Log.warn('WARNING you cant send body in delete calls');
+            DynamoFM_Log.warn('WARNING you cant send body in delete calls');
           }
 
           a = await this.delete<T_Response>(axios, url, callParams);
@@ -106,7 +106,7 @@ export class DynamoNTS_ApiService {
           break;
 
         default:
-          Dynamo_Log.error('DYNAMOBE ERROR: \n wrong api call type'/* , '\n\n', new Error() */);
+          DynamoFM_Log.error('DYNAMOBE ERROR: \n wrong api call type'/* , '\n\n', new Error() */);
           break;
       }
 
@@ -146,7 +146,7 @@ export class DynamoNTS_ApiService {
   } */
 
   private static handleError<T_Body>(
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     error: any,
     inputParams: {
       pathParams?: { [param: string]: string; };
@@ -156,7 +156,7 @@ export class DynamoNTS_ApiService {
       body?: T_Body;
     }
   ): void {
-    Dynamo_Log.error(
+    DynamoFM_Log.error(
       `\n>      API ERROR: ${callParams?.name} failed...` +
       `\n${callParams?.baseUrl}${callParams?.endPoint}` +
       `\ncallParams:`, callParams
@@ -166,10 +166,10 @@ export class DynamoNTS_ApiService {
       error.error = JSON.parse(error?.error);
     }
 
-    if ((error?.response?.data as Dynamo_Error)?.flag?.includes('DYNAMO')) {
-      Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
+    if ((error?.response?.data as DynamoFM_Error)?.flag?.includes('DYNAMO')) {
+      DynamoFM_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
 
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           callParams.name + ' startApiCall',
           error.response.data
@@ -184,9 +184,9 @@ export class DynamoNTS_ApiService {
       });
 
     } else if (error.code === 'ENOTFOUND') {
-      Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
+      DynamoFM_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
 
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           callParams.name + ' startApiCall',
           error
@@ -202,9 +202,9 @@ export class DynamoNTS_ApiService {
       });
 
     } else if (error.code === 'ECONNREFUSED') {
-      Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
+      DynamoFM_Log.error(`\n${callParams.name} was UNSUCCESSFUL` /* , new Error() */);
 
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           callParams.name + ' startApiCall',
           error
@@ -221,7 +221,7 @@ export class DynamoNTS_ApiService {
 
     } else if (error.config && error.message) {
 
-      throw new Dynamo_Error({
+      throw new DynamoFM_Error({
         ...this._getDefaultErrorSettings(
           callParams.name + ' startApiCall',
           error
@@ -235,7 +235,7 @@ export class DynamoNTS_ApiService {
         },
       });
     } else {
-      Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`, error /*, '\n\n' , new Error() */);
+      DynamoFM_Log.error(`\n${callParams.name} was UNSUCCESSFUL`, error /*, '\n\n' , new Error() */);
 
       throw error;
     }
@@ -243,21 +243,21 @@ export class DynamoNTS_ApiService {
 
   private static async postPutPatch<T_Response, T_Body>(
     axios: Axios.AxiosInstance,
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     url: string,
-    inputParams: DynamoNTS_ApiCallInputParams<T_Body>
+    inputParams: DynamoNTS_ApiCallInput_Params<T_Body>
   ): Promise<T_Response> {
     return await axios[callParams.type]<T_Response>(
       url,
       inputParams.body,
       callParams.httpOptions
     ).then((res: Axios.AxiosResponse): T_Response => {
-      if (dynamoNTS_globalSettings.logApiEvents) {
-        if (dynamoNTS_globalSettings.logApiResponseContents) {
-          Dynamo_Log.success(`>      ${callParams.name} api call was successful`, res.data);
+      if (DynamoNTS_globalSettings.logApiEvents) {
+        if (DynamoNTS_globalSettings.logApiResponseContents) {
+          DynamoFM_Log.success(`>      ${callParams.name} api call was successful`, res.data);
 
         } else {
-          Dynamo_Log.success(`>      ${callParams.name} api call was successful`);
+          DynamoFM_Log.success(`>      ${callParams.name} api call was successful`);
         }
       }
 
@@ -272,15 +272,15 @@ export class DynamoNTS_ApiService {
   private static async delete<T_Response>(
     axios: Axios.AxiosInstance,
     url: string,
-    callParams: DynamoNTS_ApiCallParams
+    callParams: DynamoNTS_ApiCall_Params
   ): Promise<T_Response> {
     return await axios.delete<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (dynamoNTS_globalSettings.logApiEvents) {
-          if (dynamoNTS_globalSettings.logApiResponseContents) {
-            Dynamo_Log.success(`${callParams.name} was successful`, res.data);
+        if (DynamoNTS_globalSettings.logApiEvents) {
+          if (DynamoNTS_globalSettings.logApiResponseContents) {
+            DynamoFM_Log.success(`${callParams.name} was successful`, res.data);
           } else {
-            Dynamo_Log.success(`${callParams.name} was successful`);
+            DynamoFM_Log.success(`${callParams.name} was successful`);
           }
         }
 
@@ -294,15 +294,15 @@ export class DynamoNTS_ApiService {
   private static async get<T_Response>(
     axios: Axios.AxiosInstance,
     url: string,
-    callParams: DynamoNTS_ApiCallParams
+    callParams: DynamoNTS_ApiCall_Params
   ): Promise<T_Response> {
     return await axios.get<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (dynamoNTS_globalSettings.logApiEvents) {
-          if (dynamoNTS_globalSettings.logApiResponseContents) {
-            Dynamo_Log.success(`${callParams.name} was successful`, res.data);
+        if (DynamoNTS_globalSettings.logApiEvents) {
+          if (DynamoNTS_globalSettings.logApiResponseContents) {
+            DynamoFM_Log.success(`${callParams.name} was successful`, res.data);
           } else {
-            Dynamo_Log.success(`${callParams.name} was successful`);
+            DynamoFM_Log.success(`${callParams.name} was successful`);
           }
         }
 
@@ -317,19 +317,19 @@ export class DynamoNTS_ApiService {
 
   private static logEvent<T_Body>(
     url: string,
-    inputParams: DynamoNTS_ApiCallInputParams<T_Body>,
-    callParams: DynamoNTS_ApiCallParams
+    inputParams: DynamoNTS_ApiCallInput_Params<T_Body>,
+    callParams: DynamoNTS_ApiCall_Params
   ): void {
-    if (dynamoNTS_globalSettings.logApiRequestContents) {
-      Dynamo_Log.log(`<      outgoing API call: ${url} \nbody:`, inputParams?.body);
+    if (DynamoNTS_globalSettings.logApiRequestContents) {
+      DynamoFM_Log.log(`<      outgoing API call: ${url} \nbody:`, inputParams?.body);
 
     } else {
-      Dynamo_Log.log(`<      outgoing API call: ${url}`);
+      DynamoFM_Log.log(`<      outgoing API call: ${url}`);
     }
 
-    if (dynamoNTS_globalSettings.logApiRequestSettings) {
-      Dynamo_Log.log(`callParams:`, callParams);
-      Dynamo_Log.log('inputParams:', {
+    if (DynamoNTS_globalSettings.logApiRequestSettings) {
+      DynamoFM_Log.log(`callParams:`, callParams);
+      DynamoFM_Log.log('inputParams:', {
         pathParams: inputParams.pathParams ?? {},
         body: inputParams.body ?? null,
       });
@@ -337,7 +337,7 @@ export class DynamoNTS_ApiService {
   }
 
   private static setupHeaders(
-    callParams: DynamoNTS_ApiCallParams,
+    callParams: DynamoNTS_ApiCall_Params,
     axios: Axios.AxiosInstance
   ): void {
     for (const headerKey in callParams.httpOptions.headers) {
@@ -345,7 +345,7 @@ export class DynamoNTS_ApiService {
         axios.defaults.headers.common[headerKey] = callParams.httpOptions.headers[headerKey];
 
       } else {
-        Dynamo_Log.error(
+        DynamoFM_Log.error(
           'DYNAMOBE ERROR: \n missing header:',
           headerKey
         );
@@ -374,7 +374,7 @@ export class DynamoNTS_ApiService {
             break;
 
           default:
-            Dynamo_Log.error(
+            DynamoFM_Log.error(
               `DYNAMOBE ERROR: \n wrong path param type: (${pathParamKey}): ${paramType} ` +
               `\n${pathParams[pathParamKey]}` +
               `\nMUST BE string or number` +
@@ -384,7 +384,7 @@ export class DynamoNTS_ApiService {
             break;
         }
       } else {
-        Dynamo_Log.error(
+        DynamoFM_Log.error(
           'DYNAMOBE ERROR: \n missing pathParam:',
           pathParamKey /* , '\n\n', new Error() */
         );
@@ -396,13 +396,13 @@ export class DynamoNTS_ApiService {
 
   private static _getDefaultErrorSettings(
     fnName: string, 
-    error: Dynamo_AnyError
-  ): Dynamo_Error_Settings {
+    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)`,
-      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,
       issuerService: `${this?.constructor?.name}-${this?.name}-DynamoNTS_ApiService`,
       error: error,
     };