@autofleet/shtinker 1.1.7-beta.2 → 1.1.7-beta.5

package/dist/audit-logger.d.ts

@@ -1,4 +1,5 @@
 import { AuditLogPayload, AuditLoggerOptions, AuditLogContext } from './types';
+export declare const shouldSkipAuditLogic: () => boolean;
 declare class AuditLogger {
     private rabbit;
     private sequelize;

package/dist/audit-logger.js

@@ -12,15 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldSkipAuditLogic = void 0;
 const zehut_1 = require("@autofleet/zehut");
 const const_1 = require("./const");
 const logger_1 = __importDefault(require("./logger"));
+const ENVS_TO_DISABLE_AUDIT_LOGIC = ['production-jp', 'loadtesting'];
+const shouldSkipAuditLogic = () => ENVS_TO_DISABLE_AUDIT_LOGIC.includes(process.env.ENV_NAME);
+exports.shouldSkipAuditLogic = shouldSkipAuditLogic;
 const getAuditContext = () => {
     var _a;
     const currentTrace = (0, zehut_1.getCurrentPayload)();
-    logger_1.default.info('getAuditContext currentTrace', { currentTrace });
     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('getAuditContext auditContext', { auditContext });
     return auditContext;
 };
 const isEmpty = (field) => {
@@ -52,8 +54,10 @@ class AuditLogger {
         Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
             modelType.addHook('afterSave', (instance, options) => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if ((0, exports.shouldSkipAuditLogic)()) {
+                        return;
+                    }
                     const auditContext = getAuditContext();
-                    logger_1.default.info('auditContext from shtinker', { auditContext });
                     if (auditContext) {
                         const changedProperties = getChangedFields(instance, options);
                         const payload = {
@@ -65,7 +69,6 @@ class AuditLogger {
                                 newValue: instance.get(property),
                             })),
                         };
-                        logger_1.default.info('sending audit log rows from shtinker', { payload });
                         this.sendAuditLogRows(payload);
                     }
                 }

package/dist/index.js

@@ -10,6 +10,18 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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);
 };
@@ -28,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setRabbitAuditContext = exports.setAuditContext = exports.enableAuditing = void 0;
 const zehut_1 = require("@autofleet/zehut");
-const audit_logger_1 = __importDefault(require("./audit-logger"));
+const audit_logger_1 = __importStar(require("./audit-logger"));
 const const_1 = require("./const");
 const audit_api_1 = __importDefault(require("./audit-api"));
 const logger_1 = __importDefault(require("./logger"));
@@ -41,8 +53,7 @@ const enableAuditing = (options) => {
 exports.enableAuditing = enableAuditing;
 const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const ENVS_TO_DISABLE_AUDIT_LOGIC = ['production-jp', 'loadtesting', '22dd162d-2c7e-4cf3-a97a-0d8ca6b8a661'];
-        if (ENVS_TO_DISABLE_AUDIT_LOGIC.includes(process.env.ENV_NAME)) {
+        if ((0, audit_logger_1.shouldSkipAuditLogic)()) {
             return next();
         }
         const currentTrace = (0, zehut_1.getCurrentPayload)();
@@ -67,6 +78,9 @@ const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(vo
 exports.setAuditContext = setAuditContext;
 const setRabbitAuditContext = (entityType, action) => (endpoint) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    if ((0, audit_logger_1.shouldSkipAuditLogic)()) {
+        return;
+    }
     const currentTrace = (0, zehut_1.getCurrentPayload)();
     if ((_a = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _a === void 0 ? void 0 : _a.get) {
         const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "1.1.7-beta.2",
+  "version": "1.1.7-beta.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/audit-logger.ts

@@ -6,11 +6,13 @@ import { AUDIT_LOG_CONTEXT_QUEUE, AUDIT_LOG_ROWS_QUEUE, AUDIT_LOG_CONTEXT_KEY }
 
 import logger from './logger';
 
+const ENVS_TO_DISABLE_AUDIT_LOGIC = ['production-jp', 'loadtesting'];
+
+export const shouldSkipAuditLogic = (): boolean => ENVS_TO_DISABLE_AUDIT_LOGIC.includes(process.env.ENV_NAME);
+
 const getAuditContext = () => {
   const currentTrace = getCurrentTrace();
-  logger.info('getAuditContext currentTrace', { currentTrace });
   const auditContext = currentTrace?.context?.get(AUDIT_LOG_CONTEXT_KEY);
-  logger.info('getAuditContext auditContext', { auditContext });
   return auditContext;
 };
 
@@ -53,8 +55,10 @@ class AuditLogger {
     Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
       modelType.addHook('afterSave', async (instance: any, options: any) => {
         try {
+          if (shouldSkipAuditLogic()) {
+            return;
+          }
           const auditContext = getAuditContext();
-          logger.info('auditContext from shtinker', { auditContext });
           if (auditContext) {
             const changedProperties = getChangedFields(instance, options);
             const payload: AuditLogPayload = {
@@ -66,7 +70,6 @@ class AuditLogger {
                 newValue: instance.get(property),
               })),
             };
-            logger.info('sending audit log rows from shtinker', { payload });
             this.sendAuditLogRows(payload);
           }
         } catch (error) {

package/src/index.ts

@@ -1,5 +1,5 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
-import AuditLogger from './audit-logger';
+import AuditLogger, { shouldSkipAuditLogic } from './audit-logger';
 import { AuditLogContext, AuditLoggerOptions } from './types';
 import { AUDIT_LOG_CONTEXT_KEY, USER_CONTEXT_KEY } from './const';
 import addAuditApi from './audit-api';
@@ -18,8 +18,7 @@ export const setAuditContext = (
   action: string,
 ) => async (req: any, res: any, next: any): Promise<any> => {
   try {
-    const ENVS_TO_DISABLE_AUDIT_LOGIC = ['production-jp', 'loadtesting', '22dd162d-2c7e-4cf3-a97a-0d8ca6b8a661'];
-    if (ENVS_TO_DISABLE_AUDIT_LOGIC.includes(process.env.ENV_NAME)) {
+    if (shouldSkipAuditLogic()) {
       return next();
     }
 
@@ -46,6 +45,9 @@ export const setRabbitAuditContext = (
   entityType: string,
   action: string,
 ) => async (endpoint: string): Promise<any> => {
+  if (shouldSkipAuditLogic()) {
+    return;
+  }
   const currentTrace = getCurrentTrace();
   if (currentTrace?.context?.get) {
     const user = currentTrace.context.get(USER_CONTEXT_KEY);