@nest-omni/core 3.1.2-9 → 4.1.2

package/audit/audit.module.js

@@ -58,20 +58,6 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 },
                 inject: [(0, typeorm_1.getDataSourceToken)(auditConnectionName)],
             },
-            {
-                provide: (0, typeorm_1.getRepositoryToken)(entities_1.OperationTemplateEntity),
-                useFactory: (dataSource) => {
-                    return dataSource.getRepository(entities_1.OperationTemplateEntity);
-                },
-                inject: [(0, typeorm_1.getDataSourceToken)(auditConnectionName)],
-            },
-            {
-                provide: (0, typeorm_1.getRepositoryToken)(entities_1.ManualOperationLogEntity),
-                useFactory: (dataSource) => {
-                    return dataSource.getRepository(entities_1.ManualOperationLogEntity);
-                },
-                inject: [(0, typeorm_1.getDataSourceToken)(auditConnectionName)],
-            },
             {
                 provide: 'AUDIT_ENTITY_MANAGER',
                 useFactory: (dataSource) => {
@@ -83,12 +69,7 @@ let AuditModule = AuditModule_1 = class AuditModule {
         return {
             module: AuditModule_1,
             imports: [
-                typeorm_1.TypeOrmModule.forFeature([
-                    entities_1.EntityAuditLogEntity,
-                    entities_1.EntityTransactionEntity,
-                    entities_1.OperationTemplateEntity,
-                    entities_1.ManualOperationLogEntity,
-                ], auditConnectionName),
+                typeorm_1.TypeOrmModule.forFeature([entities_1.EntityAuditLogEntity, entities_1.EntityTransactionEntity], auditConnectionName),
                 nestjs_cls_1.ClsModule.forRoot({
                     global: true,
                     middleware: { mount: true },
@@ -114,7 +95,6 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 ...repositoryProviders,
                 services_1.EntityAuditService,
                 services_1.TransactionAuditService,
-                services_1.OperationDescriptionService,
                 interceptors_1.AuditInterceptor,
                 ...subscriberProviders,
             ],
@@ -124,7 +104,6 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.MultiDatabaseService,
                 services_1.EntityAuditService,
                 services_1.TransactionAuditService,
-                services_1.OperationDescriptionService,
                 interceptors_1.AuditInterceptor,
             ],
         };
@@ -232,7 +211,6 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 ...repositoryProviders,
                 services_1.EntityAuditService,
                 services_1.TransactionAuditService,
-                services_1.OperationDescriptionService,
                 interceptors_1.AuditInterceptor,
             ],
             exports: [
@@ -241,7 +219,6 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.MultiDatabaseService,
                 services_1.EntityAuditService,
                 services_1.TransactionAuditService,
-                services_1.OperationDescriptionService,
                 interceptors_1.AuditInterceptor,
             ],
         };

package/audit/decorators/audit-controller.decorator.d.ts

@@ -1,5 +1,5 @@
 import { ControllerAuditOptions, MethodAuditOptions } from '../interfaces';
 export declare const CONTROLLER_AUDIT_OPTIONS: unique symbol;
 export declare const METHOD_AUDIT_OPTIONS: unique symbol;
-export declare function AuditController(options?: ControllerAuditOptions): ClassDecorator;
+export declare function EntityAuditController(options?: ControllerAuditOptions): ClassDecorator;
 export declare function AuditMethod(options?: MethodAuditOptions): MethodDecorator;

package/audit/decorators/audit-controller.decorator.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.METHOD_AUDIT_OPTIONS = exports.CONTROLLER_AUDIT_OPTIONS = void 0;
-exports.AuditController = AuditController;
+exports.EntityAuditController = EntityAuditController;
 exports.AuditMethod = AuditMethod;
 exports.CONTROLLER_AUDIT_OPTIONS = Symbol('CONTROLLER_AUDIT_OPTIONS');
 exports.METHOD_AUDIT_OPTIONS = Symbol('METHOD_AUDIT_OPTIONS');
-function AuditController(options) {
+function EntityAuditController(options) {
     return (target) => {
         Reflect.defineMetadata(exports.CONTROLLER_AUDIT_OPTIONS, options || {}, target);
     };

package/audit/decorators/audit-operation.decorator.d.ts

@@ -3,5 +3,3 @@ export declare const AUDIT_OPERATION_OPTIONS: unique symbol;
 export declare function AuditLog(options: AuditOperationOptions): MethodDecorator;
 export declare function getAuditOperationConfig(target: any, propertyKey: string | symbol): AuditOperationOptions | undefined;
 export declare function hasAuditOperation(target: any, propertyKey: string | symbol): boolean;
-export declare const LogOperation: typeof AuditLog;
-export declare const AuditOperation: typeof AuditLog;

package/audit/decorators/audit-operation.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuditOperation = exports.LogOperation = exports.AUDIT_OPERATION_OPTIONS = void 0;
+exports.AUDIT_OPERATION_OPTIONS = void 0;
 exports.AuditLog = AuditLog;
 exports.getAuditOperationConfig = getAuditOperationConfig;
 exports.hasAuditOperation = hasAuditOperation;
@@ -21,5 +21,3 @@ function getAuditOperationConfig(target, propertyKey) {
 function hasAuditOperation(target, propertyKey) {
     return Reflect.hasMetadata(exports.AUDIT_OPERATION_OPTIONS, target, propertyKey);
 }
-exports.LogOperation = AuditLog;
-exports.AuditOperation = AuditLog;

package/audit/decorators/entity-audit.decorator.d.ts

@@ -1,10 +1,5 @@
 import { EntityAuditConfig, FieldDisplayOptions } from '../interfaces';
 export declare const ENTITY_AUDIT_OPTIONS: unique symbol;
 export declare const FIELD_AUDIT_OPTIONS: unique symbol;
-export declare function AuditEntity(options?: EntityAuditConfig): ClassDecorator;
+export declare function EntityAudit(options?: EntityAuditConfig): ClassDecorator;
 export declare function AuditField(options?: FieldDisplayOptions): PropertyDecorator;
-export declare function getEntityAuditConfig(target: any): EntityAuditConfig;
-export declare function getFieldAuditConfig(target: any): Record<string, FieldDisplayOptions>;
-export declare function getFieldLabel(target: any, fieldName: string, language?: string): string;
-export declare function getFieldValueLabel(target: any, fieldName: string, value: any, language?: string): string;
-export declare const EntityAudit: typeof AuditEntity;

package/audit/decorators/entity-audit.decorator.js

@@ -1,32 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityAudit = exports.FIELD_AUDIT_OPTIONS = exports.ENTITY_AUDIT_OPTIONS = void 0;
-exports.AuditEntity = AuditEntity;
+exports.FIELD_AUDIT_OPTIONS = exports.ENTITY_AUDIT_OPTIONS = void 0;
+exports.EntityAudit = EntityAudit;
 exports.AuditField = AuditField;
-exports.getEntityAuditConfig = getEntityAuditConfig;
-exports.getFieldAuditConfig = getFieldAuditConfig;
-exports.getFieldLabel = getFieldLabel;
-exports.getFieldValueLabel = getFieldValueLabel;
 exports.ENTITY_AUDIT_OPTIONS = Symbol('ENTITY_AUDIT_OPTIONS');
 exports.FIELD_AUDIT_OPTIONS = Symbol('FIELD_AUDIT_OPTIONS');
-function AuditEntity(options) {
+function EntityAudit(options) {
     return (target) => {
-        const mergedOptions = Object.assign(Object.assign({}, options), { maskFields: [
-                ...((options === null || options === void 0 ? void 0 : options.maskFields) || []),
-                ...((options === null || options === void 0 ? void 0 : options.sensitiveFields) || []),
-            ] });
-        if (mergedOptions.maskFields && mergedOptions.maskFields.length > 0) {
-            mergedOptions.maskFields = [...new Set(mergedOptions.maskFields)];
-        }
-        Reflect.defineMetadata(exports.ENTITY_AUDIT_OPTIONS, mergedOptions, target);
-        if (mergedOptions.templateKey) {
-            Reflect.defineMetadata('entity-log:enabled', true, target);
-            Reflect.defineMetadata('entity-log:options', {
-                templateKey: mergedOptions.templateKey,
-                excludeFields: mergedOptions.excludeFields,
-                sensitiveFields: mergedOptions.maskFields,
-            }, target);
-        }
+        Reflect.defineMetadata(exports.ENTITY_AUDIT_OPTIONS, options || {}, target);
     };
 }
 function AuditField(options) {
@@ -36,35 +17,3 @@ function AuditField(options) {
         Reflect.defineMetadata(exports.FIELD_AUDIT_OPTIONS, existingOptions, target.constructor);
     };
 }
-function getEntityAuditConfig(target) {
-    return Reflect.getMetadata(exports.ENTITY_AUDIT_OPTIONS, target) || {};
-}
-function getFieldAuditConfig(target) {
-    return Reflect.getMetadata(exports.FIELD_AUDIT_OPTIONS, target) || {};
-}
-function getFieldLabel(target, fieldName, language = 'zh') {
-    var _a;
-    const fieldConfig = getFieldAuditConfig(target);
-    const label = (_a = fieldConfig[fieldName]) === null || _a === void 0 ? void 0 : _a.label;
-    if (!label) {
-        return fieldName;
-    }
-    if (typeof label === 'string') {
-        return label;
-    }
-    return label[language] || label['zh'] || fieldName;
-}
-function getFieldValueLabel(target, fieldName, value, language = 'zh') {
-    var _a;
-    const fieldConfig = getFieldAuditConfig(target);
-    const valueLabels = (_a = fieldConfig[fieldName]) === null || _a === void 0 ? void 0 : _a.valueLabels;
-    if (!valueLabels || !valueLabels[value]) {
-        return value;
-    }
-    const labelMap = valueLabels[value];
-    if (typeof labelMap === 'string') {
-        return labelMap;
-    }
-    return labelMap[language] || labelMap['zh'] || value;
-}
-exports.EntityAudit = AuditEntity;

package/audit/decorators/index.d.ts

@@ -1,3 +1,2 @@
 export * from './entity-audit.decorator';
 export * from './audit-controller.decorator';
-export * from './audit-operation.decorator';

package/audit/decorators/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./entity-audit.decorator"), exports);
 __exportStar(require("./audit-controller.decorator"), exports);
-__exportStar(require("./audit-operation.decorator"), exports);

package/audit/entities/entity-audit-log.entity.d.ts

@@ -1,6 +1,5 @@
 import { AbstractUuidPrimaryEntity } from '../../common/abstract.entity';
 import { AuditOperation } from '../enums';
-import { ChangeDetail, RollbackAction } from '../interfaces';
 export declare class EntityAuditLogEntity extends AbstractUuidPrimaryEntity {
     entityType: string;
     entityId: string;
@@ -16,8 +15,4 @@ export declare class EntityAuditLogEntity extends AbstractUuidPrimaryEntity {
     userAgent: string;
     description: string;
     hashChain: Record<string, any>;
-    operationTemplateKey: string;
-    descriptionParams: Record<string, any>;
-    changeDetails: ChangeDetail[];
-    rollbackActions: RollbackAction[];
 }

package/audit/entities/entity-audit-log.entity.js

@@ -72,39 +72,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'json', nullable: true, comment: '哈希链' }),
     __metadata("design:type", Object)
 ], EntityAuditLogEntity.prototype, "hashChain", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true, comment: '操作模板键，用于动态生成描述' }),
-    __metadata("design:type", String)
-], EntityAuditLogEntity.prototype, "operationTemplateKey", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'json',
-        nullable: true,
-        comment: '描述参数，用于填充模板占位符',
-    }),
-    __metadata("design:type", Object)
-], EntityAuditLogEntity.prototype, "descriptionParams", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'json',
-        nullable: true,
-        comment: '结构化变更详情列表（包含多语言支持）',
-    }),
-    __metadata("design:type", Array)
-], EntityAuditLogEntity.prototype, "changeDetails", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'json',
-        nullable: true,
-        comment: '回滚操作列表',
-    }),
-    __metadata("design:type", Array)
-], EntityAuditLogEntity.prototype, "rollbackActions", void 0);
 exports.EntityAuditLogEntity = EntityAuditLogEntity = __decorate([
     (0, typeorm_1.Entity)('entity_audit_log'),
     (0, typeorm_1.Index)('idx_entity_relation', ['entityType', 'entityId']),
     (0, typeorm_1.Index)('idx_operation', ['operation']),
     (0, typeorm_1.Index)('idx_user', ['userId']),
-    (0, typeorm_1.Index)('idx_created_at', ['createdAt']),
-    (0, typeorm_1.Index)('idx_template_key', ['operationTemplateKey'])
+    (0, typeorm_1.Index)('idx_created_at', ['createdAt'])
 ], EntityAuditLogEntity);

