@autofleet/shtinker 0.0.1 → 0.0.2

package/dist/index.d.ts

@@ -1,9 +1,10 @@
-import { AuditLoggerOptions } from './types';
+import { AuditLoggerOptions, AuditLogContext } from './types';
 declare class AuditLogger {
     private rabbit;
     private sequelize;
     constructor(options: AuditLoggerOptions);
-    enableAuditLogging(): void;
-    setAuditingContext: (entityType: string, entityId: string, action: string) => (req: any, res: any, next: any) => Promise<void>;
+    addModelHooks(): void;
+    sendAuditLog(context: AuditLogContext): Promise<void>;
 }
+export declare const setAuditContext: (entityType: string, entityId: string, action: string) => (req: any, res: any, next: any) => Promise<any>;
 export default AuditLogger;

package/dist/index.js

@@ -9,41 +9,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setAuditContext = void 0;
 const zehut_1 = require("@autofleet/zehut");
 const const_1 = require("./const");
-const getAuditingContext = () => {
+const getAuditContext = () => {
     var _a;
     const currentTrace = (0, zehut_1.getCurrentPayload)();
-    const auditingContext = (_a = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _a === void 0 ? void 0 : _a.get(const_1.AUDIT_LOG_CONTEXT_KEY);
-    return auditingContext;
+    const auditContext = (_a = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _a === void 0 ? void 0 : _a.get(const_1.AUDIT_LOG_CONTEXT_KEY);
+    return auditContext;
 };
 class AuditLogger {
     constructor(options) {
-        this.setAuditingContext = (entityType, entityId, action) => (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            const currentTrace = (0, zehut_1.getCurrentPayload)();
-            if (currentTrace) {
-                const user = currentTrace.context.get('userObject');
-                const auditLogContext = {
-                    entityType,
-                    entityId,
-                    action,
-                    endpoint: req.url,
-                    method: req.method,
-                    performedBy: user.id,
-                };
-                currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-                yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, auditLogContext);
-                next();
-            }
-        });
         this.rabbit = options.rabbit;
         this.sequelize = options.sequelize;
     }
-    enableAuditLogging() {
+    addModelHooks() {
         Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
             modelType.addHook('afterSave', (instance) => __awaiter(this, void 0, void 0, function* () {
-                const auditingContext = getAuditingContext();
-                if (auditingContext) {
+                const auditContext = getAuditContext();
+                if (auditContext) {
                     const changedProperties = instance.changed();
                     const payload = {
                         entityType: modelName,
@@ -59,5 +43,27 @@ class AuditLogger {
             }));
         });
     }
+    sendAuditLog(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
+        });
+    }
 }
+const setAuditContext = (entityType, entityId, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const currentTrace = (0, zehut_1.getCurrentPayload)();
+    if (currentTrace) {
+        const user = currentTrace.context.get('userObject');
+        const auditLogContext = {
+            entityType,
+            entityId,
+            action,
+            endpoint: req.url,
+            method: req.method,
+            performedBy: user.id,
+        };
+        currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
+    }
+    return next();
+});
+exports.setAuditContext = setAuditContext;
 exports.default = AuditLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -2,10 +2,10 @@ import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import { AuditLogPayload, AuditLoggerOptions, AuditLogContext } from './types';
 import { AUDIT_LOG_CONTEXT_QUEUE, AUDIT_LOG_ROWS_QUEUE, AUDIT_LOG_CONTEXT_KEY } from './const';
 
-const getAuditingContext = () => {
+const getAuditContext = () => {
   const currentTrace = getCurrentTrace();
-  const auditingContext = currentTrace?.context?.get(AUDIT_LOG_CONTEXT_KEY);
-  return auditingContext;
+  const auditContext = currentTrace?.context?.get(AUDIT_LOG_CONTEXT_KEY);
+  return auditContext;
 };
 
 class AuditLogger {
@@ -18,11 +18,11 @@ class AuditLogger {
     this.sequelize = options.sequelize;
   }
 
-  enableAuditLogging(): void {
+  addModelHooks(): void {
     Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
       modelType.addHook('afterSave', async (instance: any) => {
-        const auditingContext = getAuditingContext();
-        if (auditingContext) {
+        const auditContext = getAuditContext();
+        if (auditContext) {
           const changedProperties = instance.changed();
           const payload: AuditLogPayload = {
             entityType: modelName,
@@ -39,23 +39,30 @@ class AuditLogger {
     });
   }
 
-  setAuditingContext = (entityType: string, entityId: string, action: string) => async (req: any, res: any, next: any) => {
-    const currentTrace = getCurrentTrace();
-    if (currentTrace) {
-      const user = currentTrace.context.get('userObject');
-      const auditLogContext: AuditLogContext = {
-        entityType,
-        entityId,
-        action,
-        endpoint: req.url,
-        method: req.method,
-        performedBy: user.id,
-      };
-      currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-      await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, auditLogContext);
-      next();
-    }
+  async sendAuditLog(context: AuditLogContext): Promise<void> {
+    await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, context);
   }
 }
 
+export const setAuditContext = (
+  entityType: string,
+  entityId: string,
+  action: string,
+) => async (req: any, res: any, next: any): Promise<any> => {
+  const currentTrace = getCurrentTrace();
+  if (currentTrace) {
+    const user = currentTrace.context.get('userObject');
+    const auditLogContext: AuditLogContext = {
+      entityType,
+      entityId,
+      action,
+      endpoint: req.url,
+      method: req.method,
+      performedBy: user.id,
+    };
+    currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
+  }
+  return next();
+};
+
 export default AuditLogger;