@estgbue/mezgeb 0.0.41 → 0.0.43

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 export * from './mezgeb/client/client-audit.interceptor';
 export * from './mezgeb/client/client.module';
+export * from './mezgeb/client/client.logger.config';
+export * from './mezgeb/client/client-save-update';
 export * from './mezgeb.module';
 export * from './mezgeb/listener/audit.module';
 export * from './mezgeb/listener/dtos/audit.dto';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../libs/mezgeb/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sDAAsD,CAAC;AACrE,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../libs/mezgeb/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iBAAiB,CAAC;AAChC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sDAAsD,CAAC;AACrE,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA"}

package/dist/index.js

@@ -16,6 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./mezgeb/client/client-audit.interceptor"), exports);
 __exportStar(require("./mezgeb/client/client.module"), exports);
+__exportStar(require("./mezgeb/client/client.logger.config"), exports);
+__exportStar(require("./mezgeb/client/client-save-update"), exports);
 __exportStar(require("./mezgeb.module"), exports);
 __exportStar(require("./mezgeb/listener/audit.module"), exports);
 __exportStar(require("./mezgeb/listener/dtos/audit.dto"), exports);

package/dist/mezgeb/client/client-audit.interceptor.js

@@ -61,7 +61,7 @@ let ClientLoggerInterceptor = class ClientLoggerInterceptor {
         }));
     }
     handleRequestAuditInitiation(context, next, requestId) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const req = context.switchToHttp().getRequest();
         const { ip, ips, method, originalUrl, headers, body, params, user } = req;
         const ds = this.connection;