package/audit/entities/entity-transaction.entity.d.ts

@@ -1,6 +1,5 @@
 import { AbstractUuidPrimaryEntity } from '../../common/abstract.entity';
 import { AuditOperation, TransactionStatus } from '../enums';
-import { ManualOperationLogEntity } from './manual-operation-log.entity';
 export declare class EntityTransactionEntity extends AbstractUuidPrimaryEntity {
     description: string;
     status: TransactionStatus;
@@ -12,10 +11,4 @@ export declare class EntityTransactionEntity extends AbstractUuidPrimaryEntity {
     userId: string;
     username: string;
     dependencyGraph: Record<string, any>;
-    operationTemplateKey: string;
-    descriptionParams: Record<string, any>;
-    requestIp: string;
-    metadata: Record<string, any>;
-    completedAt: Date;
-    manualOperations: ManualOperationLogEntity[];
 }

package/audit/entities/entity-transaction.entity.js

@@ -43,38 +43,9 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'json', nullable: true, comment: '依赖图' }),
     __metadata("design:type", Object)
 ], EntityTransactionEntity.prototype, "dependencyGraph", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true, comment: '操作模板键（事务级别）' }),
-    __metadata("design:type", String)
-], EntityTransactionEntity.prototype, "operationTemplateKey", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'json',
-        nullable: true,
-        comment: '描述参数，用于填充事务级别的模板占位符',
-    }),
-    __metadata("design:type", Object)
-], EntityTransactionEntity.prototype, "descriptionParams", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true, comment: '请求IP' }),
-    __metadata("design:type", String)
-], EntityTransactionEntity.prototype, "requestIp", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'json', nullable: true, comment: '事务元数据' }),
-    __metadata("design:type", Object)
-], EntityTransactionEntity.prototype, "metadata", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true, comment: '完成时间' }),
-    __metadata("design:type", Date)
-], EntityTransactionEntity.prototype, "completedAt", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)('ManualOperationLogEntity', (log) => log.transaction),
-    __metadata("design:type", Array)
-], EntityTransactionEntity.prototype, "manualOperations", void 0);
 exports.EntityTransactionEntity = EntityTransactionEntity = __decorate([
     (0, typeorm_1.Entity)('entity_transaction'),
     (0, typeorm_1.Index)('idx_status', ['status']),
     (0, typeorm_1.Index)('idx_user', ['userId']),
-    (0, typeorm_1.Index)('idx_created_at', ['createdAt']),
-    (0, typeorm_1.Index)('idx_template_key', ['operationTemplateKey'])
+    (0, typeorm_1.Index)('idx_created_at', ['createdAt'])
 ], EntityTransactionEntity);

