@autofleet/shtinker 0.0.6 → 0.0.8

package/dist/audit-logger.d.ts

@@ -1,9 +1,11 @@
-import { AuditLoggerOptions, AuditLogContext } from './types';
+import { AuditLogPayload, AuditLoggerOptions, AuditLogContext } from './types';
 declare class AuditLogger {
     private rabbit;
     private sequelize;
+    private logger;
     constructor(options: AuditLoggerOptions);
-    addModelHooks(): void;
-    sendAuditLog(context: AuditLogContext): Promise<void>;
+    registerHooks(): void;
+    sendAuditLogContext(context: AuditLogContext): Promise<void>;
+    sendAuditLogRows(payload: AuditLogPayload): Promise<void>;
 }
 export default AuditLogger;

package/dist/audit-logger.js

@@ -21,8 +21,9 @@ class AuditLogger {
     constructor(options) {
         this.rabbit = options.rabbit;
         this.sequelize = options.sequelize;
+        this.logger = options.logger;
     }
-    addModelHooks() {
+    registerHooks() {
         Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
             modelType.addHook('afterSave', (instance) => __awaiter(this, void 0, void 0, function* () {
                 const auditContext = getAuditContext();
@@ -37,14 +38,29 @@ class AuditLogger {
                             newValue: instance.get(property),
                         })),
                     };
-                    yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_ROWS_QUEUE, payload);
+                    this.sendAuditLogRows(payload);
                 }
             }));
         });
     }
-    sendAuditLog(context) {
+    sendAuditLogContext(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
+            try {
+                yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
+            }
+            catch (err) {
+                this.logger.error('Failed to send audit log context', err);
+            }
+        });
+    }
+    sendAuditLogRows(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_ROWS_QUEUE, payload);
+            }
+            catch (err) {
+                this.logger.error('Failed to send audit log rows', err);
+            }
         });
     }
 }

package/dist/const.d.ts

@@ -1,3 +1,4 @@
 export declare const AUDIT_LOG_CONTEXT_QUEUE = "audit-log-context";
 export declare const AUDIT_LOG_ROWS_QUEUE = "audit-log-rows";
 export declare const AUDIT_LOG_CONTEXT_KEY = "auditLogContext";
+export declare const USER_CONTEXT_KEY = "userObject";

package/dist/const.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AUDIT_LOG_CONTEXT_KEY = exports.AUDIT_LOG_ROWS_QUEUE = exports.AUDIT_LOG_CONTEXT_QUEUE = void 0;
+exports.USER_CONTEXT_KEY = exports.AUDIT_LOG_CONTEXT_KEY = exports.AUDIT_LOG_ROWS_QUEUE = exports.AUDIT_LOG_CONTEXT_QUEUE = void 0;
 exports.AUDIT_LOG_CONTEXT_QUEUE = 'audit-log-context';
 exports.AUDIT_LOG_ROWS_QUEUE = 'audit-log-rows';
 exports.AUDIT_LOG_CONTEXT_KEY = 'auditLogContext';
+exports.USER_CONTEXT_KEY = 'userObject';

package/dist/index.js

@@ -33,13 +33,13 @@ const const_1 = require("./const");
 let auditLogger;
 const enableAuditing = (options) => {
     auditLogger = new audit_logger_1.default(options);
-    auditLogger.addModelHooks();
+    auditLogger.registerHooks();
 };
 exports.enableAuditing = enableAuditing;
 const setAuditContext = (entityType, entityIdFetcher, 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 user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
         const auditLogContext = {
             entityType,
             entityId: entityIdFetcher(req),
@@ -49,7 +49,7 @@ const setAuditContext = (entityType, entityIdFetcher, action) => (req, res, next
             performedBy: user.id,
         };
         currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-        yield auditLogger.sendAuditLog(auditLogContext);
+        yield auditLogger.sendAuditLogContext(auditLogContext);
     }
     return next();
 });

package/dist/types.d.ts

