@flusys/nestjs-shared 1.0.0-rc → 2.0.0

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

@@ -26,116 +26,52 @@ function _define_property(obj, key, value) {
 }
 let ApiService = class ApiService {
     async insert(dto, user) {
-        await this.ensureRepositoryInitialized();
-        const qr = this.repository.manager.connection.createQueryRunner();
-        await qr.connect();
-        await qr.startTransaction();
-        try {
+        return this.executeInTransaction('insert', async (qr)=>{
             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(saved, user, qr);
-            await qr.commitTransaction();
-            if (this.isCacheable) await Promise.all([
-                this.clearCacheForAll(),
-                this.clearCacheForId(Array.isArray(saved) ? saved : [
-                    saved
-                ])
-            ]);
-            const first = Array.isArray(saved) ? saved[0] : saved;
-            return this.convertEntityToResponseDto(first, false);
-        } catch (error) {
-            await qr.rollbackTransaction();
-            this.handleError(error, 'insert');
-        } finally{
-            await qr.release();
-        }
+            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            return {
+                saved,
+                returnFirst: true
+            };
+        });
     }
     async insertMany(dtos, user) {
-        await this.ensureRepositoryInitialized();
-        const qr = this.repository.manager.connection.createQueryRunner();
-        await qr.connect();
-        await qr.startTransaction();
-        try {
+        return this.executeInTransaction('insertMany', async (qr)=>{
             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(Array.isArray(saved) ? saved : [
-                saved
-            ], user, qr);
-            await qr.commitTransaction();
-            if (this.isCacheable) await Promise.all([
-                this.clearCacheForAll(),
-                this.clearCacheForId(Array.isArray(saved) ? saved : [
-                    saved
-                ])
-            ]);
-            const list = (Array.isArray(saved) ? saved : [
-                saved
-            ]).map((e)=>this.convertEntityToResponseDto(e, false));
-            return list;
-        } catch (error) {
-            await qr.rollbackTransaction();
-            this.handleError(error, 'insertMany');
-        } finally{
-            await qr.release();
-        }
+            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            return {
+                saved,
+                returnFirst: false
+            };
+        });
     }
     async update(dto, user) {
-        await this.ensureRepositoryInitialized();
-        const qr = this.repository.manager.connection.createQueryRunner();
-        await qr.connect();
-        await qr.startTransaction();
-        try {
+        return this.executeInTransaction('update', async (qr)=>{
             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(saved, user, qr);
-            await qr.commitTransaction();
-            if (this.isCacheable) await Promise.all([
-                this.clearCacheForAll(),
-                this.clearCacheForId(Array.isArray(saved) ? saved : [
-                    saved
-                ])
-            ]);
-            const first = Array.isArray(saved) ? saved[0] : saved;
-            return this.convertEntityToResponseDto(first, false);
-        } catch (error) {
-            await qr.rollbackTransaction();
-            this.handleError(error, 'update');
-        } finally{
-            await qr.release();
-        }
+            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            return {
+                saved,
+                returnFirst: true
+            };
+        });
     }
     async updateMany(dtos, user) {
-        await this.ensureRepositoryInitialized();
-        const qr = this.repository.manager.connection.createQueryRunner();
-        await qr.connect();
-        await qr.startTransaction();
-        try {
+        return this.executeInTransaction('updateMany', async (qr)=>{
             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(Array.isArray(saved) ? saved : [
-                saved
-            ], user, qr);
-            await qr.commitTransaction();
-            if (this.isCacheable) await Promise.all([
-                this.clearCacheForAll(),
-                this.clearCacheForId(Array.isArray(saved) ? saved : [
-                    saved
-                ])
-            ]);
-            const list = (Array.isArray(saved) ? saved : [
-                saved
-            ]).map((e)=>this.convertEntityToResponseDto(e, false));
-            return list;
-        } catch (error) {
-            await qr.rollbackTransaction();
-            this.handleError(error, 'updateMany');
-        } finally{
-            await qr.release();
-        }
+            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            return {
+                saved,
+                returnFirst: false
+            };
+        });
     }
     async findByIds(ids, user) {
         await this.ensureRepositoryInitialized();
@@ -354,6 +290,37 @@ let ApiService = class ApiService {
         });
         _errorhandlerutil.ErrorHandler.rethrowError(error);
     }
