@autofleet/shtinker 1.1.7 → 1.1.9

package/dist/audit-logger.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const zehut_1 = require("@autofleet/zehut");
+const lodash_1 = require("lodash");
 const const_1 = require("./const");
 const logger_1 = __importDefault(require("./logger"));
 const CUSTOM_FIELDS_PROPERTY = 'customFields';
@@ -54,7 +55,11 @@ const getChangedCustomFieldsRows = (instance) => {
     }
     const customFields = instance.get(CUSTOM_FIELDS_PROPERTY);
     const previousCustomFields = instance.previous(CUSTOM_FIELDS_PROPERTY);
-    const changedCustomFields = Object.keys(customFields).filter((field) => !isEmpty(customFields === null || customFields === void 0 ? void 0 : customFields[field]) || !isEmpty(previousCustomFields === null || previousCustomFields === void 0 ? void 0 : previousCustomFields[field]));
+    const changedCustomFields = Object.keys(customFields).filter((field) => {
+        const newValue = customFields === null || customFields === void 0 ? void 0 : customFields[field];
+        const oldValue = previousCustomFields === null || previousCustomFields === void 0 ? void 0 : previousCustomFields[field];
+        return (!isEmpty(newValue) || !isEmpty(oldValue)) && !(0, lodash_1.isEqual)(newValue, oldValue);
+    });
     return changedCustomFields.map((changedCustomField) => ({
         property: `customFields.${changedCustomField}`,
         previousValue: previousCustomFields === null || previousCustomFields === void 0 ? void 0 : previousCustomFields[changedCustomField],

package/dist/index.js

@@ -34,13 +34,18 @@ const audit_api_1 = __importDefault(require("./audit-api"));
 const logger_1 = __importDefault(require("./logger"));
 let auditLogger;
 const enableAuditing = (options) => {
-    auditLogger = new audit_logger_1.default(options);
-    (0, audit_api_1.default)(options);
-    auditLogger.registerHooks();
+    if (process.env.DISABLE_AUDIT_LOGS !== 'true') {
+        auditLogger = new audit_logger_1.default(options);
+        (0, audit_api_1.default)(options);
+        auditLogger.registerHooks();
+    }
 };
 exports.enableAuditing = enableAuditing;
 const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
+        if (process.env.DISABLE_AUDIT_LOGS === 'true') {
+            return next();
+        }
         const currentTrace = (0, zehut_1.getCurrentPayload)();
         if (currentTrace && currentTrace.context && currentTrace.context.get) {
             const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
@@ -63,6 +68,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 (process.env.DISABLE_AUDIT_LOGS === 'true') {
+        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",
+  "version": "1.1.9",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "@autofleet/network": "^1.4.7",
     "@autofleet/rabbit": "^3.2.18",
     "@autofleet/zehut": "^3.0.10",
+    "lodash": "^4.17.21",
     "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {

package/src/audit-logger.ts

@@ -1,5 +1,6 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import { Sequelize } from 'sequelize';
+import { isEqual } from 'lodash';
 
 import { AuditLogPayload, AuditLoggerOptions, AuditLogContext } from './types';
 import { AUDIT_LOG_CONTEXT_QUEUE, AUDIT_LOG_ROWS_QUEUE, AUDIT_LOG_CONTEXT_KEY } from './const';
@@ -50,7 +51,11 @@ const getChangedCustomFieldsRows = (instance) => {
 
   const customFields = instance.get(CUSTOM_FIELDS_PROPERTY);
   const previousCustomFields = instance.previous(CUSTOM_FIELDS_PROPERTY);
-  const changedCustomFields = Object.keys(customFields).filter((field) => !isEmpty(customFields?.[field]) || !isEmpty(previousCustomFields?.[field]));
+  const changedCustomFields = Object.keys(customFields).filter((field) => {
+    const newValue = customFields?.[field];
+    const oldValue = previousCustomFields?.[field];
+    return (!isEmpty(newValue) || !isEmpty(oldValue)) && !isEqual(newValue, oldValue);
+  });
   return changedCustomFields.map((changedCustomField) => ({
     property: `customFields.${changedCustomField}`,
     previousValue: previousCustomFields?.[changedCustomField],

package/src/index.ts

@@ -8,9 +8,11 @@ import logger from './logger';
 let auditLogger: AuditLogger;
 
 export const enableAuditing = (options: AuditLoggerOptions) => {
-  auditLogger = new AuditLogger(options);
-  addAuditApi(options as any);
-  auditLogger.registerHooks();
+  if (process.env.DISABLE_AUDIT_LOGS !== 'true') {
+    auditLogger = new AuditLogger(options);
+    addAuditApi(options as any);
+    auditLogger.registerHooks();
+  }
 };
 
 export const setAuditContext = (
@@ -18,6 +20,9 @@ export const setAuditContext = (
   action: string,
 ) => async (req: any, res: any, next: any): Promise<any> => {
   try {
+    if (process.env.DISABLE_AUDIT_LOGS === 'true') {
+      return next();
+    }
     const currentTrace = getCurrentTrace();
     if (currentTrace && currentTrace.context && currentTrace.context.get) {
       const user = currentTrace.context.get(USER_CONTEXT_KEY);
@@ -41,6 +46,9 @@ export const setRabbitAuditContext = (
   entityType: string,
   action: string,
 ) => async (endpoint: string): Promise<any> => {
+  if (process.env.DISABLE_AUDIT_LOGS === 'true') {
+    return;
+  }
   const currentTrace = getCurrentTrace();
   if (currentTrace?.context?.get) {
     const user = currentTrace.context.get(USER_CONTEXT_KEY);