@futdevpro/nts-dynamo 1.10.9 → 1.10.10

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

@@ -25,7 +25,8 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
 
   dataModel/* : mongoose.Model<T> */; // = mongoose.model(this.dataParams.dataName, this.getSchema());
 
-  private depDataName: string;
+  /* private depDataName: string; */
+  private readonly depKeys: string[] = [];
 
   defaultErrorUserMsg = 
     `We encountered an unhandled DB Error, ` +
@@ -43,7 +44,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     try {
       this.serviceName = this.constructor?.name;
 
-      if (!this.dataParams.dataName) {
+      if (!this.dataParams.dataName || typeof this.dataParams.dataName !== 'string') {
         throw new Error(
           `dbName not setted up for this db-service (${this.dataParams.dataName}) (NTS DB)`
         );
@@ -204,11 +205,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * get data by dependency data id, 
    * !!!: throws error if not found (errorCode on not found: NTS-DBS-GD2)
    * 
-   * @param dependencyId id
+   * @param dependencyIdsFilter id
    * @returns data
    */
-  async getDataByDependencyId(dependencyId: string): Promise<T> {
-    if (!this.depDataName) {
+  async getDataByDependencyId(dependencyIdsFilter: { [key: string]: string }): Promise<T> {
+    if (!this.depKeys.length) {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDataByDependencyId', 
@@ -222,16 +223,17 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     const data: T = await this.dataModel
-      .findOne({ [this.depDataName]: dependencyId })
+      .findOne(dependencyIdsFilter)
       .then((res): T => res?.toObject() as T ?? null)
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('getDataByDependencyId', error),
 
           errorCode: 'NTS-DBS-GD1',
-          additionalContent: { dependencyId },
+          additionalContent: { dependencyIdsFilter: dependencyIdsFilter },
           message: 
-            `get "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful (NTS DB)`, 
+            `get "${this.dataParams.dataName}" by ` +
+            `"${Object.keys(dependencyIdsFilter).join(', ')}" was unsuccessful (NTS DB)`, 
         });
       });
 
@@ -242,11 +244,11 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * get data by dependency data id, 
    * !!!: throws error if not found (errorCode on not found: NTS-DBS-GLD2)
    * 
-   * @param dependencyId id
+   * @param dependencyIdsFilter id
    * @returns dataList
    */
-  async getDataListByDependencyId(dependencyId: string): Promise<T[]> {
-    if (!this.depDataName) {
+  async getDataListByDependencyId(dependencyIdsFilter: { [key: string]: string }): Promise<T[]> {
+    if (!this.depKeys.length) {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
           'getDataListByDependencyId',
@@ -263,17 +265,16 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     const dataList: T[] = await this.dataModel
-      .find({ 
-        [this.depDataName]: dependencyId,
-      })
+      .find(dependencyIdsFilter)
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('getDataListByDependencyId', error),
           errorCode: 'NTS-DBS-GLD1',
-          additionalContent: { dependencyId },
+          additionalContent: { dependencyIdsFilter: dependencyIdsFilter },
           message: 
-            `get "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful (NTS DB)`, 
+            `get "${this.dataParams.dataName}" by ` +
+            `"${Object.keys(dependencyIdsFilter).join(', ')}" was unsuccessful (NTS DB)`, 
         });
       });
 
@@ -291,8 +292,8 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * @param ids ids
    * @returns dataList
    */
-  async getDataListByDependencyIds(dependencyIds: string[]): Promise<T[]> {
-    if (!this.depDataName) {
+  async getDataListByDependencyIds(dependencyKey: string, dependencyIds: string[]): Promise<T[]> {
+    if (!this.depKeys.length) {
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(
           'getDataListByDependencyIds',
@@ -305,9 +306,31 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       });
     }
 
+    if (!dependencyIds?.length) {
+      return [];
+    }
+
+    if (!dependencyKey) {
+      throw new DyFM_Error({
+        ...this._getDefaultErrorSettings(
+          'getDataListByDependencyIds',
+          new Error(`dependencyKey is missing! (${this.dataParams.dataName}) (NTS DB)`),
+        ),
+      });
+    }
+
+    if (!this.depKeys.includes(dependencyKey)) {
+      throw new DyFM_Error({
+        ...this._getDefaultErrorSettings(
+          'getDataListByDependencyIds',
+          new Error(`dependencyKey is not valid! (${dependencyKey}) (NTS DB)`),
+        ),
+      });
+    }
+
     const dataList: T[] = await this.dataModel
       .find({ 
-        [this.depDataName]: { $in: dependencyIds },
+        [dependencyKey]: { $in: dependencyIds },
       })
       .then((res): T[] => res as T[] ?? [])
       .catch((error): void => {
@@ -316,7 +339,7 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
           errorCode: 'NTS-DBS-GLDS1',
           additionalContent: { dependencyIds },
           message: 
-            `get "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful (NTS DB)`,
+            `get "${this.dataParams.dataName}" by "${dependencyKey}" was unsuccessful (NTS DB)`,
         });
       });
 
@@ -375,9 +398,9 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     );
   }
 
-  async markDeletedByDependencyId(dependencyId: string, issuer: string): Promise<void> {
+  async markDeletedByDependencyId(dependencyIdsFilter: { [key: string]: string }, issuer: string): Promise<void> {
     await this.dataModel.updateMany(
-      { [this.depDataName]: dependencyId }, 
+      dependencyIdsFilter, 
       { 
         _deleted: new Date(),
         _deletedBy: issuer,
@@ -386,9 +409,10 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings('markDeletedByDependencyId', error, issuer),
         errorCode: 'NTS-DBS-MDD0',
-        additionalContent: { dependencyId },
+        additionalContent: { dependencyIdsFilter: dependencyIdsFilter },
         message: 
-          `markDeleted "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful ` +
+          `markDeleted "${this.dataParams.dataName}" by ` +
+          `"${Object.keys(dependencyIdsFilter).join(', ')}" was unsuccessful ` +
           `(NTS DB)`, 
         issuer,
       });
@@ -415,9 +439,12 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     });
   }
 