+    /** Ensures value is always an array */ ensureArray(value) {
+        return Array.isArray(value) ? value : [
+            value
+        ];
+    }
+    /** Executes operation in transaction with automatic cache clearing */ async executeInTransaction(operation, fn) {
+        await this.ensureRepositoryInitialized();
+        const qr = this.repository.manager.connection.createQueryRunner();
+        await qr.connect();
+        await qr.startTransaction();
+        try {
+            const { saved, returnFirst } = await fn(qr);
+            await qr.commitTransaction();
+            const savedArray = this.ensureArray(saved);
+            if (this.isCacheable) {
+                await Promise.all([
+                    this.clearCacheForAll(),
+                    this.clearCacheForId(savedArray)
+                ]);
+            }
+            if (returnFirst) {
+                return this.convertEntityToResponseDto(savedArray[0], false);
+            }
+            return savedArray.map((e)=>this.convertEntityToResponseDto(e, false));
+        } catch (error) {
+            await qr.rollbackTransaction();
+            this.handleError(error, operation);
+        } finally{
+            await qr.release();
+        }
+    }
     // Hooks (override in child classes)
     async ensureRepositoryInitialized() {}
     async beforeInsertOperation(_dto, _user, _queryRunner) {}

package/cjs/classes/winston-logger-adapter.class.js

