@futdevpro/nts-dynamo 1.14.76 → 1.14.78

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

@@ -22,7 +22,9 @@ import {
   DyFM_SearchQuery,
   DyFM_SearchResult,
   DyFM_SpecialSearch,
-  DyFM_String
+  DyFM_String,
+  DyFM_ValidationError,
+  DyFM_ValidationErrors
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_getArchivedDBName } from '../../_collections/archive.util';
@@ -64,6 +66,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
   haveArchiveDataService: boolean;
 
   /* data: T; */
+  /** @deprecated */
   dataList: T[] = [];
   /* issuer: string; */
 
@@ -91,6 +94,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
   constructor(
     /**
      * Initial data, this will be used by functions on default
+     * @deprecated
      */
     public data: T,
     /**
@@ -1296,32 +1300,40 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         });
       }
 
-      const errors: DyFM_Error[] = [];
+      const validationErrors: DyFM_Error[] = [];
 
       Object.values(properties).forEach(
         (propertyParams: DyFM_DataProperty_Params<any, T>) => {
           try {
             this.validateProperty(data, data[propertyParams.key], propertyParams, isSubObjectOf);
           } catch (error) {
-            errors.push(error);
+            validationErrors.push(error);
           }
         }
       );
 
-      if (errors.length > 0) {
-        if (errors.length === 1) {
-          throw errors[0];
+      if (validationErrors.length > 0) {
+        if (validationErrors.length === 1) {
+          throw validationErrors[0];
         } else {
+          const validationErrorsSet: DyFM_ValidationErrors = {};
+          validationErrors.forEach((error: DyFM_Error) => {
+            Object.keys(error.validationErrors).forEach((key: string) => {
+              validationErrors[key] = error.validationErrors[key];
+            });
+          });
+
           throw new DyFM_Error({
             ...this._getDefaultErrorSettings(
               'validateByPropertyParams', 
               new Error(
                 'Validation failed! (multiple validation errors)' + 
-                errors.map((error: DyFM_Error) => `\n  ${DyFM_Error.getAnyMessage(error)}`).join('')
+                validationErrors.map((error: DyFM_Error) => `\n  ${DyFM_Error.getAnyMessage(error)}`).join('')
               )
             ),
             errorCode: `${this.ecBase}DyNTS-DS0-VDP3`,
-            errors: errors,
+            errors: validationErrors,
+            validationErrors: validationErrorsSet,
           });
         }
       }
@@ -1376,6 +1388,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         status: 522, 
         errorCode: `${this.ecBase}DyNTS-DS0-VP1`,
         userMessage: this.defaultValidationErrorUserMsg,
+        validationErrors: {
+          [propertyParams.key]: {
+            message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is missing! ` +
+            `(index or required in "${this.dataParams.dataName}" dataParams) ` +
+            ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+            code: `${this.ecBase}DyNTS-DS0-VP1`,
+            userMessage: 'The property is required and must be a valid value!',
+          },
+        },
         __localStack: this.dataParams.stackLocation,
         additionalContent: {
           data: data,
@@ -1398,6 +1419,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         status: 522, 
         errorCode: `${this.ecBase}DyNTS-DS0-VP2`,
         userMessage: this.defaultValidationErrorUserMsg,
+        validationErrors: {
+          [propertyParams.key]: {
+            message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is forbidden! ` +
+            `(${this.dataParams.dataName}) ` +
+            ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+            code: `${this.ecBase}DyNTS-DS0-VP2`,
+            userMessage: 'The property modification is forbidden!',
+          },
+        },
         __localStack: this.dataParams.stackLocation,
         additionalContent: {
           data: data,
@@ -1430,6 +1460,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             status: 522, 
             errorCode: `${this.ecBase}DyNTS-DS0-VP3`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid date! ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP3`,
+                userMessage: 'The property is required and must be a valid date!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
             additionalContent: {
               data: data,
@@ -1453,6 +1492,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             status: 522, 
             errorCode: `${this.ecBase}DyNTS-DS0-VP4`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid number! ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP4`,
+                userMessage: 'The property is required and must be a valid number!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
             additionalContent: {
               data: data,
@@ -1475,8 +1523,18 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             ),
 
             status: 522, 
-            errorCode: `${this.ecBase}VP5`,
+            errorCode: `${this.ecBase}DyNTS-DS0-VP5`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid string! ` +
+                `(type: ${typeof propertyValue}, value: "${propertyValue}") ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP5`,
+                userMessage: 'The property is required and must be a valid string!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
             additionalContent: {
               data: data,
@@ -1499,8 +1557,18 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             ),
 
             status: 522, 
-            errorCode: `${this.ecBase}VP6`,
+            errorCode: `${this.ecBase}DyNTS-DS0-VP6`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid boolean! ` +
+                `(type: ${typeof propertyValue}, value: "${propertyValue}") ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP6`,
+                userMessage: 'The property is required and must be a valid boolean!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
           });
         }
@@ -1520,8 +1588,18 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             ),
 
             status: 522, 
-            errorCode: `${this.ecBase}VP7`,
+            errorCode: `${this.ecBase}DyNTS-DS0-VP7`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid object! ` +
+                `(type: ${typeof propertyValue}, value: "${propertyValue}") ` +
+                `(${this.dataParams.dataName})` +
+                (data as any)?.name ? `\n  That failed data's name: ${(data as any).name}` : '',
+                code: `${this.ecBase}DyNTS-DS0-VP7`,
+                userMessage: 'The property is required and must be an object!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
           });
         }
@@ -1545,8 +1623,18 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             ),
 
             status: 522, 
-            errorCode: `${this.ecBase}VP8`,
+            errorCode: `${this.ecBase}DyNTS-DS0-VP8`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid array! ` +
+                `(type: ${typeof propertyValue}, value: "${propertyValue}") ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP8`,
+                userMessage: 'The property is required and must be a valid array!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
           });
         }
@@ -1577,6 +1665,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
             status: 522, 
             errorCode: `${this.ecBase}VP9`,
             userMessage: this.defaultValidationErrorUserMsg,
+            validationErrors: {
+              [propertyParams.key]: {
+                message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid function! ` +
+                `(${this.dataParams.dataName})` +
+                ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+                code: `${this.ecBase}DyNTS-DS0-VP9`,
+                userMessage: 'The property is required and must be a valid function!',
+              },
+            },
             __localStack: this.dataParams.stackLocation,
           });
         } */
@@ -1598,6 +1695,17 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
           status: 522, 
           errorCode: `${this.ecBase}DyNTS-DS0-VP10`,
           userMessage: this.defaultValidationErrorUserMsg,
+          validationErrors: {
+            [propertyParams.key]: {
+              message: `validateProperty failed, "${this.getPropertyKey(propertyParams, isSubObjectOf)}" is not a valid property type! ` +
+              `(type: ${propertyParams.type}, nonBasicType: ${propertyParams.nonBasicType}) ` +
+              `(value type: ${typeof propertyValue}, value: "${propertyValue}") ` +
+              `(${this.dataParams.dataName})` +
+              ((data as any)?.name ? `\n  The failed data's name: ${(data as any).name}` : ''),
+              code: `${this.ecBase}DyNTS-DS0-VP10`,
+              userMessage: 'The property is required and must be a valid property type!',
+            },
+          },
           __localStack: this.dataParams.stackLocation,
         });
     }