package/audit/entities/index.d.ts

@@ -1,4 +1,2 @@
 export * from './entity-audit-log.entity';
 export * from './entity-transaction.entity';
-export * from './operation-template.entity';
-export * from './manual-operation-log.entity';

package/audit/entities/index.js

@@ -16,5 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./entity-audit-log.entity"), exports);
 __exportStar(require("./entity-transaction.entity"), exports);
-__exportStar(require("./operation-template.entity"), exports);
-__exportStar(require("./manual-operation-log.entity"), exports);

package/audit/entities/manual-operation-log.entity.d.ts

@@ -5,6 +5,8 @@ export declare class ManualOperationLogEntity extends AbstractUuidPrimaryEntity
     transactionId: string;
     operationTemplateKey: string;
     descriptionParams: Record<string, any>;
+    directDescription: string | Record<string, string>;
+    inlineTemplate: Record<string, string>;
     userId: string;
     username: string;
     requestIp: string;

package/audit/entities/manual-operation-log.entity.js

@@ -17,20 +17,37 @@ let ManualOperationLogEntity = class ManualOperationLogEntity extends abstract_e
 };
 exports.ManualOperationLogEntity = ManualOperationLogEntity;
 __decorate([
-    (0, typeorm_1.Column)({ comment: '关联的事务ID' }),
+    (0, typeorm_1.Column)({ nullable: true, comment: '关联的事务ID' }),
     __metadata("design:type", String)
 ], ManualOperationLogEntity.prototype, "transactionId", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ comment: '操作模板键' }),
+    (0, typeorm_1.Column)({ nullable: true, comment: '操作模板键（模板键模式）' }),
     __metadata("design:type", String)
 ], ManualOperationLogEntity.prototype, "operationTemplateKey", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: 'json',
+        nullable: true,
         comment: '描述参数，用于填充模板占位符',
     }),
     __metadata("design:type", Object)
 ], ManualOperationLogEntity.prototype, "descriptionParams", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'json',
+        nullable: true,
+        comment: '直接描述（直接描述模式），可以是字符串或多语言对象',
+    }),
+    __metadata("design:type", Object)
+], ManualOperationLogEntity.prototype, "directDescription", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'json',
+        nullable: true,
+        comment: '内联模板（内联模板模式），多语言模板对象',
+    }),
+    __metadata("design:type", Object)
+], ManualOperationLogEntity.prototype, "inlineTemplate", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true, comment: '操作用户ID' }),
     __metadata("design:type", String)

package/audit/enums/audit.enums.d.ts