@@ -47,46 +47,31 @@ function _define_property(obj, key, value) {
     return meta;
 }
 let WinstonLoggerAdapter = class WinstonLoggerAdapter {
-    log(message, context, ...args) {
-        const meta = args.length > 0 && typeof args[0] === 'object' ? args[0] : {};
-        _winstonloggerclass.instance.info(message, {
+    buildLogMeta(context, args, extra) {
+        const meta = args?.length && typeof args[0] === 'object' ? args[0] : {};
+        return {
             context: context || this.context,
             ...getCorrelationMeta(),
-            ...meta
-        });
+            ...meta,
+            ...extra
+        };
+    }
+    log(message, context, ...args) {
+        _winstonloggerclass.instance.info(message, this.buildLogMeta(context, args));
     }
     error(message, trace, context, ...args) {
-        const meta = args.length > 0 && typeof args[0] === 'object' ? args[0] : {};
-        _winstonloggerclass.instance.error(message, {
-            context: context || this.context,
-            stack: trace,
-            ...getCorrelationMeta(),
-            ...meta
-        });
+        _winstonloggerclass.instance.error(message, this.buildLogMeta(context, args, {
+            stack: trace
+        }));
     }
     warn(message, context, ...args) {
-        const meta = args.length > 0 && typeof args[0] === 'object' ? args[0] : {};
-        _winstonloggerclass.instance.warn(message, {
-            context: context || this.context,
-            ...getCorrelationMeta(),
-            ...meta
-        });
+        _winstonloggerclass.instance.warn(message, this.buildLogMeta(context, args));
     }
     debug(message, context, ...args) {
-        const meta = args.length > 0 && typeof args[0] === 'object' ? args[0] : {};
-        _winstonloggerclass.instance.debug(message, {
-            context: context || this.context,
-            ...getCorrelationMeta(),
-            ...meta
-        });
+        _winstonloggerclass.instance.debug(message, this.buildLogMeta(context, args));
     }
     verbose(message, context, ...args) {
-        const meta = args.length > 0 && typeof args[0] === 'object' ? args[0] : {};
-        _winstonloggerclass.instance.verbose(message, {
-            context: context || this.context,
-            ...getCorrelationMeta(),
-            ...meta
-        });
+        _winstonloggerclass.instance.verbose(message, this.buildLogMeta(context, args));
     }
     constructor(context){
         _define_property(this, "context", void 0);
@@ -94,25 +79,23 @@ let WinstonLoggerAdapter = class WinstonLoggerAdapter {
     }
 };
 let NestLoggerAdapter = class NestLoggerAdapter {
+    formatMessage(message, args) {
+        return args?.length ? `${message} ${JSON.stringify(args)}` : message;
+    }
     log(message, context, ...args) {
-        const logMessage = args.length > 0 ? `${message} ${JSON.stringify(args)}` : message;
-        this.logger.log(logMessage, context);
+        this.logger.log(this.formatMessage(message, args), context);
     }
     error(message, trace, context, ...args) {
-        const logMessage = args.length > 0 ? `${message} ${JSON.stringify(args)}` : message;
-        this.logger.error(logMessage, trace, context);
+        this.logger.error(this.formatMessage(message, args), trace, context);
     }
     warn(message, context, ...args) {
-        const logMessage = args.length > 0 ? `${message} ${JSON.stringify(args)}` : message;
-        this.logger.warn(logMessage, context);
+        this.logger.warn(this.formatMessage(message, args), context);
     }
     debug(message, context, ...args) {
-        const logMessage = args.length > 0 ? `${message} ${JSON.stringify(args)}` : message;
-        this.logger.debug(logMessage, context);
+        this.logger.debug(this.formatMessage(message, args), context);
     }
     verbose(message, context, ...args) {
-        const logMessage = args.length > 0 ? `${message} ${JSON.stringify(args)}` : message;
-        this.logger.verbose(logMessage, context);
+        this.logger.verbose(this.formatMessage(message, args), context);
     }
     constructor(logger){
         _define_property(this, "logger", void 0);

package/cjs/constants/permissions.js

@@ -46,6 +46,9 @@ _export(exports, {
     get FORM_PERMISSIONS () {
         return FORM_PERMISSIONS;
     },
+    get FORM_RESULT_PERMISSIONS () {
+        return FORM_RESULT_PERMISSIONS;
+    },
     get PERMISSIONS () {
         return PERMISSIONS;
     },
@@ -150,6 +153,12 @@ const FORM_PERMISSIONS = {
     UPDATE: 'form.update',
     DELETE: 'form.delete'
 };
+const FORM_RESULT_PERMISSIONS = {
+    CREATE: 'form-result.create',
+    READ: 'form-result.read',
+    UPDATE: 'form-result.update',
+    DELETE: 'form-result.delete'
+};
 const PERMISSIONS = {
     // Auth
     USER: USER_PERMISSIONS,
@@ -170,5 +179,6 @@ const PERMISSIONS = {
     EMAIL_CONFIG: EMAIL_CONFIG_PERMISSIONS,
     EMAIL_TEMPLATE: EMAIL_TEMPLATE_PERMISSIONS,
     // Form Builder
-    FORM: FORM_PERMISSIONS
+    FORM: FORM_PERMISSIONS,
+    FORM_RESULT: FORM_RESULT_PERMISSIONS
 };

package/cjs/dtos/delete.dto.js

@@ -36,6 +36,7 @@ let DeleteDto = class DeleteDto {
     constructor(){
         _define_property(this, "id", void 0);
         _define_property(this, "type", void 0);
+        _define_property(this, "deletedById", void 0);
     }
 };
 _ts_decorate([
@@ -80,3 +81,12 @@ _ts_decorate([
     ]),
     _ts_metadata("design:type", String)
 ], DeleteDto.prototype, "type", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'User ID who initiated the deletion (auto-set by interceptor)',
+        example: 'f2e9c8d0-7a2a-11eb-9439-0242ac130002'
+    }),
+    (0, _classvalidator.IsOptional)(),
+    (0, _classvalidator.IsUUID)(),
+    _ts_metadata("design:type", String)
+], DeleteDto.prototype, "deletedById", void 0);

package/cjs/dtos/response-payload.dto.js

@@ -15,9 +15,6 @@ _export(exports, {
     get BulkResponseDto () {
         return BulkResponseDto;
     },
-    get ErrorResponseDto () {
-        return ErrorResponseDto;
-    },
     get ListResponseDto () {
         return ListResponseDto;
     },
@@ -32,9 +29,6 @@ _export(exports, {
     },
     get SingleResponseDto () {
         return SingleResponseDto;
-    },
-    get ValidationErrorDto () {
-        return ValidationErrorDto;
     }
 });
 const _swagger = require("@nestjs/swagger");
@@ -301,72 +295,3 @@ _ts_decorate([
 MessageResponseDto = _ts_decorate([
     (0, _swagger.ApiExtraModels)()
 ], MessageResponseDto);
-let ValidationErrorDto = class ValidationErrorDto {
-    constructor(){
-        _define_property(this, "field", void 0);
-        _define_property(this, "message", void 0);
-        _define_property(this, "constraint", void 0);
-    }
-};
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        example: 'email'
-    }),
-    _ts_metadata("design:type", String)
-], ValidationErrorDto.prototype, "field", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        example: 'Invalid email format'
-    }),
-    _ts_metadata("design:type", String)
-], ValidationErrorDto.prototype, "message", void 0);
-_ts_decorate([
-    (0, _swagger.ApiPropertyOptional)({
-        example: 'isEmail'
-    }),
-    _ts_metadata("design:type", String)
-], ValidationErrorDto.prototype, "constraint", void 0);
-let ErrorResponseDto = class ErrorResponseDto {
-    constructor(){
-        _define_property(this, "success", void 0);
-        _define_property(this, "message", void 0);
-        _define_property(this, "code", void 0);
-        _define_property(this, "errors", void 0);
-        _define_property(this, "_meta", void 0);
-    }
-};
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        example: false
-    }),
-    _ts_metadata("design:type", Boolean)
-], ErrorResponseDto.prototype, "success", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        example: 'Validation failed'
-    }),
-    _ts_metadata("design:type", String)
-], ErrorResponseDto.prototype, "message", void 0);
-_ts_decorate([
-    (0, _swagger.ApiPropertyOptional)({
-        example: 'VALIDATION_ERROR'
-    }),
-    _ts_metadata("design:type", String)
-], ErrorResponseDto.prototype, "code", void 0);
-_ts_decorate([
-    (0, _swagger.ApiPropertyOptional)({
-        type: [
-            ValidationErrorDto
-        ]
-    }),
-    _ts_metadata("design:type", Array)
-], ErrorResponseDto.prototype, "errors", void 0);
-_ts_decorate([
-    (0, _swagger.ApiPropertyOptional)({
-        type: RequestMetaDto
-    }),
-    _ts_metadata("design:type", typeof RequestMetaDto === "undefined" ? Object : RequestMetaDto)
-], ErrorResponseDto.prototype, "_meta", void 0);
-ErrorResponseDto = _ts_decorate([
-    (0, _swagger.ApiExtraModels)()
-], ErrorResponseDto);