@@ -69,8 +69,8 @@ let ClientLoggerInterceptor = class ClientLoggerInterceptor {
         const log = {
             id: requestId,
             requestMethod: method,
-            application: process.env.APPLICATION_NAME,
-            module: originalUrl.split('/')[2],
+            application: (_d = (_c = process.env.APPLICATION_NAME) !== null && _c !== void 0 ? _c : process.env.APP_NAME) !== null && _d !== void 0 ? _d : 'DEFAULT',
+            module: (_e = originalUrl.split('/')[2]) !== null && _e !== void 0 ? _e : 'DEFAULT',
             requestBody: originalUrl.includes('/auth') ? {} : body,
             requestHeader: this.mapHeaders(headers),
             statusCode: 201,
@@ -81,6 +81,7 @@ let ClientLoggerInterceptor = class ClientLoggerInterceptor {
         this.rmsRMQClient.emit(mezgeb_enum_1.RegisterRequestAudit, log);
     }
     handleEventAuditInitiation(context, next, requestId) {
+        var _a, _b;
         const eventPayload = context.getArgs()[0];
         const eventPattern = context.getArgs()[1].args[2];
         const ds = this.connection;
@@ -88,8 +89,8 @@ let ClientLoggerInterceptor = class ClientLoggerInterceptor {
         const log = {
             id: requestId,
             requestMethod: mezgeb_enum_1.EAuditLogRequestMethod.EVENT,
-            application: process.env.APPLICATION_NAME,
-            module: eventPattern,
+            application: (_b = (_a = process.env.APPLICATION_NAME) !== null && _a !== void 0 ? _a : process.env.APP_NAME) !== null && _b !== void 0 ? _b : 'DEFAULT',
+            module: eventPattern !== null && eventPattern !== void 0 ? eventPattern : 'DEFAULT',
             requestBody: eventPayload,
             requestHeader: {},
             statusCode: 201,

package/dist/mezgeb/client/client-save-update.d.ts

@@ -0,0 +1,3 @@
+import { Repository, FindOptionsWhere, ObjectLiteral } from "typeorm";
+export declare const safeSave: <T extends ObjectLiteral>(repo: Repository<T>, conditions: FindOptionsWhere<T>, patch: Partial<T>) => Promise<T>;
+//# sourceMappingURL=client-save-update.d.ts.map

package/dist/mezgeb/client/client-save-update.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-save-update.d.ts","sourceRoot":"","sources":["../../../libs/mezgeb/src/mezgeb/client/client-save-update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,QAAQ,GAAU,CAAC,SAAS,aAAa,EACpD,MAAM,UAAU,CAAC,CAAC,CAAC,EACnB,YAAY,gBAAgB,CAAC,CAAC,CAAC,EAC/B,OAAO,OAAO,CAAC,CAAC,CAAC,KAChB,OAAO,CAAC,CAAC,CAMX,CAAA"}

package/dist/mezgeb/client/client-save-update.js

@@ -0,0 +1,18 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeSave = void 0;
+const safeSave = (repo, conditions, patch) => __awaiter(void 0, void 0, void 0, function* () {
+    const entity = yield repo.findOneByOrFail(conditions);
+    Object.assign(entity, patch);
+    return repo.save(entity);
+});
+exports.safeSave = safeSave;

package/dist/mezgeb/client/client.subscriber.d.ts

@@ -1,10 +1,11 @@
 import { ClientProxy } from '@nestjs/microservices';
-import { AfterQueryEvent, DataSource, EntitySubscriberInterface, InsertEvent } from 'typeorm';
+import { DataSource, EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm';
 export declare class ClientSubscriber implements EntitySubscriberInterface {
     private readonly dataSource;
     private readonly rmsRMQClient;
     constructor(dataSource: DataSource, rmsRMQClient: ClientProxy);
     afterInsert(event: InsertEvent<any>): Promise<any> | void;
-    afterQuery(event: AfterQueryEvent<any>): Promise<any> | void;
+    afterUpdate(event: UpdateEvent<any>): Promise<any> | void;
+    afterRemove(event: RemoveEvent<any>): Promise<any> | void;
 }
 //# sourceMappingURL=client.subscriber.d.ts.map

package/dist/mezgeb/client/client.subscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.subscriber.d.ts","sourceRoot":"","sources":["../../../libs/mezgeb/src/mezgeb/client/client.subscriber.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,eAAe,EACf,UAAU,EACV,yBAAyB,EAEzB,WAAW,EACZ,MAAM,SAAS,CAAC;AAKjB,qBACa,gBAAiB,YAAW,yBAAyB;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,UAAU,EAAE,UAAU,EAEtB,YAAY,EAAE,WAAW;IAK5C,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;IAczD,UAAU,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;CAsB7D"}
+{"version":3,"file":"client.subscriber.d.ts","sourceRoot":"","sources":["../../../libs/mezgeb/src/mezgeb/client/client.subscriber.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,UAAU,EACV,yBAAyB,EAEzB,WAAW,EACX,WAAW,EACX,WAAW,EACZ,MAAM,SAAS,CAAC;AAKjB,qBACa,gBAAiB,YAAW,yBAAyB;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,UAAU,EAAE,UAAU,EAEtB,YAAY,EAAE,WAAW;IAK5C,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;IAczD,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;IAiBzD,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI;CAiB1D"}

package/dist/mezgeb/client/client.subscriber.js

@@ -36,20 +36,38 @@ let ClientSubscriber = class ClientSubscriber {
         };
         this.rmsRMQClient.emit(mezgeb_enum_1.RecordInsertion, payload);
     }
-    afterQuery(event) {
-        if (!event.success ||
-            !(event.query.startsWith('DELETE') || event.query.startsWith('UPDATE'))) {
+    afterUpdate(event) {
+        var _a, _b, _c;
+        if (!event.databaseEntity || !event.entity)
             return;
-        }
         const ds = this.dataSource;
         const payload = {
-            createdAt: new Date(),
-            query: event.query,
+            user: ds.user,
+            entityName: event.metadata.tableName,
+            entityId: (_b = (_a = event.entity) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : (_c = event.databaseEntity) === null || _c === void 0 ? void 0 : _c.id,
             requestId: ds.requestId,
-            parameters: event.parameters,
+            createdAt: new Date(),
+            before: event.databaseEntity,
+            after: event.entity,
+        };
+        this.rmsRMQClient.emit(mezgeb_enum_1.RecordUpdate, payload);
+    }
+    afterRemove(event) {
+        var _a;
+        const before = (_a = event.databaseEntity) !== null && _a !== void 0 ? _a : event.entity;
+        if (!before)
+            return;
+        const ds = this.dataSource;
+        const payload = {
             user: ds.user,
+            entityName: event.metadata.tableName,
+            entityId: before === null || before === void 0 ? void 0 : before.id,
+            requestId: ds.requestId,
+            createdAt: new Date(),
+            before,
+            after: null,
         };
-        this.rmsRMQClient.emit(event.query.startsWith('DELETE') ? mezgeb_enum_1.RecordDeletion : mezgeb_enum_1.RecordUpdate, payload);
+        this.rmsRMQClient.emit(mezgeb_enum_1.RecordDeletion, payload);
     }
 };
 exports.ClientSubscriber = ClientSubscriber;

package/dist/mezgeb/listener/controllers/audit-log-command.controller.d.ts

@@ -1,11 +1,11 @@
 import { AuditLogCommandService } from '../services/audit-log-command.service';
-import { CreateEventDTO, EmitQueryDTO } from '../../mezgeb.dto';
+import { ChangeEventDTO, CreateEventDTO } from '../../mezgeb.dto';
 export declare class AuditLogCommandController {
     private readonly auditLogService;
     constructor(auditLogService: AuditLogCommandService);
     handleAuditLog(data: CreateEventDTO): Promise<void>;
-    handleApproveTransaction(payload: EmitQueryDTO): Promise<void>;
-    handleRollbackTransaction(payload: EmitQueryDTO): Promise<void>;
+    handleApproveTransaction(payload: ChangeEventDTO): Promise<void>;
+    handleRollbackTransaction(payload: ChangeEventDTO): Promise<void>;
     getAuditLogs(entityId: string, application: string, skip: number, take: number): Promise<[import("../entities/audit-log-command.entity").AuditLogCommand[], number]>;
 }
 //# sourceMappingURL=audit-log-command.controller.d.ts.map

package/dist/mezgeb/listener/controllers/audit-log-command.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-log-command.controller.d.ts","sourceRoot":"","sources":["../../../../libs/mezgeb/src/mezgeb/listener/controllers/audit-log-command.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,qBAGa,yBAAyB;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,sBAAsB;IAI9D,cAAc,CAAC,IAAI,EAAE,cAAc;IAMnC,wBAAwB,CAAC,OAAO,EAAE,YAAY;IAM9C,yBAAyB,CAAC,OAAO,EAAE,YAAY;IAiB/C,YAAY,CACG,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM;CAQ9B"}
+{"version":3,"file":"audit-log-command.controller.d.ts","sourceRoot":"","sources":["../../../../libs/mezgeb/src/mezgeb/listener/controllers/audit-log-command.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElE,qBAGa,yBAAyB;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,sBAAsB;IAI9D,cAAc,CAAC,IAAI,EAAE,cAAc;IAMnC,wBAAwB,CAAC,OAAO,EAAE,cAAc;IAMhD,yBAAyB,CAAC,OAAO,EAAE,cAAc;IAiBjD,YAAY,CACG,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM;CAQ9B"}

package/dist/mezgeb/listener/controllers/audit-log-command.controller.js

@@ -66,14 +66,14 @@ __decorate([
     (0, microservices_1.EventPattern)(mezgeb_enum_1.RecordUpdate),
     (0, common_1.UseInterceptors)(event_nack_interceptor_1.EventAcknowledgmentInterceptor),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [mezgeb_dto_1.EmitQueryDTO]),
+    __metadata("design:paramtypes", [mezgeb_dto_1.ChangeEventDTO]),
     __metadata("design:returntype", Promise)
 ], AuditLogCommandController.prototype, "handleApproveTransaction", null);
 __decorate([
     (0, microservices_1.EventPattern)(mezgeb_enum_1.RecordDeletion),
     (0, common_1.UseInterceptors)(event_nack_interceptor_1.EventAcknowledgmentInterceptor),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [mezgeb_dto_1.EmitQueryDTO]),
+    __metadata("design:paramtypes", [mezgeb_dto_1.ChangeEventDTO]),
     __metadata("design:returntype", Promise)
 ], AuditLogCommandController.prototype, "handleRollbackTransaction", null);
 __decorate([

package/dist/mezgeb/listener/services/audit-log-command.service.d.ts

@@ -1,14 +1,14 @@
 import { Repository } from 'typeorm';
 import { AuditLog } from '../entities/audit-log.entity';
 import { AuditLogCommand } from '../entities/audit-log-command.entity';
-import { CreateEventDTO, EmitQueryDTO } from '../../mezgeb.dto';
+import { ChangeEventDTO, CreateEventDTO } from '../../mezgeb.dto';
 export declare class AuditLogCommandService {
     private auditLogRepository;
     private auditLogCommandRepository;
     constructor(auditLogRepository: Repository<AuditLog>, auditLogCommandRepository: Repository<AuditLogCommand>);
     create(itemData: CreateEventDTO): Promise<void>;
-    update(itemData: EmitQueryDTO): Promise<void>;
-    delete(itemData: EmitQueryDTO): Promise<void>;
+    update(itemData: ChangeEventDTO): Promise<void>;
+    delete(itemData: ChangeEventDTO): Promise<void>;
     auditParents(entity: any, method: 'INSERT_CHILD' | 'DELETE_CHILD', childEntityName: string, auditLogId: string): Promise<void>;
     private changeCamelToSnakeCase;
     pluralizeAndChangeCase(word: string): string;
@@ -16,8 +16,7 @@ export declare class AuditLogCommandService {
         skip?: number;
         take?: number;
     }): Promise<[AuditLogCommand[], number]>;
-    private getAuditItem;
-    private mapQueryToObject;
+    private getAuditItemById;
     private parseInput;
 }
 //# sourceMappingURL=audit-log-command.service.d.ts.map

package/dist/mezgeb/listener/services/audit-log-command.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-log-command.service.d.ts","sourceRoot":"","sources":["../../../../libs/mezgeb/src/mezgeb/listener/services/audit-log-command.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAiB,cAAc,EAAE,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAE/F,qBACa,sBAAsB;IAG/B,OAAO,CAAC,kBAAkB;IAE1B,OAAO,CAAC,yBAAyB;gBAFzB,kBAAkB,EAAE,UAAU,CAAC,QAAQ,CAAC,EAExC,yBAAyB,EAAE,UAAU,CAAC,eAAe,CAAC;IAG1D,MAAM,CAAC,QAAQ,EAAE,cAAc;IAS/B,MAAM,CAAC,QAAQ,EAAE,YAAY;IAqD7B,MAAM,CAAC,QAAQ,EAAE,YAAY;IAsB7B,YAAY,CAChB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,cAAc,GAAG,cAAc,EACvC,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM;IA0CpB,OAAO,CAAC,sBAAsB;IAI9B,sBAAsB,CAAC,IAAI,EAAE,MAAM;IAsB7B,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO;YAwCnC,YAAY;YAqBZ,gBAAgB;IAsD9B,OAAO,CAAC,UAAU;CAWnB"}
+{"version":3,"file":"audit-log-command.service.d.ts","sourceRoot":"","sources":["../../../../libs/mezgeb/src/mezgeb/listener/services/audit-log-command.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAiB,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjF,qBACa,sBAAsB;IAG/B,OAAO,CAAC,kBAAkB;IAE1B,OAAO,CAAC,yBAAyB;gBAFzB,kBAAkB,EAAE,UAAU,CAAC,QAAQ,CAAC,EAExC,yBAAyB,EAAE,UAAU,CAAC,eAAe,CAAC;IAG1D,MAAM,CAAC,QAAQ,EAAE,cAAc;IAS/B,MAAM,CAAC,QAAQ,EAAE,cAAc;IA4D/B,MAAM,CAAC,QAAQ,EAAE,cAAc;IA2B/B,YAAY,CAChB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,cAAc,GAAG,cAAc,EACvC,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM;IA0CpB,OAAO,CAAC,sBAAsB;IAI9B,sBAAsB,CAAC,IAAI,EAAE,MAAM;IAsB7B,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO;YAwCnC,gBAAgB;IAgB9B,OAAO,CAAC,UAAU;CAWnB"}

package/dist/mezgeb/listener/services/audit-log-command.service.js

@@ -40,40 +40,54 @@ let AuditLogCommandService = class AuditLogCommandService {
     }
     update(itemData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const item = yield this.mapQueryToObject(itemData);
-            const auditItem = yield this.getAuditItem(item);
+            var _a, _b, _c, _d, _e;
+            const before = (_a = itemData.before) !== null && _a !== void 0 ? _a : {};
+            const after = (_b = itemData.after) !== null && _b !== void 0 ? _b : {};
+            const entityId = (_d = (_c = itemData.entityId) !== null && _c !== void 0 ? _c : before === null || before === void 0 ? void 0 : before.id) !== null && _d !== void 0 ? _d : after === null || after === void 0 ? void 0 : after.id;
+            if (!entityId || !itemData.entityName)
+                return;
+            const auditItem = yield this.getAuditItemById(itemData.entityName, entityId);
             if (!auditItem)
                 return;
-            const entity = Object.assign(Object.assign({}, auditItem.entity), item.setParams);
             const changes = [];
-            for (const key of Object.keys(item.setParams)) {
-                if (auditItem.entity[key] == item.setParams[key])
+            const keys = new Set([
+                ...Object.keys(before || {}),
+                ...Object.keys(after || {}),
+            ]);
+            for (const key of keys) {
+                if (key === 'updatedAt')
                     continue;
-                if (auditItem.entity[key] == '' && item.setParams[key] == undefined)
+                const fromValue = before === null || before === void 0 ? void 0 : before[key];
+                const toValue = after === null || after === void 0 ? void 0 : after[key];
+                if (fromValue == toValue)
                     continue;
-                if (auditItem.entity[key] == undefined && item.setParams[key] == '')
+                if (fromValue == '' && toValue == undefined)
                     continue;
-                if (key === 'updatedAt')
+                if (fromValue == undefined && toValue == '')
                     continue;
                 changes.push({
                     field: key,
-                    from: this.parseInput(auditItem.entity[key]),
-                    to: this.parseInput(item.setParams[key]),
+                    from: this.parseInput(fromValue),
+                    to: this.parseInput(toValue),
                 });
             }
             if (changes.length === 0)
                 return;
-            const newAuditItem = this.auditLogCommandRepository.create(Object.assign(Object.assign({}, auditItem), { entity, auditLogId: item.requestId, parentId: auditItem.id, id: undefined, createdAt: new Date(item.createdAt), queryMethod: 'UPDATE', changes }));
+            const newAuditItem = this.auditLogCommandRepository.create(Object.assign(Object.assign({}, auditItem), { entity: after, entityId, auditLogId: itemData.requestId, parentId: auditItem.id, id: undefined, createdAt: new Date((_e = itemData.createdAt) !== null && _e !== void 0 ? _e : new Date()), queryMethod: 'UPDATE', changes }));
             yield this.auditLogCommandRepository.insert(newAuditItem);
         });
     }
     delete(itemData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const item = yield this.mapQueryToObject(itemData);
-            const auditItem = yield this.getAuditItem(item);
+            var _a, _b, _c;
+            const before = (_a = itemData.before) !== null && _a !== void 0 ? _a : {};
+            const entityId = (_b = itemData.entityId) !== null && _b !== void 0 ? _b : before === null || before === void 0 ? void 0 : before.id;
+            if (!entityId || !itemData.entityName)
+                return;
+            const auditItem = yield this.getAuditItemById(itemData.entityName, entityId);
             if (!auditItem)
                 return;
-            const newAuditItem = this.auditLogCommandRepository.create(Object.assign(Object.assign({}, auditItem), { entity: {}, auditLogId: item.requestId, parentId: auditItem.id, id: undefined, createdAt: new Date(item.createdAt), queryMethod: 'DELETE' }));
+            const newAuditItem = this.auditLogCommandRepository.create(Object.assign(Object.assign({}, auditItem), { entity: before, entityId, auditLogId: itemData.requestId, parentId: auditItem.id, id: undefined, createdAt: new Date((_c = itemData.createdAt) !== null && _c !== void 0 ? _c : new Date()), queryMethod: 'DELETE' }));
             yield this.auditLogCommandRepository.insert(newAuditItem);
         });
     }
@@ -161,9 +175,9 @@ let AuditLogCommandService = class AuditLogCommandService {
             return yield dataQuery.getManyAndCount();
         });
     }
-    getAuditItem(item) {
+    getAuditItemById(entityName, entityId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const qb = this.auditLogCommandRepository
+            return yield this.auditLogCommandRepository
                 .createQueryBuilder('cmd')
                 .select([
                 'cmd.id',
@@ -172,57 +186,10 @@ let AuditLogCommandService = class AuditLogCommandService {
                 'cmd.entityName',
                 'cmd.createdAt',
             ])
-                .where('cmd.entityName = :entityName', { entityName: item.entityName });
-            for (const [key, value] of Object.entries(item.whereParams || {})) {
-                qb.andWhere(`"cmd"."entity"->>'${key}' = :${key}`, { [key]: value });
-            }
-            qb.orderBy('cmd.createdAt', 'DESC');
-            return yield qb.getOne();
-        });
-    }
-    mapQueryToObject(payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { query, parameters, user, requestId, createdAt } = payload;
-            let setMatches = [];
-            if (query.startsWith('UPDATE')) {
-                const setClause = query.split('SET')[1].split('WHERE')[0].trim();
-                setMatches = setClause.match(/"[^"]+"\s*=\s*\$\d+/g) || [];
-            }
-            const whereClause = ((_a = query.split('WHERE')[1]) === null || _a === void 0 ? void 0 : _a.trim()) || '';
-            const whereMatches = whereClause.match(/"[^"]+"\s*(=|IN|BETWEEN|<|>|<=|>=|<>)\s*\(?\$?\d+(,\s*\$?\d+)*\)?/g) || [];
-            const allMatches = [...setMatches, ...whereMatches];
-            const setParams = {};
-            const whereParams = {};
-            allMatches.forEach((match, index) => {
-                const cleanedMatch = match.replace(/"/g, '').trim();
-                if (cleanedMatch.startsWith('(')) {
-                    const paramKey = `param${index}`;
-                    const paramList = cleanedMatch.match(/\$?\d+/g) || [];
-                    whereParams[paramKey] = paramList.map((param) => parseInt(param.replace('$', ''), 10));
-                }
-                else {
-                    const [key, param] = cleanedMatch
-                        .split(/=|IN|BETWEEN|<|>|<=|>=|<>/)
-                        .map((str) => str.trim());
-                    if (index < setMatches.length) {
-                        setParams[key] = parameters[index];
-                    }
-                    else {
-                        whereParams[key] = parameters[index];
-                    }
-                }
-            });
-            return {
-                setParams,
-                whereParams,
-                user,
-                requestId,
-                createdAt,
-                query,
-                entityName: query.split('"')[1],
-                entityId: whereParams['id'],
-            };
+                .where('cmd.entityName = :entityName', { entityName })
+                .andWhere('cmd.entityId = :entityId', { entityId })
+                .orderBy('cmd.createdAt', 'DESC')
+                .getOne();
         });
     }
     parseInput(input) {

package/dist/mezgeb/mezgeb.dto.d.ts

@@ -30,6 +30,15 @@ export declare class CreateEventDTO {
     query?: string;
     parameters?: any[];
 }
+export declare class ChangeEventDTO {
+    entityName: string;
+    entityId?: string;
+    user: any;
+    requestId: string;
+    createdAt?: Date;
+    before?: any;
+    after?: any;
+}
 export declare class EmitQueryDTO {
     createdAt: Date;
     query: string;

package/dist/mezgeb/mezgeb.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mezgeb.dto.d.ts","sourceRoot":"","sources":["../../libs/mezgeb/src/mezgeb/mezgeb.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AA2CvD,qBAAa,iBAAiB;IAC5B,aAAa,EAAG,sBAAsB,CAAC;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,EAAG,MAAM,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC;IAChB,WAAW,EAAG,GAAG,CAAC;IAClB,aAAa,EAAG,GAAG,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,SAAS,EAAG,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAG,GAAG,CAAC;CACZ;AAED,qBAAa,cAAc;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAG,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,SAAS,EAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,SAAS,EAAG,IAAI,CAAC;CAClB;AAED,qBAAa,cAAc;IACzB,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAG,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;CACpB;AACD,qBAAa,YAAY;IACvB,SAAS,EAAG,IAAI,CAAC;IACjB,KAAK,EAAG,MAAM,CAAC;IACf,UAAU,EAAG,GAAG,EAAE,CAAC;IACnB,SAAS,EAAG,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAGD,qBAAa,aAAa;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAG,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,cAAc,GAAG,cAAc,CAAC;IAC9C,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH;AAED,qBAAa,yBAAyB;IACpC,SAAS,EAAG,MAAM,CAAC;IACnB,aAAa,EAAG,MAAM,CAAC;IACvB,UAAU,EAAG,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"mezgeb.dto.d.ts","sourceRoot":"","sources":["../../libs/mezgeb/src/mezgeb/mezgeb.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AA2CvD,qBAAa,iBAAiB;IAC5B,aAAa,EAAG,sBAAsB,CAAC;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,EAAG,MAAM,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC;IAChB,WAAW,EAAG,GAAG,CAAC;IAClB,aAAa,EAAG,GAAG,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,SAAS,EAAG,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAG,GAAG,CAAC;CACZ;AAED,qBAAa,cAAc;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAG,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,SAAS,EAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,SAAS,EAAG,IAAI,CAAC;CAClB;AAED,qBAAa,cAAc;IACzB,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAG,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;CACpB;AAED,qBAAa,cAAc;IACzB,UAAU,EAAG,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAG,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,qBAAa,YAAY;IACvB,SAAS,EAAG,IAAI,CAAC;IACjB,KAAK,EAAG,MAAM,CAAC;IACf,UAAU,EAAG,GAAG,EAAE,CAAC;IACnB,SAAS,EAAG,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAGD,qBAAa,aAAa;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAG,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,cAAc,GAAG,cAAc,CAAC;IAC9C,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH;AAED,qBAAa,yBAAyB;IACpC,SAAS,EAAG,MAAM,CAAC;IACnB,aAAa,EAAG,MAAM,CAAC;IACvB,UAAU,EAAG,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/dist/mezgeb/mezgeb.dto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApproveTransactionPayload = exports.AuditChildDto = exports.EmitQueryDTO = exports.CreateEventDTO = exports.UpdateEventDTO = exports.CreateAuditLogDto = void 0;
+exports.ApproveTransactionPayload = exports.AuditChildDto = exports.EmitQueryDTO = exports.ChangeEventDTO = exports.CreateEventDTO = exports.UpdateEventDTO = exports.CreateAuditLogDto = void 0;
 // export class CreateAuditLogDto {
 //   requestMethod!: EAuditLogRequestMethod;
 //   id!: string;
@@ -48,6 +48,9 @@ exports.UpdateEventDTO = UpdateEventDTO;
 class CreateEventDTO {
 }
 exports.CreateEventDTO = CreateEventDTO;
+class ChangeEventDTO {
+}
+exports.ChangeEventDTO = ChangeEventDTO;
 class EmitQueryDTO {
 }
 exports.EmitQueryDTO = EmitQueryDTO;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estgbue/mezgeb",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "main": "./src/index",
   "exports": {
     ".": "./dist/index.js"