@@ -1,8 +1,3 @@
-export declare enum OperationType {
-    CREATE = "create",
-    UPDATE = "update",
-    DELETE = "delete"
-}
 export declare enum AuditOperation {
     CREATE = "CREATE",
     UPDATE = "UPDATE",
@@ -10,9 +5,9 @@ export declare enum AuditOperation {
     RESTORE = "RESTORE"
 }
 export declare enum TransactionStatus {
-    PENDING = "pending",
-    COMMITTED = "committed",
-    ROLLED_BACK = "rolled_back"
+    PENDING = "PENDING",
+    COMMITTED = "COMMITTED",
+    ROLLED_BACK = "ROLLED_BACK"
 }
 export declare enum RecoveryStrategy {
     ENTITY_ONLY = "ENTITY_ONLY",
@@ -30,13 +25,3 @@ export declare enum MaskingStrategy {
     MASK = "MASK",
     PARTIAL = "PARTIAL"
 }
-export declare enum RollbackActionType {
-    ENTITY = "entity",
-    FILE = "file",
-    CUSTOM = "custom"
-}
-export declare enum ChangeType {
-    ADDED = "added",
-    REMOVED = "removed",
-    MODIFIED = "modified"
-}

package/audit/enums/audit.enums.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeType = exports.RollbackActionType = exports.MaskingStrategy = exports.RecordStrategy = exports.RecoveryStrategy = exports.TransactionStatus = exports.AuditOperation = exports.OperationType = void 0;
-var OperationType;
-(function (OperationType) {
-    OperationType["CREATE"] = "create";
-    OperationType["UPDATE"] = "update";
-    OperationType["DELETE"] = "delete";
-})(OperationType || (exports.OperationType = OperationType = {}));
+exports.MaskingStrategy = exports.RecordStrategy = exports.RecoveryStrategy = exports.TransactionStatus = exports.AuditOperation = void 0;
 var AuditOperation;
 (function (AuditOperation) {
     AuditOperation["CREATE"] = "CREATE";
@@ -16,9 +10,9 @@ var AuditOperation;
 })(AuditOperation || (exports.AuditOperation = AuditOperation = {}));
 var TransactionStatus;
 (function (TransactionStatus) {
-    TransactionStatus["PENDING"] = "pending";
-    TransactionStatus["COMMITTED"] = "committed";
-    TransactionStatus["ROLLED_BACK"] = "rolled_back";
+    TransactionStatus["PENDING"] = "PENDING";
+    TransactionStatus["COMMITTED"] = "COMMITTED";
+    TransactionStatus["ROLLED_BACK"] = "ROLLED_BACK";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 var RecoveryStrategy;
 (function (RecoveryStrategy) {
@@ -39,15 +33,3 @@ var MaskingStrategy;
     MaskingStrategy["MASK"] = "MASK";
     MaskingStrategy["PARTIAL"] = "PARTIAL";
 })(MaskingStrategy || (exports.MaskingStrategy = MaskingStrategy = {}));
-var RollbackActionType;
-(function (RollbackActionType) {
-    RollbackActionType["ENTITY"] = "entity";
-    RollbackActionType["FILE"] = "file";
-    RollbackActionType["CUSTOM"] = "custom";
-})(RollbackActionType || (exports.RollbackActionType = RollbackActionType = {}));
-var ChangeType;
-(function (ChangeType) {
-    ChangeType["ADDED"] = "added";
-    ChangeType["REMOVED"] = "removed";
-    ChangeType["MODIFIED"] = "modified";
-})(ChangeType || (exports.ChangeType = ChangeType = {}));

package/audit/index.d.ts

@@ -2,9 +2,7 @@ export * from './entities';
 export * from './enums';
 export * from './interfaces';
 export * from './dto';
-export { AuditEntity, EntityAudit, AuditField, getEntityAuditConfig, getFieldAuditConfig, getFieldLabel, getFieldValueLabel, ENTITY_AUDIT_OPTIONS, FIELD_AUDIT_OPTIONS, } from './decorators/entity-audit.decorator';
-export { AuditController, AuditMethod, CONTROLLER_AUDIT_OPTIONS, METHOD_AUDIT_OPTIONS, } from './decorators/audit-controller.decorator';
-export { AuditLog, LogOperation, AuditOperation, getAuditOperationConfig, hasAuditOperation, AUDIT_OPERATION_OPTIONS, } from './decorators/audit-operation.decorator';
+export * from './decorators';
 export * from './services';
 export * from './subscribers';
 export * from './interceptors';

package/audit/index.js

@@ -14,33 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AUDIT_OPERATION_OPTIONS = exports.hasAuditOperation = exports.getAuditOperationConfig = exports.AuditOperation = exports.LogOperation = exports.AuditLog = exports.METHOD_AUDIT_OPTIONS = exports.CONTROLLER_AUDIT_OPTIONS = exports.AuditMethod = exports.AuditController = exports.FIELD_AUDIT_OPTIONS = exports.ENTITY_AUDIT_OPTIONS = exports.getFieldValueLabel = exports.getFieldLabel = exports.getFieldAuditConfig = exports.getEntityAuditConfig = exports.AuditField = exports.EntityAudit = exports.AuditEntity = void 0;
 __exportStar(require("./entities"), exports);
 __exportStar(require("./enums"), exports);
 __exportStar(require("./interfaces"), exports);
 __exportStar(require("./dto"), exports);
-var entity_audit_decorator_1 = require("./decorators/entity-audit.decorator");
-Object.defineProperty(exports, "AuditEntity", { enumerable: true, get: function () { return entity_audit_decorator_1.AuditEntity; } });
-Object.defineProperty(exports, "EntityAudit", { enumerable: true, get: function () { return entity_audit_decorator_1.EntityAudit; } });
-Object.defineProperty(exports, "AuditField", { enumerable: true, get: function () { return entity_audit_decorator_1.AuditField; } });
-Object.defineProperty(exports, "getEntityAuditConfig", { enumerable: true, get: function () { return entity_audit_decorator_1.getEntityAuditConfig; } });
-Object.defineProperty(exports, "getFieldAuditConfig", { enumerable: true, get: function () { return entity_audit_decorator_1.getFieldAuditConfig; } });
-Object.defineProperty(exports, "getFieldLabel", { enumerable: true, get: function () { return entity_audit_decorator_1.getFieldLabel; } });
-Object.defineProperty(exports, "getFieldValueLabel", { enumerable: true, get: function () { return entity_audit_decorator_1.getFieldValueLabel; } });
-Object.defineProperty(exports, "ENTITY_AUDIT_OPTIONS", { enumerable: true, get: function () { return entity_audit_decorator_1.ENTITY_AUDIT_OPTIONS; } });
-Object.defineProperty(exports, "FIELD_AUDIT_OPTIONS", { enumerable: true, get: function () { return entity_audit_decorator_1.FIELD_AUDIT_OPTIONS; } });
-var audit_controller_decorator_1 = require("./decorators/audit-controller.decorator");
-Object.defineProperty(exports, "AuditController", { enumerable: true, get: function () { return audit_controller_decorator_1.AuditController; } });
-Object.defineProperty(exports, "AuditMethod", { enumerable: true, get: function () { return audit_controller_decorator_1.AuditMethod; } });
-Object.defineProperty(exports, "CONTROLLER_AUDIT_OPTIONS", { enumerable: true, get: function () { return audit_controller_decorator_1.CONTROLLER_AUDIT_OPTIONS; } });
-Object.defineProperty(exports, "METHOD_AUDIT_OPTIONS", { enumerable: true, get: function () { return audit_controller_decorator_1.METHOD_AUDIT_OPTIONS; } });
-var audit_operation_decorator_1 = require("./decorators/audit-operation.decorator");
-Object.defineProperty(exports, "AuditLog", { enumerable: true, get: function () { return audit_operation_decorator_1.AuditLog; } });
-Object.defineProperty(exports, "LogOperation", { enumerable: true, get: function () { return audit_operation_decorator_1.LogOperation; } });
-Object.defineProperty(exports, "AuditOperation", { enumerable: true, get: function () { return audit_operation_decorator_1.AuditOperation; } });
-Object.defineProperty(exports, "getAuditOperationConfig", { enumerable: true, get: function () { return audit_operation_decorator_1.getAuditOperationConfig; } });
-Object.defineProperty(exports, "hasAuditOperation", { enumerable: true, get: function () { return audit_operation_decorator_1.hasAuditOperation; } });
-Object.defineProperty(exports, "AUDIT_OPERATION_OPTIONS", { enumerable: true, get: function () { return audit_operation_decorator_1.AUDIT_OPERATION_OPTIONS; } });
+__exportStar(require("./decorators"), exports);
 __exportStar(require("./services"), exports);
 __exportStar(require("./subscribers"), exports);
 __exportStar(require("./interceptors"), exports);

package/audit/interfaces/audit.interfaces.d.ts

@@ -1,4 +1,4 @@
-import { AuditOperation, MaskingStrategy, RecordStrategy, RollbackActionType, ChangeType } from '../enums/audit.enums';
+import { AuditOperation, MaskingStrategy, RecordStrategy } from '../enums/audit.enums';
 export interface AuditContext {
     userId?: string;
     username?: string;
@@ -100,16 +100,13 @@ export interface EntityAuditConfig {
     includeFields?: string[];
     excludeFields?: string[];
     maskFields?: string[];
-    templateKey?: string;
-    sensitiveFields?: string[];
 }
 export interface OperationAuditConfig {
     enabled?: boolean;
     strategy?: RecordStrategy;
 }
 export interface FieldDisplayOptions {
-    label?: string | Record<string, string>;
-    valueLabels?: Record<string, Record<string, string>>;
+    displayName?: string;
     sensitive?: boolean;
     formatter?: (value: any) => string;
 }
@@ -120,61 +117,3 @@ export interface ControllerAuditOptions {
 export interface MethodAuditOptions {
     enabled?: boolean;
 }
-export interface ChangeDetail {
-    fieldName: string;
-    fieldLabels?: Record<string, string>;
-    oldValue: any;
-    newValue: any;
-    displayOldValue?: Record<string, string>;
-    displayNewValue?: Record<string, string>;
-    changeType: ChangeType;
-}
-export interface RollbackAction {
-    type: RollbackActionType;
-    action: string;
-    params: Record<string, any>;
-    order: number;
-    handler?: string;
-}
-export interface OperationTemplateData {
-    key: string;
-    entityName: string;
-    operation: AuditOperation;
-    nameTemplates: Record<string, string>;
-    descriptionTemplates: Record<string, string>;
-    fieldLabels?: Record<string, Record<string, string>>;
-    valueDisplays?: Record<string, Record<string, Record<string, string>>>;
-}
-export interface ManualOperationData {
-    transactionId: string;
-    operationTemplateKey: string;
-    descriptionParams: Record<string, any>;
-    userId?: string;
-    username?: string;
-    requestIp?: string;
-    rollbackActions?: RollbackAction[];
-}
-export interface AuditOperationOptions {
-    templateKey: string;
-    descriptionParams?: (args: any[], result: any, context: any) => Record<string, any>;
-    rollbackActions?: (args: any[], result: any, context: any) => RollbackAction[];
-    autoTransaction?: boolean;
-}
-export interface EnhancedEntityAuditConfig extends EntityAuditConfig {
-    templateKey?: string;
-    fieldLabels?: Record<string, Record<string, string>>;
-    valueDisplays?: Record<string, Record<string, Record<string, string>>>;
-}
-export interface TransactionDescription {
-    operationName: string;
-    description: string;
-    changes: Array<{
-        entityName?: string;
-        entityId?: string;
-        operation?: AuditOperation;
-        type?: string;
-        description: string;
-        details: any;
-        createdAt: Date;
-    }>;
-}

package/audit/services/entity-audit.service.d.ts

@@ -1,7 +1,7 @@
 import { Repository, EntityManager } from 'typeorm';
-import { EntityAuditLogEntity, EntityTransactionEntity, ManualOperationLogEntity } from '../entities';
+import { EntityAuditLogEntity, EntityTransactionEntity } from '../entities';
 import { AuditOperation } from '../enums';
-import { AuditConfig, IAuditStrategy, EntityDifference, RestoreOptions, RestoreResult, PreCheckResult, ManualOperationData, ChangeDetail, RollbackAction } from '../interfaces';
+import { AuditConfig, IAuditStrategy, EntityDifference, RestoreOptions, RestoreResult, PreCheckResult } from '../interfaces';
 import { AuditContextService } from './audit-context.service';
 import { MultiDatabaseService } from './multi-database.service';
 import { PageDto } from '../../common/dto';
@@ -9,14 +9,13 @@ import { AuditLogQueryDto } from '../dto';
 export declare class EntityAuditService {
     private readonly auditLogRepository;
     private readonly transactionRepository;
-    private readonly manualOperationRepository;
     private readonly entityManager;
     private readonly contextService;
     private readonly multiDbService;
     private readonly auditStrategy;
     private readonly config?;
     private readonly auditConnectionName;
-    constructor(auditLogRepository: Repository<EntityAuditLogEntity>, transactionRepository: Repository<EntityTransactionEntity>, manualOperationRepository: Repository<ManualOperationLogEntity>, entityManager: EntityManager, contextService: AuditContextService, multiDbService: MultiDatabaseService, auditStrategy?: IAuditStrategy, config?: AuditConfig, auditConnectionName?: string);
+    constructor(auditLogRepository: Repository<EntityAuditLogEntity>, transactionRepository: Repository<EntityTransactionEntity>, entityManager: EntityManager, contextService: AuditContextService, multiDbService: MultiDatabaseService, auditStrategy?: IAuditStrategy, config?: AuditConfig, auditConnectionName?: string);
     logEntityChange(entityType: string, entityId: string, operation: AuditOperation, oldValue: Record<string, any>, newValue: Record<string, any>, metadata?: Record<string, any>): Promise<EntityAuditLogEntity | null>;
     getAuditLogs(query: AuditLogQueryDto): Promise<PageDto<EntityAuditLogEntity>>;
     compareEntities(entityType: string, entityId: string, fromLogId?: string, toLogId?: string): Promise<EntityDifference>;
@@ -35,31 +34,4 @@ export declare class EntityAuditService {
     private generateHashChain;
     private generateDescription;
     private detectConflicts;
-    logEntityChangeWithTemplate(data: {
-        entityType: string;
-        entityId: string;
-        operation: AuditOperation;
-        oldValue?: Record<string, any>;
-        newValue?: Record<string, any>;
-        changedFields?: string[];
-        operationTemplateKey?: string;
-        descriptionParams?: Record<string, any>;
-        changeDetails?: ChangeDetail[];
-        rollbackActions?: RollbackAction[];
-        metadata?: Record<string, any>;
-    }): Promise<EntityAuditLogEntity | null>;
-    logManualOperation(data: ManualOperationData): Promise<ManualOperationLogEntity>;
-    withTransaction<T>(fn: (transactionId: string) => Promise<T>, options?: {
-        userId?: string;
-        username?: string;
-        requestIp?: string;
-        operationTemplateKey?: string;
-        descriptionParams?: Record<string, any>;
-        metadata?: Record<string, any>;
-    }): Promise<T>;
-    getCurrentTransactionId(): Promise<string | null>;
-    setCurrentTransactionId(transactionId: string | null): Promise<void>;
-    beginTransaction(userId?: string, userName?: string, ip?: string, operationTemplateKey?: string, descriptionParams?: Record<string, any>): Promise<string>;
-    commitTransaction(transactionId: string): Promise<void>;
-    rollbackTransaction(transactionId: string): Promise<void>;
 }

package/audit/services/entity-audit.service.js

@@ -33,10 +33,9 @@ const audit_strategy_service_1 = require("./audit-strategy.service");
 const multi_database_service_1 = require("./multi-database.service");
 const dto_1 = require("../../common/dto");
 let EntityAuditService = class EntityAuditService {
-    constructor(auditLogRepository, transactionRepository, manualOperationRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName) {
+    constructor(auditLogRepository, transactionRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName) {
         this.auditLogRepository = auditLogRepository;
         this.transactionRepository = transactionRepository;
-        this.manualOperationRepository = manualOperationRepository;
         this.entityManager = entityManager;
         this.contextService = contextService;
         this.multiDbService = multiDbService;
@@ -464,161 +463,20 @@ let EntityAuditService = class EntityAuditService {
         }
         return conflicts;
     }
-    logEntityChangeWithTemplate(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
-            if (!this.auditStrategy.shouldRecord(data.entityType, data.operation)) {
-                return null;
-            }
-            const recordStrategy = this.auditStrategy.getRecordStrategy(data.entityType, data.operation);
-            if (recordStrategy === enums_1.RecordStrategy.DISABLED) {
-                return null;
-            }
-            const fieldFilter = this.auditStrategy.getFieldFilter(data.entityType);
-            const filteredOldValue = this.filterAndMaskFields(data.oldValue || {}, fieldFilter);
-            const filteredNewValue = this.filterAndMaskFields(data.newValue || {}, fieldFilter);
-            const changedFields = data.changedFields || this.calculateChangedFields(filteredOldValue, filteredNewValue);
-            const changedFieldPaths = this.calculateChangedFieldPaths(filteredOldValue, filteredNewValue);
-            const context = yield this.contextService.getCurrentContext();
-            const operationTemplateKey = data.operationTemplateKey || `${data.entityType}.${data.operation}`;
-            const descriptionParams = data.descriptionParams || Object.assign(Object.assign(Object.assign({}, filteredOldValue), filteredNewValue), { changedFields, changedFieldsCount: changedFields.length });
-            const auditLog = this.auditLogRepository.create({
-                entityType: data.entityType,
-                entityId: data.entityId,
-                operation: data.operation,
-                oldValue: filteredOldValue,
-                newValue: filteredNewValue,
-                changedFields,
-                changedFieldPaths: changedFieldPaths.join(','),
-                userId: context.userId || ((_a = data.metadata) === null || _a === void 0 ? void 0 : _a.userId),
-                username: context.username || ((_b = data.metadata) === null || _b === void 0 ? void 0 : _b.username),
-                requestId: context.requestId || ((_c = data.metadata) === null || _c === void 0 ? void 0 : _c.requestId),
-                requestIp: context.requestIp || ((_d = data.metadata) === null || _d === void 0 ? void 0 : _d.requestIp),
-                userAgent: context.userAgent || ((_e = data.metadata) === null || _e === void 0 ? void 0 : _e.userAgent),
-                description: this.generateDescription(data.operation, data.entityType, data.entityId, changedFields),
-                hashChain: ((_g = (_f = this.config) === null || _f === void 0 ? void 0 : _f.security) === null || _g === void 0 ? void 0 : _g.hashChainEnabled)
-                    ? yield this.generateHashChain(data.entityType, data.entityId, filteredNewValue)
-                    : undefined,
-                operationTemplateKey,
-                descriptionParams,
-                changeDetails: data.changeDetails,
-                rollbackActions: data.rollbackActions,
-            });
-            const savedLog = yield this.auditLogRepository.save(auditLog);
-            return savedLog;
-        });
-    }
-    logManualOperation(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const context = yield this.contextService.getCurrentContext();
-            const manualLog = this.manualOperationRepository.create({
-                transactionId: data.transactionId,
-                operationTemplateKey: data.operationTemplateKey,
-                descriptionParams: data.descriptionParams,
-                userId: data.userId || context.userId,
-                username: data.username || context.username,
-                requestIp: data.requestIp || context.requestIp,
-                rollbackActions: data.rollbackActions || [],
-            });
-            return yield this.manualOperationRepository.save(manualLog);
-        });
-    }
-    withTransaction(fn, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const context = yield this.contextService.getCurrentContext();
-            const transaction = this.transactionRepository.create({
-                description: ((_a = options === null || options === void 0 ? void 0 : options.descriptionParams) === null || _a === void 0 ? void 0 : _a.description) || 'Transaction',
-                status: 'PENDING',
-                entities: [],
-                userId: (options === null || options === void 0 ? void 0 : options.userId) || context.userId,
-                username: (options === null || options === void 0 ? void 0 : options.username) || context.username,
-                requestIp: (options === null || options === void 0 ? void 0 : options.requestIp) || context.requestIp,
-                operationTemplateKey: options === null || options === void 0 ? void 0 : options.operationTemplateKey,
-                descriptionParams: options === null || options === void 0 ? void 0 : options.descriptionParams,
-                metadata: options === null || options === void 0 ? void 0 : options.metadata,
-            });
-            const savedTransaction = yield this.transactionRepository.save(transaction);
-            const transactionId = savedTransaction.id;
-            try {
-                yield this.contextService.setContext(Object.assign(Object.assign({}, context), { transactionId }));
-                const result = yield fn(transactionId);
-                yield this.transactionRepository.update(transactionId, {
-                    status: 'COMMITTED',
-                    completedAt: new Date(),
-                });
-                return result;
-            }
-            catch (error) {
-                yield this.transactionRepository.update(transactionId, {
-                    status: 'ROLLED_BACK',
-                    completedAt: new Date(),
-                });
-                throw error;
-            }
-        });
-    }
-    getCurrentTransactionId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const context = yield this.contextService.getCurrentContext();
-            return context.transactionId || null;
-        });
-    }
-    setCurrentTransactionId(transactionId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const context = yield this.contextService.getCurrentContext();
-            yield this.contextService.setContext(Object.assign(Object.assign({}, context), { transactionId }));
-        });
-    }
-    beginTransaction(userId, userName, ip, operationTemplateKey, descriptionParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const context = yield this.contextService.getCurrentContext();
-            const transaction = this.transactionRepository.create({
-                description: (descriptionParams === null || descriptionParams === void 0 ? void 0 : descriptionParams.description) || 'Transaction',
-                status: 'pending',
-                entities: [],
-                userId: userId || context.userId,
-                username: userName || context.username,
-                requestIp: ip || context.requestIp,
-                operationTemplateKey,
-                descriptionParams,
-            });
-            const savedTransaction = yield this.transactionRepository.save(transaction);
-            return savedTransaction.id;
-        });
-    }
-    commitTransaction(transactionId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionRepository.update(transactionId, {
-                status: 'committed',
-                completedAt: new Date(),
-            });
-        });
-    }
-    rollbackTransaction(transactionId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionRepository.update(transactionId, {
-                status: 'rolled_back',
-                completedAt: new Date(),
-            });
-        });
-    }
 };
 exports.EntityAuditService = EntityAuditService;
 exports.EntityAuditService = EntityAuditService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(entities_1.EntityAuditLogEntity)),
     __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity)),