package/cjs/guards/permission.guard.js

@@ -76,17 +76,7 @@ let PermissionGuard = class PermissionGuard {
                 throw new _permissionexception.InsufficientPermissionsException(result.missingPermissions, result.operator);
             }
         } else {
-            let hasRequired;
-            if (operator === 'or') {
-                hasRequired = requiredPermissions.some((p)=>this.hasPermission(userPermissions, p));
-                if (!hasRequired) throw new _permissionexception.InsufficientPermissionsException(requiredPermissions, 'or');
-            } else {
-                hasRequired = requiredPermissions.every((p)=>this.hasPermission(userPermissions, p));
-                if (!hasRequired) {
-                    const missing = requiredPermissions.filter((p)=>!this.hasPermission(userPermissions, p));
-                    throw new _permissionexception.InsufficientPermissionsException(missing, 'and');
-                }
-            }
+            this.validateSimplePermissions(requiredPermissions, userPermissions, operator);
         }
         return true;
     }
@@ -100,6 +90,18 @@ let PermissionGuard = class PermissionGuard {
             operator: config.operator || 'and'
         };
     }
+    validateSimplePermissions(requiredPermissions, userPermissions, operator) {
+        if (operator === 'or') {
+            const hasAny = requiredPermissions.some((p)=>this.hasPermission(userPermissions, p));
+            if (!hasAny) throw new _permissionexception.InsufficientPermissionsException(requiredPermissions, 'or');
+        } else {
+            const hasAll = requiredPermissions.every((p)=>this.hasPermission(userPermissions, p));
+            if (!hasAll) {
+                const missing = requiredPermissions.filter((p)=>!this.hasPermission(userPermissions, p));
+                throw new _permissionexception.InsufficientPermissionsException(missing, 'and');
+            }
+        }
+    }
     isNestedCondition(config) {
         if (Array.isArray(config)) return false;
         return 'children' in config && Array.isArray(config.children) && config.children.length > 0;
@@ -156,15 +158,14 @@ let PermissionGuard = class PermissionGuard {
     }
     async getUserPermissions(user) {
         if (!this.cache) throw new _permissionexception.PermissionSystemUnavailableException();
-        let cacheKey;
+        const cacheKey = this.buildPermissionCacheKey(user);
+        return await this.cache.get(cacheKey) || [];
+    }
+    buildPermissionCacheKey(user) {
         if (this.config.enableCompanyFeature && user.companyId) {
-            const format = this.config.companyPermissionKeyFormat || `${_constants.PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`;
-            cacheKey = format.replace('{userId}', user.id).replace('{companyId}', user.companyId).replace('{branchId}', user.branchId || 'null');
-        } else {
-            const format = this.config.userPermissionKeyFormat || `${_constants.PERMISSIONS_CACHE_PREFIX}:user:{userId}`;
-            cacheKey = format.replace('{userId}', user.id);
+            return (this.config.companyPermissionKeyFormat || `${_constants.PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`).replace('{userId}', user.id).replace('{companyId}', user.companyId).replace('{branchId}', user.branchId || 'null');
         }
-        return await this.cache.get(cacheKey) || [];
+        return (this.config.userPermissionKeyFormat || `${_constants.PERMISSIONS_CACHE_PREFIX}:user:{userId}`).replace('{userId}', user.id);
     }
     hasPermission(userPermissions, requiredPermission) {
         if (userPermissions.includes(requiredPermission)) return true;

package/cjs/interceptors/index.js

@@ -7,9 +7,6 @@ _export_star(require("./idempotency.interceptor"), exports);
 _export_star(require("./query-performance.interceptor"), exports);
 _export_star(require("./response-meta.interceptor"), exports);
 _export_star(require("./set-user-field-on-body.interceptor"), exports);
-_export_star(require("./set-create-by-on-body.interceptor"), exports);
-_export_star(require("./set-delete-by-on-body.interceptor"), exports);
-_export_star(require("./set-update-by-on-body.interceptor"), exports);
 _export_star(require("./slug.interceptor"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/cjs/interceptors/set-user-field-on-body.interceptor.js

@@ -2,9 +2,23 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "createSetUserFieldInterceptor", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get SetCreatedByOnBody () {
+        return SetCreatedByOnBody;
+    },
+    get SetDeletedByOnBody () {
+        return SetDeletedByOnBody;
+    },
+    get SetUpdateByOnBody () {
+        return SetUpdateByOnBody;
+    },
+    get createSetUserFieldInterceptor () {
         return createSetUserFieldInterceptor;
     }
 });
@@ -41,3 +55,6 @@ function createSetUserFieldInterceptor(fieldName) {
     ], SetUserFieldOnBody);
     return SetUserFieldOnBody;
 }
+const SetCreatedByOnBody = createSetUserFieldInterceptor('createdById');
+const SetUpdateByOnBody = createSetUserFieldInterceptor('updatedById');
+const SetDeletedByOnBody = createSetUserFieldInterceptor('deletedById');