@autofleet/shtinker 0.0.9-beta3 → 0.0.10

package/dist/audit-api.js

@@ -13,10 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("@autofleet/errors");
-const logger_1 = __importDefault(require("./logger"));
 const audit_ms_1 = __importDefault(require("./audit-ms"));
 exports.default = ({ router, entiyScopedModelMap, }) => __awaiter(void 0, void 0, void 0, function* () {
-    logger_1.default.info('*** SEPHI got here', { entiyScopedModelMap });
     if (entiyScopedModelMap) {
         Object.entries(entiyScopedModelMap).forEach(([entity, ScopedModel]) => {
             router.get(`${entity}/:id/audit`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/audit-logger.js

@@ -19,7 +19,6 @@ const getAuditContext = () => {
     var _a;
     const currentTrace = (0, zehut_1.getCurrentPayload)();
     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);
-    logger_1.default.info('*** SEPHI getAuditContext', { currentTrace, auditContext });
     return auditContext;
 };
 class AuditLogger {
@@ -32,9 +31,7 @@ class AuditLogger {
         Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
             modelType.addHook('afterSave', (instance) => __awaiter(this, void 0, void 0, function* () {
                 const auditContext = getAuditContext();
-                logger_1.default.info('*** SEPHI after save', { instance, auditContext });
                 if (auditContext) {
-                    logger_1.default.info('*** SEPHI after save got context', { instance, auditContext });
                     const changedProperties = instance.changed();
                     const payload = {
                         entityType: modelName,
@@ -45,7 +42,6 @@ class AuditLogger {
                             newValue: instance.get(property),
                         })),
                     };
-                    logger_1.default.info('*** SEPHI after save got context payload', { payload, changedProperties });
                     this.sendAuditLogRows(payload);
                 }
             }));
@@ -53,7 +49,6 @@ class AuditLogger {
     }
     sendAuditLogContext(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.default.info('*** SEPHI sendAuditLogContext', { context });
             try {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
             }
@@ -64,7 +59,6 @@ class AuditLogger {
     }
     sendAuditLogRows(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.default.info('*** SEPHI sendAuditLogRows', { payload });
             try {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_ROWS_QUEUE, payload);
             }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import AuditLogger from './audit-logger';
 import { AuditLoggerOptions } from './types';
 export declare const enableAuditing: (options: AuditLoggerOptions) => void;
-export declare const setAuditContext: (entityType: string, entityId: string, action: string) => (req: any, res: any, next: any) => Promise<any>;
+export declare const setAuditContext: (entityType: string, action: string) => (req: any, res: any, next: any) => Promise<any>;
 export * from './types';
 export * from './const';
 export default AuditLogger;

package/dist/index.js

@@ -31,39 +31,26 @@ const zehut_1 = require("@autofleet/zehut");
 const audit_logger_1 = __importDefault(require("./audit-logger"));
 const const_1 = require("./const");
 const audit_api_1 = __importDefault(require("./audit-api"));
-const logger_1 = __importDefault(require("./logger"));
 let auditLogger;
-// export let getCurrentTrace: () => any;
 const enableAuditing = (options) => {
     auditLogger = new audit_logger_1.default(options);
-    // getCurrentTrace = options.getCurrentTrace;
     (0, audit_api_1.default)(options);
     auditLogger.registerHooks();
 };
 exports.enableAuditing = enableAuditing;
-const setAuditContext = (entityType, entityId, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     const currentTrace = (0, zehut_1.getCurrentPayload)();
-    logger_1.default.info('*** SEPHI current trace', { currentTrace });
     if (currentTrace) {
-        try {
-            logger_1.default.info('*** SEPHI entered if');
-            const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
-            logger_1.default.info('*** SEPHI user', { user });
-            const auditLogContext = {
-                entityType,
-                entityId,
-                action,
-                endpoint: req.url,
-                method: req.method,
-                performedBy: user.id,
-            };
-            logger_1.default.info('*** SEPHI auditLogContext', { auditLogContext });
-            currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-            yield auditLogger.sendAuditLogContext(auditLogContext);
-        }
-        catch (err) {
-            logger_1.default.error('*** SEPHI something wrong with trace', err);
-        }
+        const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
+        const auditLogContext = {
+            entityType,
+            action,
+            endpoint: req.url,
+            method: req.method,
+            performedBy: user.id,
+        };
+        currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
+        yield auditLogger.sendAuditLogContext(auditLogContext);
     }
     return next();
 });

package/dist/types.d.ts

@@ -8,7 +8,6 @@ export type AuditLoggerOptions = {
 };
 export interface AuditLogContext {
     entityType: string;
-    entityId: string;
     action: string;
     performedBy: string;
     endpoint: string;

package/package.json

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

package/src/audit-api.ts

@@ -1,6 +1,5 @@
 import { Router } from 'express';
 import { handleError, ResourceNotFoundError, UnexpectedError } from '@autofleet/errors';
-import logger from './logger';
 
 import auditMs from './audit-ms';
 
@@ -11,7 +10,6 @@ export default async ({
   router: Router,
   entiyScopedModelMap: Array<any>,
 }): Promise<void> => {
-  logger.info('*** SEPHI got here', { entiyScopedModelMap });
   if (entiyScopedModelMap) {
     Object.entries(entiyScopedModelMap).forEach(([entity, ScopedModel]) => {
       router.get(`${entity}/:id/audit`, async (req, res) => {

package/src/audit-logger.ts

@@ -1,5 +1,6 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
-// import { getCurrentTrace } from './index';
+import { Sequelize } from 'sequelize';
+
 import { AuditLogPayload, AuditLoggerOptions, AuditLogContext } from './types';
 import { AUDIT_LOG_CONTEXT_QUEUE, AUDIT_LOG_ROWS_QUEUE, AUDIT_LOG_CONTEXT_KEY } from './const';
 
@@ -8,14 +9,13 @@ import logger from './logger';
 const getAuditContext = () => {
   const currentTrace = getCurrentTrace();
   const auditContext = currentTrace?.context?.get(AUDIT_LOG_CONTEXT_KEY);
-  logger.info('*** SEPHI getAuditContext', { currentTrace, auditContext });
   return auditContext;
 };
 
 class AuditLogger {
   private rabbit;
 
-  private sequelize;
+  private sequelize: Sequelize;
 
   private logger;
 
@@ -27,11 +27,9 @@ class AuditLogger {
 
   registerHooks(): void {
     Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
-      (modelType as any).addHook('afterSave', async (instance: any) => {
+      modelType.addHook('afterSave', async (instance: any) => {
         const auditContext = getAuditContext();
-        logger.info('*** SEPHI after save', { instance, auditContext });
         if (auditContext) {
-          logger.info('*** SEPHI after save got context', { instance, auditContext });
           const changedProperties = instance.changed();
           const payload: AuditLogPayload = {
             entityType: modelName,
@@ -42,7 +40,6 @@ class AuditLogger {
               newValue: instance.get(property),
             })),
           };
-          logger.info('*** SEPHI after save got context payload', { payload, changedProperties });
           this.sendAuditLogRows(payload);
         }
       });
@@ -50,7 +47,6 @@ class AuditLogger {
   }
 
   async sendAuditLogContext(context: AuditLogContext): Promise<void> {
-    logger.info('*** SEPHI sendAuditLogContext', { context });
     try {
       await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, context);
     } catch (err) {
@@ -59,7 +55,6 @@ class AuditLogger {
   }
 
   async sendAuditLogRows(payload: AuditLogPayload): Promise<void> {
-    logger.info('*** SEPHI sendAuditLogRows', { payload });
     try {
       await this.rabbit.sendToQueue(AUDIT_LOG_ROWS_QUEUE, payload);
     } catch (err) {

package/src/audit-ms.ts

@@ -2,7 +2,7 @@ import Network from '@autofleet/network';
 
 const auditMs = new Network({ serviceName: 'AUDIT_MS', timeout: 1000 * 60 });
 
-const getByEntityId = (entityId: string) => {
+const getByEntityId = (entityId: string): any => {
   const { data } = auditMs.get(`api/v1/audit-logs/${entityId}`);
   return data;
 };

package/src/index.ts

@@ -4,45 +4,30 @@ import { AuditLogContext, AuditLoggerOptions } from './types';
 import { AUDIT_LOG_CONTEXT_KEY, USER_CONTEXT_KEY } from './const';
 import addAuditApi from './audit-api';
 
-import logger from './logger';
-
 let auditLogger: AuditLogger;
 
-// export let getCurrentTrace: () => any;
-
 export const enableAuditing = (options: AuditLoggerOptions) => {
   auditLogger = new AuditLogger(options);
-  // getCurrentTrace = options.getCurrentTrace;
   addAuditApi(options as any);
   auditLogger.registerHooks();
 };
 
 export const setAuditContext = (
   entityType: string,
-  entityId: string,
   action: string,
 ) => async (req: any, res: any, next: any): Promise<any> => {
   const currentTrace = getCurrentTrace();
-  logger.info('*** SEPHI current trace', { currentTrace });
   if (currentTrace) {
-    try {
-      logger.info('*** SEPHI entered if');
-      const user = currentTrace.context.get(USER_CONTEXT_KEY);
-      logger.info('*** SEPHI user', { user });
-      const auditLogContext: AuditLogContext = {
-        entityType,
-        entityId,
-        action,
-        endpoint: req.url,
-        method: req.method,
-        performedBy: user.id,
-      };
-      logger.info('*** SEPHI auditLogContext', { auditLogContext });
-      currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
-      await auditLogger.sendAuditLogContext(auditLogContext);
-    } catch (err) {
-      logger.error('*** SEPHI something wrong with trace', err);
-    }
+    const user = currentTrace.context.get(USER_CONTEXT_KEY);
+    const auditLogContext: AuditLogContext = {
+      entityType,
+      action,
+      endpoint: req.url,
+      method: req.method,
+      performedBy: user.id,
+    };
+    currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
+    await auditLogger.sendAuditLogContext(auditLogContext);
   }
   return next();
 };

package/src/types.ts

@@ -1,6 +1,5 @@
 import { Sequelize } from 'sequelize-typescript';
 import RabbitMq from '@autofleet/rabbit';
-import { getCurrentTrace } from '@autofleet/zehut/lib/tracer';
 
 export type AuditLoggerOptions = {
   rabbit: RabbitMq;
@@ -11,7 +10,6 @@ export type AuditLoggerOptions = {
 
 export interface AuditLogContext {
   entityType: string;
-  entityId: string;
   action: string;
   performedBy: string;
   endpoint: string;

package/tsconfig.json

@@ -6,7 +6,7 @@
     "outDir": "./dist",
     "esModuleInterop": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
+    "emitDecoratorMetadata": true
   },
   "exclude": ["node_modules", "**/*.test.ts", "dist"]
 }