-    __param(2, (0, typeorm_1.InjectRepository)(entities_1.ManualOperationLogEntity)),
-    __param(3, (0, common_1.Inject)('AUDIT_ENTITY_MANAGER')),
+    __param(2, (0, common_1.Inject)('AUDIT_ENTITY_MANAGER')),
+    __param(5, (0, common_1.Optional)()),
+    __param(5, (0, common_1.Inject)('AUDIT_STRATEGY')),
     __param(6, (0, common_1.Optional)()),
-    __param(6, (0, common_1.Inject)('AUDIT_STRATEGY')),
+    __param(6, (0, common_1.Inject)('AUDIT_CONFIG')),
     __param(7, (0, common_1.Optional)()),
-    __param(7, (0, common_1.Inject)('AUDIT_CONFIG')),
-    __param(8, (0, common_1.Optional)()),
-    __param(8, (0, common_1.Inject)('AUDIT_CONNECTION_NAME')),
+    __param(7, (0, common_1.Inject)('AUDIT_CONNECTION_NAME')),
     __metadata("design:paramtypes", [typeorm_2.Repository,
-        typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.EntityManager,
         audit_context_service_1.AuditContextService,

package/audit/services/index.d.ts

@@ -3,4 +3,3 @@ export * from './audit-strategy.service';
 export * from './entity-audit.service';
 export * from './transaction-audit.service';
 export * from './multi-database.service';
-export * from './operation-description.service';

package/audit/services/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./audit-strategy.service"), exports);
 __exportStar(require("./entity-audit.service"), exports);
 __exportStar(require("./transaction-audit.service"), exports);
 __exportStar(require("./multi-database.service"), exports);
-__exportStar(require("./operation-description.service"), exports);

package/audit/services/manual-audit-log.service.d.ts

@@ -0,0 +1,29 @@
+import { Repository, DataSource } from 'typeorm';
+import { ManualOperationLogEntity, EntityTransactionEntity } from '../entities';
+import { AuditContextService } from './audit-context.service';
+import { ManualLogOptions } from '../interfaces';
+export declare class ManualAuditLogService {
+    private readonly manualLogRepository;
+    private readonly transactionRepository;
+    private readonly contextService;
+    private readonly dataSource;
+    private static instance;
+    constructor(manualLogRepository: Repository<ManualOperationLogEntity>, transactionRepository: Repository<EntityTransactionEntity>, contextService: AuditContextService, dataSource: DataSource);
+    static log(options: ManualLogOptions): Promise<ManualOperationLogEntity>;
+    logOperation(options: ManualLogOptions): Promise<ManualOperationLogEntity>;
+    static beginTransaction(userId?: string, username?: string): Promise<string>;
+    static commitTransaction(transactionId: string): Promise<void>;
+    static rollbackTransaction(transactionId: string): Promise<void>;
+    private createTransaction;
+    private updateTransactionStatus;
+    private generateTransactionId;
+    static logBatch(operations: ManualLogOptions[], sharedTransactionId?: string): Promise<ManualOperationLogEntity[]>;
+    static findLogs(options: {
+        templateKey?: string;
+        userId?: string;
+        transactionId?: string;
+        startTime?: Date;
+        endTime?: Date;
+        limit?: number;
+    }): Promise<ManualOperationLogEntity[]>;
+}

package/audit/services/manual-audit-log.service.js

@@ -0,0 +1,184 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var ManualAuditLogService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManualAuditLogService = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("@nestjs/typeorm");
+const typeorm_2 = require("typeorm");
+const entities_1 = require("../entities");
+const audit_context_service_1 = require("./audit-context.service");
+const enums_1 = require("../enums");
+const crypto_1 = require("crypto");
+let ManualAuditLogService = ManualAuditLogService_1 = class ManualAuditLogService {
+    constructor(manualLogRepository, transactionRepository, contextService, dataSource) {
+        this.manualLogRepository = manualLogRepository;
+        this.transactionRepository = transactionRepository;
+        this.contextService = contextService;
+        this.dataSource = dataSource;
+        ManualAuditLogService_1.instance = this;
+    }
+    static log(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized. Make sure AuditModule is imported.');
+            }
+            return ManualAuditLogService_1.instance.logOperation(options);
+        });
+    }
+    logOperation(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { templateKey, description, descriptionTemplate, descriptionParams, userId, username, requestIp, rollbackActions, transactionId, autoCreateTransaction = true, } = options;
+            if (!templateKey && !description && !descriptionTemplate) {
+                throw new Error('ManualAuditLogService.log() requires one of: templateKey, description, or descriptionTemplate');
+            }
+            const modeCount = [templateKey, description, descriptionTemplate].filter(Boolean).length;
+            if (modeCount > 1) {
+                throw new Error('ManualAuditLogService.log() accepts only one mode: use either templateKey, description, or descriptionTemplate');
+            }
+            const context = yield this.contextService.getCurrentContext();
+            const finalUserId = userId || context.userId || 'system';
+            const finalUsername = username || context.username || 'system';
+            const finalRequestIp = requestIp || context.requestIp || 'unknown';
+            let finalTransactionId = transactionId || context.transactionId;
+            if (!finalTransactionId && autoCreateTransaction) {
+                finalTransactionId = yield this.createTransaction(finalUserId, finalUsername);
+            }
+            const manualLog = this.manualLogRepository.create({
+                transactionId: finalTransactionId,
+                operationTemplateKey: templateKey || null,
+                descriptionParams: descriptionParams || null,
+                directDescription: description || null,
+                inlineTemplate: descriptionTemplate || null,
+                userId: finalUserId,
+                username: finalUsername,
+                requestIp: finalRequestIp,
+                rollbackActions: rollbackActions || [],
+            });
+            return this.manualLogRepository.save(manualLog);
+        });
+    }
+    static beginTransaction(userId, username) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized');
+            }
+            return ManualAuditLogService_1.instance.createTransaction(userId, username);
+        });
+    }
+    static commitTransaction(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized');
+            }
+            yield ManualAuditLogService_1.instance.updateTransactionStatus(transactionId, enums_1.TransactionStatus.COMMITTED);
+        });
+    }
+    static rollbackTransaction(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized');
+            }
+            yield ManualAuditLogService_1.instance.updateTransactionStatus(transactionId, enums_1.TransactionStatus.ROLLED_BACK);
+        });
+    }
+    createTransaction(userId, username) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const context = yield this.contextService.getCurrentContext();
+            const transaction = this.transactionRepository.create({
+                description: 'Manual operation transaction',
+                userId: userId || context.userId || 'system',
+                username: username || context.username || 'system',
+                requestIp: context.requestIp || 'unknown',
+                status: enums_1.TransactionStatus.PENDING,
+                entities: [],
+            });
+            const saved = yield this.transactionRepository.save(transaction);
+            return saved.id;
+        });
+    }
+    updateTransactionStatus(transactionId, status) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.transactionRepository.update({ id: transactionId }, { status });
+        });
+    }
+    generateTransactionId() {
+        return `txn-${Date.now()}-${(0, crypto_1.randomBytes)(8).toString('hex')}`;
+    }
+    static logBatch(operations, sharedTransactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized');
+            }
+            const transactionId = sharedTransactionId ||
+                (yield ManualAuditLogService_1.instance.createTransaction());
+            const results = [];
+            for (const operation of operations) {
+                const result = yield ManualAuditLogService_1.instance.logOperation(Object.assign(Object.assign({}, operation), { transactionId, autoCreateTransaction: false }));
+                results.push(result);
+            }
+            if (!sharedTransactionId) {
+                yield ManualAuditLogService_1.instance.updateTransactionStatus(transactionId, enums_1.TransactionStatus.COMMITTED);
+            }
+            return results;
+        });
+    }
+    static findLogs(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!ManualAuditLogService_1.instance) {
+                throw new Error('ManualAuditLogService is not initialized');
+            }
+            const { templateKey, userId, transactionId, startTime, endTime, limit = 100 } = options;
+            const query = ManualAuditLogService_1.instance.manualLogRepository
+                .createQueryBuilder('log')
+                .orderBy('log.createdAt', 'DESC')
+                .take(limit);
+            if (templateKey) {
+                query.andWhere('log.operationTemplateKey = :templateKey', { templateKey });
+            }
+            if (userId) {
+                query.andWhere('log.userId = :userId', { userId });
+            }
+            if (transactionId) {
+                query.andWhere('log.transactionId = :transactionId', { transactionId });
+            }
+            if (startTime) {
+                query.andWhere('log.createdAt >= :startTime', { startTime });
+            }
+            if (endTime) {
+                query.andWhere('log.createdAt <= :endTime', { endTime });
+            }
+            return query.getMany();
+        });
+    }
+};
+exports.ManualAuditLogService = ManualAuditLogService;
+exports.ManualAuditLogService = ManualAuditLogService = ManualAuditLogService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(entities_1.ManualOperationLogEntity, 'audit')),
+    __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity, 'audit')),
+    __metadata("design:paramtypes", [typeorm_2.Repository,
+        typeorm_2.Repository,
+        audit_context_service_1.AuditContextService,
+        typeorm_2.DataSource])
+], ManualAuditLogService);