-  async restoreDeletedByDependencyId(dependencyId: string, issuer: string): Promise<void> {
+  async restoreDeletedByDependencyId(
+    dependencyIdsFilter: { [key: string]: string }, 
+    issuer: string
+  ): Promise<void> {
     await this.dataModel.updateMany(
-      { [this.depDataName]: dependencyId }, 
+      dependencyIdsFilter, 
       { 
         _deleted: null,
         __lastModified: new Date(),
@@ -427,9 +454,10 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings('restoreDeletedByDependencyId', error, issuer),
         errorCode: 'NTS-DBS-RDD0',
-        additionalContent: { dependencyId },
+        additionalContent: { dependencyIdsFilter: dependencyIdsFilter },
         message: 
-          `restoreDeleted "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful ` +
+          `restoreDeleted "${this.dataParams.dataName}" by ` +
+          `"${Object.keys(dependencyIdsFilter).join(', ')}" was unsuccessful ` +
           `(NTS DB)`, 
         issuer,
       });
@@ -474,8 +502,8 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * deleted data by id
    * @param dependencyId id
    */
-  async deleteDataByDependencyId(dependencyId: string): Promise<void> {
-    if (!this.depDataName) {
+  async deleteDataByDependencyId(dependencyIdsFilter: { [key: string]: string }): Promise<void> {
+    if (!this.depKeys.length) {
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
           'deleteDataByDependencyId',
@@ -489,14 +517,15 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
     }
 
     await this.dataModel
-      .deleteMany({ [this.depDataName]: dependencyId })
+      .deleteMany(dependencyIdsFilter)
       .catch((error): void => {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings('deleteDataByDependencyId', error),
           errorCode: 'NTS-DBS-DDD1',
-          additionalContent: { dependencyId },
+          additionalContent: { dependencyIdsFilter: dependencyIdsFilter },
           message: 
-            `delete "${this.dataParams.dataName}" by ${this.depDataName} was unsuccessful (NTS DB)`, 
+            `delete "${this.dataParams.dataName}" by ` +
+            `"${Object.keys(dependencyIdsFilter).join(', ')}" was unsuccessful (NTS DB)`, 
         });
       });
   }
@@ -521,12 +550,13 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    */
   async searchData(
     filterBy: DyFM_DBFilter<T>, 
-    narrowByDependencyIds?: string[]
+    narrowByDependencyIds?: string[],
+    narrowByDependencyKey?: string,
   ): Promise<T[]> {
     const filter = {};
 
     if (0 < narrowByDependencyIds.length) {
-      if (!this.depDataName) {
+      if (!this.depKeys.length) {
         throw new DyFM_Error({ 
           ...this._getDefaultErrorSettings(
             'searchData',
@@ -538,8 +568,21 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
           errorCode: 'NTS-DBS-SD0',
         });
       }
-      
-      filter[this.depDataName] = { $in: narrowByDependencyIds };      
+
+      if (!narrowByDependencyKey) {
+        if (this.depKeys.length === 1) {
+          narrowByDependencyKey = this.depKeys[0];
+        } else {
+          throw new DyFM_Error({
+            ...this._getDefaultErrorSettings(
+              'searchData',
+              new Error(`dependencyKey is missing! (${this.dataParams.dataName}) (NTS DB)`),
+            ),
+          });
+        }
+      }
+
+      filter[narrowByDependencyKey] = { $in: narrowByDependencyIds };      
     }
 
     Object.values(this.dataParams.properties).forEach(
@@ -1231,33 +1274,16 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
    * sets depDataKey
    */
   private lookForDependencyDataSettings(): void {
-    const dependencyParam: DyFM_DataProperty_Params<any> = 
-      Object.values(this.dataParams.properties).find(
-        (modelParams: DyFM_DataProperty_Params<any>): boolean => 
-          Boolean(modelParams.dependencyDataName)
-      );
-    
-    if (
+    const dependencyParams: DyFM_DataProperty_Params<any>[] = 
       Object.values(this.dataParams.properties).filter(
         (modelParams: DyFM_DataProperty_Params<any>): boolean => 
           Boolean(modelParams.dependencyDataName)
-      ).length > 1
-    ) {
-      throw new DyFM_Error({
-        ...this._getDefaultErrorSettings(
-          'lookForDependencyDataSettings',
-          new Error(
-            `Multiple "dependencyDataName" found for this dataModel (${this.dataParams.dataName}) ` +
-            `(NTS DB)` +
-            `\nSorry, but this is not supported yet! (Donate to Dynamo to get this feature!)`
-          )
-        ),
-        errorCode: 'NTS-DBS-LFDD0',
-      });        
-    }
+      );
     
-    if (dependencyParam) {
-      this.depDataName = dependencyParam.key;
+    if (dependencyParams) {
+      this.depKeys.push(...dependencyParams.map(
+        (dependencyParam: DyFM_DataProperty_Params<any>): string => dependencyParam.key
+      ));
     }
   }
 }

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

@@ -195,7 +195,11 @@ export class DyNTS_ApiService {
       DyFM_Log.error(msg);
     }
 
-    if (error && callParams?.httpOptions?.responseType === DyFM_HttpResponseType.text) {
+    if (
+      error && 
+      typeof error.error === 'string' && 
+      callParams?.httpOptions?.responseType === DyFM_HttpResponseType.text
+    ) {
       error.error = JSON.parse(error?.error);
     }
 
@@ -215,6 +219,7 @@ export class DyNTS_ApiService {
         additionalContent: {
           callParams,
           inputParams,
+          response: error.response,
         },
       });
 
@@ -233,6 +238,7 @@ export class DyNTS_ApiService {
         additionalContent: {
           callParams,
           inputParams,
+          response: error.response,
         },
       });
 
@@ -252,22 +258,37 @@ export class DyNTS_ApiService {
           callParams,
           inputParams,
           url,
+          response: error.response,
         },
       });
 
     } else if (error.config && error.message) {
 
+      let msg: string = error.message;
+      let status: number = +error.message.substring(error.message.length - 4, 3);
+
+      if (error.message.includes('status code')) {msg += `\nendpoint: ${callParams.baseUrl}${callParams.endpoint}` +
+          `\npathParams: ${
+            inputParams.pathParams ? 
+              Object.keys(inputParams.pathParams).join(', ') : 
+              '-no path params-'
+          }` +
+          `\nenpointStackLocation: ${callParams.stack}`;
+      }
+
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(
           callParams.name + ' startApiCall',
           error
         ),
 
-        status: +error.message.substring(error.message.length - 4, 3),
+        status: status,
+        message: msg,
         errorCode: 'NTS-API-HE4',
         additionalContent: {
           callParams,
           inputParams,
+          response: error.response,
         },
       });
     } else {

package/src/_services/server/app.server.ts

@@ -308,10 +308,19 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
 
     this.asyncConstruct(/* extended */).catch((error: any): void => {
       if (error instanceof DyFM_Error) {
-        DyFM_Log.H_warn(
-          '(constructor asyncConstruct.catch) additional error content:\n', 
-          error?.additionalContent
-        );
+        if (error.additionalContent?.constructErrors?.length) {
+          error.additionalContent.constructErrors.forEach((errorItem: DyFM_Error): void => {
+            errorItem.logSimple(
+              `(constructor asyncConstruct.catch) additional error content:\n`,
+              errorItem?.additionalContent
+            );
+          });
+        } else {
+          DyFM_Log.H_warn(
+            '(constructor asyncConstruct.catch) additional error content:\n', 
+            error?.additionalContent
+          );
+        }
       }
 
       if (