@@ -3,6 +3,7 @@ import RabbitMq from '@autofleet/rabbit';
 export type AuditLoggerOptions = {
     rabbit: RabbitMq;
     sequelize: Sequelize;
+    logger: any;
 };
 export interface AuditLogContext {
     entityType: string;
@@ -20,5 +21,5 @@ export interface AuditLogRow {
 export interface AuditLogPayload {
     entityType: string;
     entityId: string;
-    rows: AuditLogRow;
+    rows: AuditLogRow[];
 }

package/package.json

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

package/src/audit-logger.ts

@@ -13,12 +13,15 @@ class AuditLogger {
 
   private sequelize;
 
+  private logger;
+
   constructor(options: AuditLoggerOptions) {
     this.rabbit = options.rabbit;
     this.sequelize = options.sequelize;
+    this.logger = options.logger;
   }
 
-  addModelHooks(): void {
+  registerHooks(): void {
     Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
       modelType.addHook('afterSave', async (instance: any) => {
         const auditContext = getAuditContext();
@@ -33,14 +36,26 @@ class AuditLogger {
               newValue: instance.get(property),
             })),
           };
-          await this.rabbit.sendToQueue(AUDIT_LOG_ROWS_QUEUE, payload);
+          this.sendAuditLogRows(payload);
         }
       });
     });
   }
 
-  async sendAuditLog(context: AuditLogContext): Promise<void> {
-    await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, context);
+  async sendAuditLogContext(context: AuditLogContext): Promise<void> {
+    try {
+      await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, context);
+    } catch (err) {
+      this.logger.error('Failed to send audit log context', err);
+    }
+  }
+
+  async sendAuditLogRows(payload: AuditLogPayload): Promise<void> {
+    try {
+      await this.rabbit.sendToQueue(AUDIT_LOG_ROWS_QUEUE, payload);
+    } catch (err) {
+      this.logger.error('Failed to send audit log rows', err);
+    }
   }
 }
 

package/src/const.ts

@@ -1,3 +1,4 @@
 export const AUDIT_LOG_CONTEXT_QUEUE = 'audit-log-context';
 export const AUDIT_LOG_ROWS_QUEUE = 'audit-log-rows';
 export const AUDIT_LOG_CONTEXT_KEY = 'auditLogContext';
+export const USER_CONTEXT_KEY = 'userObject';

package/src/index.ts

@@ -1,13 +1,13 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import AuditLogger from './audit-logger';
 import { AuditLogContext, AuditLoggerOptions } from './types';
-import { AUDIT_LOG_CONTEXT_KEY } from './const';
+import { AUDIT_LOG_CONTEXT_KEY, USER_CONTEXT_KEY } from './const';
 
 let auditLogger: AuditLogger;
 
 export const enableAuditing = (options: AuditLoggerOptions) => {
   auditLogger = new AuditLogger(options);
-  auditLogger.addModelHooks();
+  auditLogger.registerHooks();
 };
 
 export const setAuditContext = (
@@ -17,7 +17,7 @@ export const setAuditContext = (
 ) => async (req: any, res: any, next: any): Promise<any> => {
   const currentTrace = getCurrentTrace();
   if (currentTrace) {
-    const user = currentTrace.context.get('userObject');
+    const user = currentTrace.context.get(USER_CONTEXT_KEY);
     const auditLogContext: AuditLogContext = {
       entityType,
       entityId: entityIdFetcher(req),
@@ -27,7 +27,7 @@ export const setAuditContext = (
       performedBy: user.id,
     };
     currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-    await auditLogger.sendAuditLog(auditLogContext);
+    await auditLogger.sendAuditLogContext(auditLogContext);
   }
   return next();
 };

package/src/types.ts

@@ -4,6 +4,7 @@ import RabbitMq from '@autofleet/rabbit';
 export type AuditLoggerOptions = {
   rabbit: RabbitMq;
   sequelize: Sequelize;
+  logger: any;
 };
 
 export interface AuditLogContext {
@@ -14,6 +15,7 @@ export interface AuditLogContext {
   endpoint: string;
   method: string;
 }
+
 export interface AuditLogRow {
   property: string;
   previousValue: any;
@@ -23,5 +25,5 @@ export interface AuditLogRow {
 export interface AuditLogPayload {
   entityType: string;
   entityId: string;
-  rows: AuditLogRow;
+  rows: AuditLogRow[];
 }