package/common/boilerplate.polyfill.d.ts

@@ -16,6 +16,10 @@ declare global {
     }
 }
 declare module 'typeorm' {
+    interface Repository<Entity extends ObjectLiteral> {
+        saveWithPk(this: Repository<Entity>, entity: Entity | Entity[]): Promise<Entity | Entity[]>;
+        getPrimaryKeyFields(this: Repository<Entity>): string[];
+    }
     interface SelectQueryBuilder<Entity> {
         searchByString(q: string, columnNames: string[], options?: {
             formStart: boolean;

package/common/boilerplate.polyfill.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("source-map-support/register");
 const lodash_1 = require("lodash");
 const typeorm_1 = require("typeorm");
+const typeorm_2 = require("typeorm");
 const page_dto_1 = require("./dto/page.dto");
 const page_meta_dto_1 = require("./dto/page-meta.dto");
 const providers_1 = require("../providers");
@@ -43,11 +44,11 @@ Array.prototype.getByLanguage = function (languageCode) {
 Array.prototype.toPageDto = function (pageMetaDto, options) {
     return new page_dto_1.PageDto(this.toDtos(options), pageMetaDto);
 };
-typeorm_1.SelectQueryBuilder.prototype.searchByString = function (q, columnNames, options) {
+typeorm_2.SelectQueryBuilder.prototype.searchByString = function (q, columnNames, options) {
     if (!q) {
         return this;
     }
-    this.andWhere(new typeorm_1.Brackets((qb) => {
+    this.andWhere(new typeorm_2.Brackets((qb) => {
         for (const item of columnNames) {
             qb.orWhere(`${item} ILIKE :q`);
         }
@@ -60,7 +61,7 @@ typeorm_1.SelectQueryBuilder.prototype.searchByString = function (q, columnNames
     }
     return this;
 };
-typeorm_1.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, options) {
+typeorm_2.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(options === null || options === void 0 ? void 0 : options.takeAll)) {
             this.skip(pageOptionsDto.skip).take(pageOptionsDto.pageSize);
@@ -77,7 +78,7 @@ typeorm_1.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, opti
         return [entities, pageMetaDto];
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto, options) {
+typeorm_2.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const [entities, pageMetaDto] = yield this.paginate(pageOptionsDto, {
             skipCount: options === null || options === void 0 ? void 0 : options.skipCount,
@@ -90,7 +91,7 @@ typeorm_1.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto
         return transformedEntities.toPageDto(pageMetaDto, options === null || options === void 0 ? void 0 : options.dtoOptions);
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFieldName = 'tenantId') {
+typeorm_2.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFieldName = 'tenantId') {
     var _a;
     if (!tenantId) {
         tenantId = providers_1.ContextProvider.getTenantId();
@@ -106,7 +107,7 @@ typeorm_1.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFi
     }
     return this;
 };
-typeorm_1.SelectQueryBuilder.prototype.iterate = function (options) {
+typeorm_2.SelectQueryBuilder.prototype.iterate = function (options) {
     return __asyncGenerator(this, arguments, function* () {
         const batchSize = (options === null || options === void 0 ? void 0 : options.batchSize) || 100;
         let offset = 0;
@@ -124,7 +125,7 @@ typeorm_1.SelectQueryBuilder.prototype.iterate = function (options) {
         }
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.eachBatch = function (callback, options) {
+typeorm_2.SelectQueryBuilder.prototype.eachBatch = function (callback, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const batchSize = (options === null || options === void 0 ? void 0 : options.batchSize) || 100;
         const mode = (options === null || options === void 0 ? void 0 : options.mode) || 'batch';
@@ -150,3 +151,95 @@ typeorm_1.SelectQueryBuilder.prototype.eachBatch = function (callback, options)
         }
     });
 };
+const insertWithPk = function (entity) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!this.metadata) {
+            throw new Error('Repository metadata is not available. Make sure the repository is properly initialized.');
+        }
+        const tableName = this.metadata.tableName;
+        const columns = this.metadata.columns;
+        const columnNames = [];
+        const columnValues = [];
+        const valuePlaceholders = [];
+        for (const column of columns) {
+            const propertyName = column.propertyName;
+            const value = entity[propertyName];
+            if (value === undefined) {
+                continue;
+            }
+            const columnName = column.databaseName;
+            if (columnName) {
+                columnNames.push(columnName);
+                columnValues.push(value);
+                valuePlaceholders.push(`$${columnValues.length}`);
+            }
+        }
+        const sql = `INSERT INTO ${tableName} (${columnNames.join(', ')}) VALUES (${valuePlaceholders.join(', ')}) RETURNING *`;
+        try {
+            const result = yield this.query(sql, columnValues);
+            return result[0];
+        }
+        catch (error) {
+            console.warn(`Native SQL insert failed for ${tableName}, falling back to regular save:`, error);
+            return yield this.save(entity);
+        }
+    });
+};
+typeorm_1.Repository.prototype.getPrimaryKeyFields = function () {
+    if (!this.metadata) {
+        throw new Error('Repository metadata is not available. Make sure the repository is properly initialized.');
+    }
+    const primaryKeys = this.metadata.primaryColumns;
+    if (!primaryKeys || primaryKeys.length === 0) {
+        throw new Error(`Entity ${this.metadata.targetName} does not have any primary key columns defined.`);
+    }
+    return primaryKeys.map(column => column.propertyName);
+};
+typeorm_1.Repository.prototype.saveWithPk = function (entity) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const isArray = Array.isArray(entity);
+        const entities = isArray ? entity : [entity];
+        if (entities.length === 0) {
+            return isArray ? [] : null;
+        }
+        const pkFields = this.getPrimaryKeyFields();
+        const results = yield Promise.all(entities.map((singleEntity) => __awaiter(this, void 0, void 0, function* () {
+            const hasPkValues = pkFields.every(pkField => {
+                const value = singleEntity[pkField];
+                return value !== undefined && value !== null && value !== '';
+            });
+            if (hasPkValues) {
+                try {
+                    const existingEntity = yield this.findOne({
+                        where: pkFields.reduce((acc, pkField) => {
+                            acc[pkField] = singleEntity[pkField];
+                            return acc;
+                        }, {})
+                    });
+                    if (existingEntity) {
+                        yield this.update(pkFields.reduce((acc, pkField) => {
+                            acc[pkField] = singleEntity[pkField];
+                            return acc;
+                        }, {}), singleEntity);
+                        return yield this.findOne({
+                            where: pkFields.reduce((acc, pkField) => {
+                                acc[pkField] = singleEntity[pkField];
+                                return acc;
+                            }, {})
+                        });
+                    }
+                    else {
+                        return yield insertWithPk.call(this, singleEntity);
+                    }
+                }
+                catch (error) {
+                    return yield insertWithPk.call(this, singleEntity);
+                }
+            }
+            else {
+                return yield this.save(singleEntity);
+            }
+        })));
+        return isArray ? results : results[0];
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "3.1.2-9",
+  "version": "4.1.2",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",