Feat/rabc/metadata exception (#55)

* feat: add metadata to exception and httpException * feat: change type metadata
DigiChanges · Jul 4, 2021 · fe2e36c · fe2e36c
1 parent 23b21fa
commit fe2e36c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 14 deletions.
diff --git a/src/App/Presentation/Shared/ErrorHttpException.ts b/src/App/Presentation/Shared/ErrorHttpException.ts
@@ -5,13 +5,15 @@ class ErrorHttpException extends Error
 {
     private _statusCode: IStatusCode;
     private _errors: ValidationError[];
+    private _metadata: Record<string, any>;
 
-    constructor(statusCode: IStatusCode, message: string, errors: ValidationError[])
+    constructor(statusCode: IStatusCode, message: string, errors: ValidationError[], metadata: Record<string, any> = {})
     {
         super();
         this._statusCode = statusCode;
         this._errors = errors;
         this.message = message;
+        this._metadata = metadata;
     }
 
     public get statusCode() : IStatusCode
@@ -33,6 +35,16 @@ class ErrorHttpException extends Error
     {
         this._errors = err;
     }
+
+    public get metadata() : Record<string, any>
+    {
+        return this._metadata;
+    }
+
+    public set metadata(metadata: Record<string, any>)
+    {
+        this._metadata = metadata;
+    }
 }
 
 export default ErrorHttpException;
diff --git a/src/App/Presentation/Shared/Express/ErrorHandler.ts b/src/App/Presentation/Shared/Express/ErrorHandler.ts
@@ -31,6 +31,6 @@ export class ErrorHandler
 
         loggerCli.debug(err.stack);
 
-        responder.error(formatError.getFormat(exception), req, res, exception.statusCode);
+        responder.error(formatError.getFormat(exception), req, res, exception.statusCode, exception.metadata);
     }
 }
diff --git a/src/App/Presentation/Shared/Express/ExceptionFactory.ts b/src/App/Presentation/Shared/Express/ExceptionFactory.ts
@@ -33,9 +33,10 @@ class ExceptionFactory
 
     public getException(err: any): ErrorHttpException
     {
-        let exception = this.exceptionsMapper[err?.name || 'Error'];
+        let exception = this.exceptionsMapper[err?.name || 'Error'] as ErrorHttpException;
 
         const message = err?.message || exception?.message;
+        const metadata = err?.metadata || exception?.metadata;
 
         if (err instanceof Error && err.message === 'Token expired')
         {
@@ -60,6 +61,7 @@ class ExceptionFactory
         }
 
         exception.message = message;
+        exception.metadata = metadata;
 
         return exception;
     }

diff --git a/src/App/Presentation/Shared/FormatError.ts b/src/App/Presentation/Shared/FormatError.ts
@@ -7,7 +7,7 @@ class FormatError
 {
     getFormat = (errorHttpException: ErrorHttpException): any =>
     {
-        const {statusCode, message, errors} = errorHttpException;
+        const {statusCode, message, errors, metadata} = errorHttpException;
         const validationModels: ValidationModel[] = [];
 
         if (!_.isEmpty(errors))
@@ -24,7 +24,8 @@ class FormatError
             code: statusCode.code,
             statusCode: statusCode.statusCode,
             message: statusCode.code === StatusCode.HTTP_INTERNAL_SERVER_ERROR.code ? 'Internal Error Server' : message,
-            errors: _.isEmpty(validationModels) ? null : validationModels
+            errors: _.isEmpty(validationModels) ? null : validationModels,
+            metadata
         };
     };
 }

diff --git a/src/App/Presentation/Shared/MongoPaginator.ts b/src/App/Presentation/Shared/MongoPaginator.ts
@@ -20,9 +20,9 @@ class MongoPaginator implements IPaginator
     private from: number;
     private to: number;
 
-    private readonly metadata: {[key: string]: any};
+    private readonly metadata: Record<string, any>;
 
-    constructor(documentQuery: Query<any[], any>, criteria: ICriteria, metadata: {[key: string]: any} = null)
+    constructor(documentQuery: Query<any[], any>, criteria: ICriteria, metadata: Record<string, any> = {})
     {
         this.documentQuery = documentQuery;
         this.filter = criteria.getFilter();
@@ -201,7 +201,7 @@ class MongoPaginator implements IPaginator
         return this.pagination.getCurrentUrl();
     }
 
-    public getMetadata(): {[key: string]: any}
+    public getMetadata(): Record<string, any>
     {
         return this.metadata;
     }

diff --git a/src/App/Presentation/Shared/Paginator.ts b/src/App/Presentation/Shared/Paginator.ts
@@ -20,9 +20,9 @@ class Paginator implements IPaginator
     private from: number;
     private to: number;
 
-    private readonly metadata: {[key: string]: any};
+    private readonly metadata: Record<string, any>;
 
-    constructor(queryBuilder: SelectQueryBuilder<any>, criteria: ICriteria, metadata: {[key: string]: any} = null)
+    constructor(queryBuilder: SelectQueryBuilder<any>, criteria: ICriteria, metadata: Record<string, any> = {})
     {
         this.queryBuilder = queryBuilder;
         this.filter = criteria.getFilter();
@@ -198,7 +198,7 @@ class Paginator implements IPaginator
         return this.pagination.getCurrentUrl();
     }
 
-    public getMetadata(): {[key: string]: any}
+    public getMetadata(): Record<string, any>
     {
         return this.metadata;
     }

diff --git a/src/App/Presentation/Shared/Responder.ts b/src/App/Presentation/Shared/Responder.ts
@@ -90,13 +90,12 @@ class Responder
         });
     }
 
-    public error(data: any, request: Request | any, response: Response, status: any)
+    public error(data: any, request: Request | any, response: Response, status: any, metadata: Record<string, any>)
     {
-        let metadata;
-
         if (request)
         {
             metadata = {
+                ...metadata,
                 refreshToken: request.refreshToken
             };
         }