@flusys/nestjs-shared 5.3.1 → 5.4.1

package/cjs/classes/api-service.class.js

@@ -69,7 +69,7 @@ let ApiService = class ApiService {
             await this.beforeInsertOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -81,7 +81,7 @@ let ApiService = class ApiService {
             await this.beforeInsertOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
@@ -93,7 +93,7 @@ let ApiService = class ApiService {
             await this.beforeUpdateOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -105,7 +105,7 @@ let ApiService = class ApiService {
             await this.beforeUpdateOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
@@ -119,14 +119,14 @@ let ApiService = class ApiService {
                 await this.beforeInsertOperation(toInsert, user, qr);
                 const insertedEntities = await this.convertRequestDtoToEntity(toInsert, user);
                 const insertedSaved = await qr.manager.save(this.repository.target, insertedEntities);
-                await this.afterInsertOperation(this.ensureArray(insertedSaved), user, qr);
+                await this.afterInsertOperation(this.ensureArray(insertedSaved), toInsert, user, qr);
                 allResults.push(...this.ensureArray(insertedSaved));
             }
             if (toUpdate.length > 0) {
                 await this.beforeUpdateOperation(toUpdate, user, qr);
                 const updatedEntities = await this.convertRequestDtoToEntity(toUpdate, user);
                 const updatedSaved = await qr.manager.save(this.repository.target, updatedEntities);
-                await this.afterUpdateOperation(this.ensureArray(updatedSaved), user, qr);
+                await this.afterUpdateOperation(this.ensureArray(updatedSaved), toUpdate, user, qr);
                 allResults.push(...this.ensureArray(updatedSaved));
             }
             return {
@@ -329,7 +329,7 @@ let ApiService = class ApiService {
                     id
                 };
             });
-            await this.afterDeleteOperation(ids, user, queryRunner);
+            await this.afterDeleteOperation(ids, option, user, queryRunner);
             await queryRunner.commitTransaction();
             await Promise.all([
                 this.clearCacheForAll(),
@@ -390,11 +390,11 @@ let ApiService = class ApiService {
         }
     }
     async beforeInsertOperation(_dto, _user, _queryRunner) {}
-    async afterInsertOperation(_entity, _user, _queryRunner) {}
+    async afterInsertOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeUpdateOperation(_dto, _user, _queryRunner) {}
-    async afterUpdateOperation(_entity, _user, _queryRunner) {}
+    async afterUpdateOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeDeleteOperation(_dto, _user, _queryRunner) {}
-    async afterDeleteOperation(_entity, _user, _queryRunner) {}
+    async afterDeleteOperation(_entity, _dto, _user, _queryRunner) {}
     async getFilterQuery(query, filter, _user) {
         Object.entries(filter).forEach(([key, value])=>{
             query.andWhere(`${this.entityName}.${key} = :value`, {

package/cjs/classes/{handle-custome-db-column-type.js → handle-custome-db.js}

@@ -9,6 +9,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    get buildQuery () {
+        return buildQuery;
+    },
     get getCastIntType () {
         return getCastIntType;
     },
@@ -27,3 +30,8 @@ function getCastIntType() {
     const driver = _nestjscore.envConfig.getTypeOrmConfig().type;
     return driver === 'postgres' ? 'INTEGER' : 'UNSIGNED';
 }
+function buildQuery(sql, dbType) {
+    if (dbType !== 'postgres') return sql;
+    let index = 0;
+    return sql.replace(/\?/g, ()=>`$${++index}`);
+}

package/cjs/classes/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./api-controller.class"), exports);
 _export_star(require("./api-service.class"), exports);
-_export_star(require("./handle-custome-db-column-type"), exports);
+_export_star(require("./handle-custome-db"), exports);
 _export_star(require("./hybrid-cache.class"), exports);
 _export_star(require("./winston.logger.class"), exports);
 _export_star(require("../constants/permissions"), exports);

package/cjs/constants/message-keys.js

@@ -33,6 +33,8 @@ const ERROR_MESSAGES = {
     UNAUTHORIZED: 'error.unauthorized',
     FORBIDDEN: 'error.forbidden',
     CONFLICT: 'error.conflict',
+    DB_FOREIGN_KEY: 'error.db.foreign.key',
+    DB_NOT_NULL: 'error.db.not.null',
     INTERNAL: 'error.internal',
     SERVICE_UNAVAILABLE: 'error.service.unavailable',
     UNKNOWN: 'error.unknown',

package/cjs/exceptions/base-app.exception.js

@@ -111,6 +111,12 @@ let ConflictException = class ConflictException extends BaseAppException {
         super({
             message: field ? `${entity} with this ${field} already exists` : `${entity} already exists`,
             messageKey: _messagekeys.ERROR_MESSAGES.CONFLICT,
+            messageVariables: {
+                entity,
+                ...field !== undefined && {
+                    field
+                }
+            },
             status: _common.HttpStatus.CONFLICT,
             metadata: {
                 entity,

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

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "GlobalExceptionFilter", {
     }
 });
 const _common = require("@nestjs/common");
+const _typeorm = require("typeorm");
 const _messagekeys = require("../constants/message-keys");
 const _baseappexception = require("../exceptions/base-app.exception");
 const _loggermiddleware = require("../middlewares/logger.middleware");
@@ -36,19 +37,14 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
         const ctx = host.switchToHttp();
         const request = ctx.getRequest();
         const response = ctx.getResponse();
-        const startTime = request._startTime || Date.now();
-        const responseTime = Date.now() - startTime;
+        const responseTime = Date.now() - (request._startTime || Date.now());
         const requestId = (0, _loggermiddleware.getRequestId)() || request.headers['x-request-id'] || 'no-request-id';
-        const userId = (0, _loggermiddleware.getUserId)();
-        const tenantId = (0, _loggermiddleware.getTenantId)();
-        const companyId = (0, _loggermiddleware.getCompanyId)();
-        const errorResponse = this.buildErrorResponse(exception, requestId, responseTime);
-        const statusCode = this.getStatusCode(exception);
+        const { statusCode, errorResponse } = this.resolveException(exception, requestId, responseTime);
         const logContext = {
             requestId,
-            userId,
-            tenantId,
-            companyId,
+            userId: (0, _loggermiddleware.getUserId)(),
+            tenantId: (0, _loggermiddleware.getTenantId)(),
+            companyId: (0, _loggermiddleware.getCompanyId)(),
             method: request.method,
             url: request.originalUrl,
             path: request.path,
@@ -56,67 +52,84 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
             duration: `${responseTime}ms`,
             messageKey: errorResponse.messageKey
         };
-        const logMessage = this.buildLogMessage(request, statusCode, responseTime, errorResponse);
+        const logMessage = `Exception caught "HTTP/1.1" "${request.method}" "${request.originalUrl}" - ${statusCode} "${errorResponse.messageKey}" ${responseTime}ms | ${errorResponse.message}`;
         if (statusCode >= 500) {
-            this.logger.error(logMessage, this.getStack(exception), logContext);
+            this.logger.error(logMessage, exception instanceof Error ? exception.stack : undefined, logContext);
         } else if (statusCode >= 400) {
             this.logger.warn(logMessage, logContext);
         }
         response.status(statusCode).json(errorResponse);
     }
-    buildErrorResponse(exception, requestId, responseTime) {
-        const timestamp = new Date().toISOString();
+    resolveException(exception, requestId, responseTime) {
+        const meta = {
+            requestId,
+            timestamp: new Date().toISOString(),
+            responseTime
+        };
         if (exception instanceof _baseappexception.BaseAppException) {
             return {
-                success: false,
-                message: exception.message,
-                messageKey: exception.messageKey,
-                messageVariables: exception.messageVariables,
-                errors: exception.errors,
-                _meta: {
-                    requestId,
-                    timestamp,
-                    responseTime
+                statusCode: exception.getStatus(),
+                errorResponse: {
+                    success: false,
+                    message: exception.message,
+                    messageKey: exception.messageKey,
+                    messageVariables: exception.messageVariables,
+                    errors: exception.errors,
+                    _meta: meta
                 }
             };
         }
         if (exception instanceof _common.HttpException) {
-            const response = exception.getResponse();
-            const { message, messageKey, messageVariables, errors } = this.extractHttpExceptionDetails(response);
+            const resolved = this.resolveHttpException(exception);
             return {
-                success: false,
-                message,
-                messageKey,
-                messageVariables,
-                errors,
-                _meta: {
-                    requestId,
-                    timestamp,
-                    responseTime
+                statusCode: resolved.statusCode,
+                errorResponse: {
+                    success: false,
+                    message: resolved.message,
+                    messageKey: resolved.messageKey,
+                    messageVariables: resolved.messageVariables,
+                    errors: resolved.errors,
+                    _meta: meta
                 }
             };
         }
+        if (exception instanceof _typeorm.QueryFailedError) {
+            const resolved = this.resolveQueryFailedError(exception);
+            if (resolved) {
+                return {
+                    statusCode: resolved.getStatus(),
+                    errorResponse: {
+                        success: false,
+                        message: resolved.message,
+                        messageKey: resolved.messageKey,
+                        messageVariables: resolved.messageVariables,
+                        _meta: meta
+                    }
+                };
+            }
+        }
         return {
-            success: false,
-            message: 'Internal server error',
-            messageKey: _messagekeys.ERROR_MESSAGES.INTERNAL,
-            _meta: {
-                requestId,
-                timestamp,
-                responseTime
+            statusCode: _common.HttpStatus.INTERNAL_SERVER_ERROR,
+            errorResponse: {
+                success: false,
+                message: 'Internal server error',
+                messageKey: _messagekeys.ERROR_MESSAGES.INTERNAL,
+                _meta: meta
             }
         };
     }
-    extractHttpExceptionDetails(response) {
+    resolveHttpException(exception) {
+        const statusCode = exception.getStatus();
+        const response = exception.getResponse();
         if (typeof response === 'string') {
             return {
+                statusCode,
                 message: response,
                 messageKey: _messagekeys.ERROR_MESSAGES.HTTP
             };
         }
         if (typeof response === 'object' && response !== null) {
             const obj = response;
-            // Handle class-validator validation errors
             if (Array.isArray(obj.message)) {
                 const errors = obj.message.map((msg)=>{
                     const [field, ...rest] = msg.split(' ');
@@ -126,12 +139,14 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
                     };
                 });
                 return {
+                    statusCode,
                     message: 'Validation failed',
                     messageKey: _messagekeys.ERROR_MESSAGES.VALIDATION,
                     errors
                 };
             }
             return {
+                statusCode,
                 message: String(obj.message || 'Unknown error'),
                 messageKey: String(obj.messageKey || _messagekeys.ERROR_MESSAGES.HTTP),
                 messageVariables: obj.messageVariables,
@@ -139,24 +154,48 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
             };
         }
         return {
+            statusCode,
             message: 'Unknown error',
             messageKey: _messagekeys.ERROR_MESSAGES.UNKNOWN
         };
     }
-    getStatusCode(exception) {
-        if (exception instanceof _common.HttpException) {
-            return exception.getStatus();
+    resolveQueryFailedError(exception) {
+        const dbError = exception;
+        const code = dbError.driverError?.code ?? dbError.code;
+        const number = dbError.driverError?.number ?? dbError.number;
+        const detail = dbError.driverError?.detail ?? dbError.detail ?? '';
+        const table = dbError.driverError?.table ?? dbError.table ?? 'record';
+        const column = dbError.driverError?.column ?? dbError.column;
+        const field = detail.match(/Key \(([^)]+)\)/)?.[1] ?? column;
+        if (code === '23505' || number === 2627) {
+            return new _baseappexception.ConflictException(this.toHumanReadable(table), field ? this.toHumanReadable(field) : undefined);
         }
-        return _common.HttpStatus.INTERNAL_SERVER_ERROR;
-    }
-    getStack(exception) {
-        if (exception instanceof Error) {
-            return exception.stack;
+        if (code === '23503' || number === 547) {
+            const humanField = field ? this.toHumanReadable(field) : undefined;
+            return new _baseappexception.BaseAppException({
+                message: humanField ? `Invalid reference for '${humanField}'` : 'Invalid reference',
+                messageKey: _messagekeys.ERROR_MESSAGES.DB_FOREIGN_KEY,
+                messageVariables: humanField ? {
+                    field: humanField
+                } : undefined,
+                status: _common.HttpStatus.BAD_REQUEST
+            });
+        }
+        if (code === '23502' || number === 515) {
+            const humanField = this.toHumanReadable(column ?? 'field');
+            return new _baseappexception.BaseAppException({
+                message: `Required field '${humanField}' cannot be null`,
+                messageKey: _messagekeys.ERROR_MESSAGES.DB_NOT_NULL,
+                messageVariables: {
+                    field: humanField
+                },
+                status: _common.HttpStatus.BAD_REQUEST
+            });
         }
-        return undefined;
+        return null;
     }
-    buildLogMessage(request, statusCode, responseTime, errorResponse) {
-        return `Exception caught "HTTP/1.1" "${request.method}" "${request.originalUrl}" - ${statusCode} "${errorResponse.messageKey}" ${responseTime}ms | ${errorResponse.message}`;
+    toHumanReadable(dbName) {
+        return dbName.split(', ').map((part)=>part.split('_').map((word)=>word.toLowerCase() === 'id' ? 'ID' : word.charAt(0).toUpperCase() + word.slice(1)).join(' ')).join(', ');
     }
     constructor(){
         _define_property(this, "logger", new _common.Logger('ExceptionFilter'));

package/classes/api-service.class.d.ts

@@ -41,13 +41,13 @@ export declare abstract class ApiService<CreateDtoT extends object, UpdateDtoT e
     private ensureArray;
     private executeInTransaction;
     protected beforeInsertOperation(_dto: CreateDtoT | Array<CreateDtoT>, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
-    protected afterInsertOperation(_entity: EntityT[], _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
+    protected afterInsertOperation(_entity: EntityT[], _dto: CreateDtoT | Array<CreateDtoT>, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     protected beforeUpdateOperation(_dto: UpdateDtoT | Array<UpdateDtoT>, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
-    protected afterUpdateOperation(_entity: EntityT[], _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
+    protected afterUpdateOperation(_entity: EntityT[], _dto: UpdateDtoT | Array<UpdateDtoT>, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     protected beforeDeleteOperation(_dto: DeleteDto, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     protected afterDeleteOperation(_entity: Array<{
         id: string;
-    }>, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
+    }>, _dto: DeleteDto, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     protected getFilterQuery(query: SelectQueryBuilder<EntityT>, filter: Record<string, unknown>, _user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<EntityT>;
         isRaw: boolean;

package/classes/{handle-custome-db-column-type.d.ts → handle-custome-db.d.ts}

@@ -1,2 +1,3 @@
 export declare function getJsonColumnType(): "simple-json" | "json" | "jsonb";
 export declare function getCastIntType(): string;
+export declare function buildQuery(sql: string, dbType: string): string;

package/classes/index.d.ts

@@ -1,6 +1,6 @@
 export * from './api-controller.class';
 export * from './api-service.class';
-export * from './handle-custome-db-column-type';
+export * from './handle-custome-db';
 export * from './hybrid-cache.class';
 export * from './winston.logger.class';
 export * from '../constants/permissions';

package/constants/message-keys.d.ts

@@ -10,6 +10,8 @@ export declare const ERROR_MESSAGES: {
     readonly UNAUTHORIZED: "error.unauthorized";
     readonly FORBIDDEN: "error.forbidden";
     readonly CONFLICT: "error.conflict";
+    readonly DB_FOREIGN_KEY: "error.db.foreign.key";
+    readonly DB_NOT_NULL: "error.db.not.null";
     readonly INTERNAL: "error.internal";
     readonly SERVICE_UNAVAILABLE: "error.service.unavailable";
     readonly UNKNOWN: "error.unknown";

package/fesm/classes/api-service.class.js

@@ -59,7 +59,7 @@ export class ApiService {
             await this.beforeInsertOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -71,7 +71,7 @@ export class ApiService {
             await this.beforeInsertOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
@@ -83,7 +83,7 @@ export class ApiService {
             await this.beforeUpdateOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -95,7 +95,7 @@ export class ApiService {
             await this.beforeUpdateOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
@@ -109,14 +109,14 @@ export class ApiService {
                 await this.beforeInsertOperation(toInsert, user, qr);
                 const insertedEntities = await this.convertRequestDtoToEntity(toInsert, user);
                 const insertedSaved = await qr.manager.save(this.repository.target, insertedEntities);
-                await this.afterInsertOperation(this.ensureArray(insertedSaved), user, qr);
+                await this.afterInsertOperation(this.ensureArray(insertedSaved), toInsert, user, qr);
                 allResults.push(...this.ensureArray(insertedSaved));
             }
             if (toUpdate.length > 0) {
                 await this.beforeUpdateOperation(toUpdate, user, qr);
                 const updatedEntities = await this.convertRequestDtoToEntity(toUpdate, user);
                 const updatedSaved = await qr.manager.save(this.repository.target, updatedEntities);
-                await this.afterUpdateOperation(this.ensureArray(updatedSaved), user, qr);
+                await this.afterUpdateOperation(this.ensureArray(updatedSaved), toUpdate, user, qr);
                 allResults.push(...this.ensureArray(updatedSaved));
             }
             return {
@@ -319,7 +319,7 @@ export class ApiService {
                     id
                 };
             });
-            await this.afterDeleteOperation(ids, user, queryRunner);
+            await this.afterDeleteOperation(ids, option, user, queryRunner);
             await queryRunner.commitTransaction();
             await Promise.all([
                 this.clearCacheForAll(),
@@ -380,11 +380,11 @@ export class ApiService {
         }
     }
     async beforeInsertOperation(_dto, _user, _queryRunner) {}
-    async afterInsertOperation(_entity, _user, _queryRunner) {}
+    async afterInsertOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeUpdateOperation(_dto, _user, _queryRunner) {}
-    async afterUpdateOperation(_entity, _user, _queryRunner) {}
+    async afterUpdateOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeDeleteOperation(_dto, _user, _queryRunner) {}
-    async afterDeleteOperation(_entity, _user, _queryRunner) {}
+    async afterDeleteOperation(_entity, _dto, _user, _queryRunner) {}
     async getFilterQuery(query, filter, _user) {
         Object.entries(filter).forEach(([key, value])=>{
             query.andWhere(`${this.entityName}.${key} = :value`, {

package/fesm/classes/{handle-custome-db-column-type.js → handle-custome-db.js}

@@ -9,3 +9,11 @@ export function getCastIntType() {
     const driver = envConfig.getTypeOrmConfig().type;
     return driver === 'postgres' ? 'INTEGER' : 'UNSIGNED';
 }
+/**
+ * Converts MySQL-style `?` placeholders to PostgreSQL `$1, $2, ...` placeholders.
+ * No-op for MySQL/MariaDB.
+ */ export function buildQuery(sql, dbType) {
+    if (dbType !== 'postgres') return sql;
+    let index = 0;
+    return sql.replace(/\?/g, ()=>`$${++index}`);
+}

package/fesm/classes/index.js

@@ -1,6 +1,6 @@
 export * from './api-controller.class';
 export * from './api-service.class';
-export * from './handle-custome-db-column-type';
+export * from './handle-custome-db';
 export * from './hybrid-cache.class';
 export * from './winston.logger.class';
 // Re-export permission constants for convenience

package/fesm/constants/message-keys.js

@@ -13,6 +13,8 @@ export const ERROR_MESSAGES = {
     UNAUTHORIZED: 'error.unauthorized',
     FORBIDDEN: 'error.forbidden',
     CONFLICT: 'error.conflict',
+    DB_FOREIGN_KEY: 'error.db.foreign.key',
+    DB_NOT_NULL: 'error.db.not.null',
     INTERNAL: 'error.internal',
     SERVICE_UNAVAILABLE: 'error.service.unavailable',
     UNKNOWN: 'error.unknown',

package/fesm/exceptions/base-app.exception.js

@@ -75,6 +75,12 @@ export class ConflictException extends BaseAppException {
         super({
             message: field ? `${entity} with this ${field} already exists` : `${entity} already exists`,
             messageKey: ERROR_MESSAGES.CONFLICT,
+            messageVariables: {
+                entity,
+                ...field !== undefined && {
+                    field
+                }
+            },
             status: HttpStatus.CONFLICT,
             metadata: {
                 entity,

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

@@ -18,27 +18,23 @@ function _ts_decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 import { Catch, HttpException, HttpStatus, Logger } from '@nestjs/common';
+import { QueryFailedError } from 'typeorm';
 import { ERROR_MESSAGES } from '../constants/message-keys';
-import { BaseAppException } from '../exceptions/base-app.exception';
-import { getRequestId, getUserId, getTenantId, getCompanyId } from '../middlewares/logger.middleware';
+import { BaseAppException, ConflictException } from '../exceptions/base-app.exception';
+import { getCompanyId, getRequestId, getTenantId, getUserId } from '../middlewares/logger.middleware';
 export class GlobalExceptionFilter {
     catch(exception, host) {
         const ctx = host.switchToHttp();
         const request = ctx.getRequest();
         const response = ctx.getResponse();
-        const startTime = request._startTime || Date.now();
-        const responseTime = Date.now() - startTime;
+        const responseTime = Date.now() - (request._startTime || Date.now());
         const requestId = getRequestId() || request.headers['x-request-id'] || 'no-request-id';
-        const userId = getUserId();
-        const tenantId = getTenantId();
-        const companyId = getCompanyId();
-        const errorResponse = this.buildErrorResponse(exception, requestId, responseTime);
-        const statusCode = this.getStatusCode(exception);
+        const { statusCode, errorResponse } = this.resolveException(exception, requestId, responseTime);
         const logContext = {
             requestId,
-            userId,
-            tenantId,
-            companyId,
+            userId: getUserId(),
+            tenantId: getTenantId(),
+            companyId: getCompanyId(),
             method: request.method,
             url: request.originalUrl,
             path: request.path,
@@ -46,67 +42,84 @@ export class GlobalExceptionFilter {
             duration: `${responseTime}ms`,
             messageKey: errorResponse.messageKey
         };
-        const logMessage = this.buildLogMessage(request, statusCode, responseTime, errorResponse);
+        const logMessage = `Exception caught "HTTP/1.1" "${request.method}" "${request.originalUrl}" - ${statusCode} "${errorResponse.messageKey}" ${responseTime}ms | ${errorResponse.message}`;
         if (statusCode >= 500) {
-            this.logger.error(logMessage, this.getStack(exception), logContext);
+            this.logger.error(logMessage, exception instanceof Error ? exception.stack : undefined, logContext);
         } else if (statusCode >= 400) {
             this.logger.warn(logMessage, logContext);
         }
         response.status(statusCode).json(errorResponse);
     }
-    buildErrorResponse(exception, requestId, responseTime) {
-        const timestamp = new Date().toISOString();
+    resolveException(exception, requestId, responseTime) {
+        const meta = {
+            requestId,
+            timestamp: new Date().toISOString(),
+            responseTime
+        };
         if (exception instanceof BaseAppException) {
             return {
-                success: false,
-                message: exception.message,
-                messageKey: exception.messageKey,
-                messageVariables: exception.messageVariables,
-                errors: exception.errors,
-                _meta: {
-                    requestId,
-                    timestamp,
-                    responseTime
+                statusCode: exception.getStatus(),
+                errorResponse: {
+                    success: false,
+                    message: exception.message,
+                    messageKey: exception.messageKey,
+                    messageVariables: exception.messageVariables,
+                    errors: exception.errors,
+                    _meta: meta
                 }
             };
         }
         if (exception instanceof HttpException) {
-            const response = exception.getResponse();
-            const { message, messageKey, messageVariables, errors } = this.extractHttpExceptionDetails(response);
+            const resolved = this.resolveHttpException(exception);
             return {
-                success: false,
-                message,
-                messageKey,
-                messageVariables,
-                errors,
-                _meta: {
-                    requestId,
-                    timestamp,
-                    responseTime
+                statusCode: resolved.statusCode,
+                errorResponse: {
+                    success: false,
+                    message: resolved.message,
+                    messageKey: resolved.messageKey,
+                    messageVariables: resolved.messageVariables,
+                    errors: resolved.errors,
+                    _meta: meta
                 }
             };
         }
+        if (exception instanceof QueryFailedError) {
+            const resolved = this.resolveQueryFailedError(exception);
+            if (resolved) {
+                return {
+                    statusCode: resolved.getStatus(),
+                    errorResponse: {
+                        success: false,
+                        message: resolved.message,
+                        messageKey: resolved.messageKey,
+                        messageVariables: resolved.messageVariables,
+                        _meta: meta
+                    }
+                };
+            }
+        }
         return {
-            success: false,
-            message: 'Internal server error',
-            messageKey: ERROR_MESSAGES.INTERNAL,
-            _meta: {
-                requestId,
-                timestamp,
-                responseTime
+            statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
+            errorResponse: {
+                success: false,
+                message: 'Internal server error',
+                messageKey: ERROR_MESSAGES.INTERNAL,
+                _meta: meta
             }
         };
     }
-    extractHttpExceptionDetails(response) {
+    resolveHttpException(exception) {
+        const statusCode = exception.getStatus();
+        const response = exception.getResponse();
         if (typeof response === 'string') {
             return {
+                statusCode,
                 message: response,
                 messageKey: ERROR_MESSAGES.HTTP
             };
         }
         if (typeof response === 'object' && response !== null) {
             const obj = response;
-            // Handle class-validator validation errors
             if (Array.isArray(obj.message)) {
                 const errors = obj.message.map((msg)=>{
                     const [field, ...rest] = msg.split(' ');
@@ -116,12 +129,14 @@ export class GlobalExceptionFilter {
                     };
                 });
                 return {
+                    statusCode,
                     message: 'Validation failed',
                     messageKey: ERROR_MESSAGES.VALIDATION,
                     errors
                 };
             }
             return {
+                statusCode,
                 message: String(obj.message || 'Unknown error'),
                 messageKey: String(obj.messageKey || ERROR_MESSAGES.HTTP),
                 messageVariables: obj.messageVariables,
@@ -129,24 +144,48 @@ export class GlobalExceptionFilter {
             };
         }
         return {
+            statusCode,
             message: 'Unknown error',
             messageKey: ERROR_MESSAGES.UNKNOWN
         };
     }
-    getStatusCode(exception) {
-        if (exception instanceof HttpException) {
-            return exception.getStatus();
+    resolveQueryFailedError(exception) {
+        const dbError = exception;
+        const code = dbError.driverError?.code ?? dbError.code;
+        const number = dbError.driverError?.number ?? dbError.number;
+        const detail = dbError.driverError?.detail ?? dbError.detail ?? '';
+        const table = dbError.driverError?.table ?? dbError.table ?? 'record';
+        const column = dbError.driverError?.column ?? dbError.column;
+        const field = detail.match(/Key \(([^)]+)\)/)?.[1] ?? column;
+        if (code === '23505' || number === 2627) {
+            return new ConflictException(this.toHumanReadable(table), field ? this.toHumanReadable(field) : undefined);
         }
-        return HttpStatus.INTERNAL_SERVER_ERROR;
-    }
-    getStack(exception) {
-        if (exception instanceof Error) {
-            return exception.stack;
+        if (code === '23503' || number === 547) {
+            const humanField = field ? this.toHumanReadable(field) : undefined;
+            return new BaseAppException({
+                message: humanField ? `Invalid reference for '${humanField}'` : 'Invalid reference',
+                messageKey: ERROR_MESSAGES.DB_FOREIGN_KEY,
+                messageVariables: humanField ? {
+                    field: humanField
+                } : undefined,
+                status: HttpStatus.BAD_REQUEST
+            });
+        }
+        if (code === '23502' || number === 515) {
+            const humanField = this.toHumanReadable(column ?? 'field');
+            return new BaseAppException({
+                message: `Required field '${humanField}' cannot be null`,
+                messageKey: ERROR_MESSAGES.DB_NOT_NULL,
+                messageVariables: {
+                    field: humanField
+                },
+                status: HttpStatus.BAD_REQUEST
+            });
         }
-        return undefined;
+        return null;
     }
-    buildLogMessage(request, statusCode, responseTime, errorResponse) {
-        return `Exception caught "HTTP/1.1" "${request.method}" "${request.originalUrl}" - ${statusCode} "${errorResponse.messageKey}" ${responseTime}ms | ${errorResponse.message}`;
+    toHumanReadable(dbName) {
+        return dbName.split(', ').map((part)=>part.split('_').map((word)=>word.toLowerCase() === 'id' ? 'ID' : word.charAt(0).toUpperCase() + word.slice(1)).join(' ')).join(', ');
     }
     constructor(){
         _define_property(this, "logger", new Logger('ExceptionFilter'));

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

@@ -2,9 +2,8 @@ import { ArgumentsHost, ExceptionFilter } from '@nestjs/common';
 export declare class GlobalExceptionFilter implements ExceptionFilter {
     private readonly logger;
     catch(exception: unknown, host: ArgumentsHost): void;
-    private buildErrorResponse;
-    private extractHttpExceptionDetails;
-    private getStatusCode;
-    private getStack;
-    private buildLogMessage;
+    private resolveException;
+    private resolveHttpException;
+    private resolveQueryFailedError;
+    private toHumanReadable;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-shared",
-  "version": "5.3.1",
+  "version": "5.4.1",
   "description": "Common shared utilities for Flusys NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -112,6 +112,6 @@
     "rxjs": "^7.8.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.3.1"
+    "@flusys/nestjs-core": "5.4.1"
   }
 }