@@ -2061,6 +2169,11 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
     }
   }
 
+  /**
+   * Get the value of a nested key.
+   * @param nestKeys - The nested keys to resolve.
+   * @returns The value of the nested key.
+   */
   private getKeyResolver(nestKeys: string[]): (data: T) => any {
     return (data: T): any => {
       let value: any = data;
@@ -2071,18 +2184,21 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
         }
         
         if (nestKey === '*') {
-          if (Array.isArray(value[nestKey])) {
-            if (Array.isArray(value)) {
-              value = value[nestKey].map((element: any): any => element[nestKey]).flat();
-            } else {
-              value = value[nestKey].map((element: any): any => element[nestKey]);
-            }
-          } else if (value[nestKey] && typeof value[nestKey] === 'object') {
-            value = Object.values(value[nestKey]);
+          // Wildcard: ha value egy tömb, akkor minden elemet visszaadunk
+          // A következő nestKey minden elemre alkalmazva lesz
+          if (Array.isArray(value)) {
+            // value marad tömb, a következő nestKey minden elemre alkalmazva lesz
+            // Nem változtatjuk meg a value-t, hogy a következő iterációban
+            // a tömb minden elemére alkalmazva legyen a következő nestKey
+          } else if (value && typeof value === 'object') {
+            // Ha objektum, akkor az értékeit adja vissza tömbként
+            value = Object.values(value);
           } else {
-            value = value[nestKey];
+            // Egyébként undefined
+            value = undefined;
           }          
         } else if (Array.isArray(value)) {
+          // Ha value tömb, akkor minden elemre alkalmazzuk a nestKey-t
           if (!isNaN(+nestKey)) {
             value = value[+nestKey];
           } else {
@@ -2097,6 +2213,11 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
     };
   }
 
+  /**
+   * Get the sort function for a key.
+   * @param sortSettings - The sort settings.
+   * @returns The sort function for the key.
+   */
   protected getSortFunctionForKey<T>(sortSettings: DyFM_DSSort): (a: T, b: T) => number {
     let keyResolver: (data: any) => any;
     let valueType: DyFM_BasicProperty_Type;
@@ -2347,6 +2468,10 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
       return this.depDataDBService;
     }
   }
+
+  getProvidedData(data: T): T {
+    return data;
+  }
   
   private _getDefaultErrorSettings(
     fnName: string, 

package/src/_services/route/controller.service.ts

@@ -11,6 +11,24 @@ import { DyNTS_SingletonService } from '../base/singleton.service';
  * 
  * (You'll need to add them to a {@link DyNTS_RoutingModule} through it's constructor)
  * 
+ * You can add default endpoints to the controller by using the {@link DyNTS_DefaultEndpoints_Util} utility class
+ * 
+ * @example
+ * this.endpoints = [
+ *   ...DyNTS_DefaultEndpoints_Util.getAllDefaultEndpoints({
+ *     entityName: 'UserMatchStatistics',
+ *     dataServiceClass: UserMatchStatistics_DataService,
+ *     endpoints: {
+ *       get: '/get/user-match-statistics/:userId',
+ *       search: '/search/user-match-statistics',
+ *       modify: '/modify/user-match-statistics',
+ *       patch: '/patch/user-match-statistics/:userId',
+ *       delete: '/delete/user-match-statistics/:userId',
+ *     },
+ *     authService: this.authService,
+ *   }),
+ * ];
+ * 
  * @example
  * export class UserMatchStatisticsController extends DyNTS_Controller {
  *

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

@@ -1221,6 +1221,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
 
         await DyNTS_GlobalService.globalErrorHandler?.(d_error, req, res);
 
+        res.send(error)
       } else {
         DyFM_Log.H_error(
           'WTF??? express error; without error?...' + 

package/src/_services/shared.static-service.spec.ts

@@ -3,17 +3,8 @@ import { DyNTS_Shared } from './shared.static-service';
 describe('| DyNTS_Shared', () => {
   it('| getIpFromRequest should be accessible', () => {
     expect(DyNTS_Shared.getIpFromRequest).toBeTruthy();
-  });
-
-  it('| getIpFromRequest should be accessible', () => {
-    expect(DyNTS_Shared.getLocationDataByRequest).toBeTruthy();
-  });
-
-  it('| getIpFromRequest should be accessible', () => {
     expect(DyNTS_Shared.getLocationByIp).toBeTruthy();
-  });
-
-  it('| getIpFromRequest should be accessible', () => {
+    expect(DyNTS_Shared.getLocationDataByRequest).toBeTruthy();
     expect(DyNTS_Shared.prompt).toBeTruthy();
   });
 });