@mondart/nestjs-common-module 1.1.24 → 1.1.25

package/dist/filters/global-exception.filter.d.ts

@@ -1,8 +1,8 @@
-import { ArgumentsHost, ExceptionFilter, HttpException } from '@nestjs/common';
+import { ArgumentsHost, ExceptionFilter } from '@nestjs/common';
 import { Response } from 'express';
 import { ConfigService } from '@nestjs/config';
 export declare class GlobalExceptionFilter implements ExceptionFilter {
     private readonly configService;
     constructor(configService: ConfigService);
-    catch(exception: HttpException, host: ArgumentsHost): Response<any, Record<string, any>> | import("rxjs").Observable<never>;
+    catch(exception: any, host: ArgumentsHost): import("rxjs").Observable<never> | Response<any, Record<string, any>>;
 }

package/dist/filters/global-exception.filter.js

@@ -11,51 +11,60 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalExceptionFilter = void 0;
 const common_1 = require("@nestjs/common");
-const dto_1 = require("../dto");
 const config_1 = require("@nestjs/config");
-const enums_1 = require("../enums");
-const microservices_1 = require("@nestjs/microservices");
 const rxjs_1 = require("rxjs");
+const dto_1 = require("../dto");
+const enums_1 = require("../enums");
 let GlobalExceptionFilter = class GlobalExceptionFilter {
     constructor(configService) {
         this.configService = configService;
     }
     catch(exception, host) {
         const context = host.switchToHttp();
-        const response = context.getResponse();
-        const status = exception.getStatus();
-        const result = exception.getResponse();
-        const logger = new common_1.Logger('OrderKafkaController', { timestamp: true });
-        try {
-            if (exception instanceof microservices_1.RpcException) {
-                logger.error(result);
-                return (0, rxjs_1.throwError)(() => exception);
-            }
-            else if (status === common_1.HttpStatus.UNPROCESSABLE_ENTITY) {
-                return response.status(status).json(result);
+        const logger = new common_1.Logger('GlobalExceptionFilter', { timestamp: true });
+        const type = host?.getType();
+        if (type === 'rpc') {
+            try {
+                logger.error(exception?.response ?? exception?.message);
+                return (0, rxjs_1.throwError)(() => exception?.response ?? exception?.message);
             }
-            else if (status === common_1.HttpStatus.BAD_REQUEST) {
-                return response
-                    .status(status)
-                    .json(new dto_1.ErrorResponse(String(result?.error), status, typeof result?.message === 'string'
-                    ? result?.message
-                    : result?.message[0]));
+            catch (err) {
+                return (0, rxjs_1.throwError)(() => JSON.stringify(new dto_1.ErrorResponse(enums_1.SharedMessages.INTERNAL_SERVER_ERROR, common_1.HttpStatus.INTERNAL_SERVER_ERROR)));
             }
-            else {
-                let message;
-                if (typeof result.message === 'string') {
-                    message = result?.message;
+        }
+        if (type === 'http') {
+            const response = context.getResponse();
+            const status = exception?.getStatus();
+            const result = exception.getResponse();
+            try {
+                if (status === common_1.HttpStatus.UNPROCESSABLE_ENTITY) {
+                    return response.status(status).json(result);
+                }
+                else if (status === common_1.HttpStatus.BAD_REQUEST) {
+                    return response
+                        .status(status)
+                        .json(new dto_1.ErrorResponse(String(result?.error), status, typeof result?.message === 'string'
+                        ? result?.message
+                        : result?.message[0]));
                 }
                 else {
-                    message = result?.message[0];
+                    let message;
+                    if (typeof result.message === 'string') {
+                        message = result?.message;
+                    }
+                    else {
+                        message = result?.message[0];
+                    }
+                    return response
+                        .status(status)
+                        .json(new dto_1.ErrorResponse(message, status));
                 }
-                return response.status(status).json(new dto_1.ErrorResponse(message, status));
             }
-        }
-        catch (err) {
-            response
-                .status(common_1.HttpStatus.INTERNAL_SERVER_ERROR)
-                .json(new dto_1.ErrorResponse(enums_1.SharedMessages.INTERNAL_SERVER_ERROR, common_1.HttpStatus.INTERNAL_SERVER_ERROR));
+            catch (err) {
+                response
+                    .status(common_1.HttpStatus.INTERNAL_SERVER_ERROR)
+                    .json(new dto_1.ErrorResponse(enums_1.SharedMessages.INTERNAL_SERVER_ERROR, common_1.HttpStatus.INTERNAL_SERVER_ERROR));
+            }
         }
     }
 };

package/dist/services/core-crud.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreCrudService = void 0;
+const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const nestjs_paginate_1 = require("nestjs-paginate");
 const enums_1 = require("../enums");
@@ -264,7 +265,8 @@ class CoreCrudService {
                     }
                     else if (value !== null &&
                         typeof value === 'object' &&
-                        !Array.isArray(value)) {
+                        !Array.isArray(value) &&
+                        !typeorm_1.InstanceChecker.isFindOperator(value)) {
                         const validatedObject = this.whereQueryTransformer(value);
                         if (validatedObject !== undefined) {
                             newQuery[key] = validatedObject;