@autofleet/shtinker 1.1.5 → 1.1.6-beta-1

package/dist/audit-logger.js

@@ -21,13 +21,24 @@ const getAuditContext = () => {
     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;
 };
+const isEmpty = (field) => {
+    if ([null, undefined].includes(field)) {
+        return true;
+    }
+    if (Array.isArray(field)) {
+        return field.length === 0;
+    }
+    if (typeof field === 'object' && !(field instanceof Date)) {
+        return Object.keys(field).length === 0;
+    }
+    return false;
+};
+const filterOutEmptyFields = (fields, instance) => fields.filter((field) => !isEmpty(instance.get(field)) || !isEmpty(instance.previous(field)));
 const getChangedFields = (instance, options) => {
     // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
     // It's a known issut with sequelize.
-    if (options.returning) {
-        return options.fields;
-    }
-    return instance.changed();
+    const changedProperties = options.returning ? options.fields : instance.changed();
+    return filterOutEmptyFields(changedProperties, instance);
 };
 class AuditLogger {
     constructor(options) {

package/dist/index.js

@@ -29,6 +29,7 @@ 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 types_1 = require("./types");
 const const_1 = require("./const");
 const audit_api_1 = __importDefault(require("./audit-api"));
 const logger_1 = __importDefault(require("./logger"));
@@ -44,12 +45,16 @@ const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(vo
         const currentTrace = (0, zehut_1.getCurrentPayload)();
         if (currentTrace && currentTrace.context && currentTrace.context.get) {
             const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
+            const { performedBy, actionOrigin } = (user === null || user === void 0 ? void 0 : user.id)
+                ? { performedBy: user.id, actionOrigin: types_1.ActionOrigin.USER }
+                : { performedBy: req.headers['x-af-automation-id'], actionOrigin: types_1.ActionOrigin.AUTOMATION };
             const auditLogContext = {
                 entityType,
                 action,
                 endpoint: req.url,
                 method: req.method,
-                performedBy: user === null || user === void 0 ? void 0 : user.id,
+                performedBy,
+                actionOrigin,
             };
             currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
             yield auditLogger.sendAuditLogContext(auditLogContext);

package/dist/types.d.ts

@@ -11,6 +11,7 @@ export interface AuditLogContext {
     performedBy: string;
     endpoint: string;
     method: string;
+    actionOrigin?: string;
 }
 export interface AuditLogRow {
     property: string;
@@ -46,3 +47,7 @@ export declare enum EntityType {
     DRIVER = "Driver",
     PRICE_CALCULATION = "PriceCalculation"
 }
+export declare enum ActionOrigin {
+    USER = "user",
+    AUTOMATION = "automation"
+}

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityType = exports.Action = void 0;
+exports.ActionOrigin = exports.EntityType = exports.Action = void 0;
 var Action;
 (function (Action) {
     Action["CREATE"] = "create";
@@ -27,3 +27,8 @@ var EntityType;
     EntityType["DRIVER"] = "Driver";
     EntityType["PRICE_CALCULATION"] = "PriceCalculation";
 })(EntityType = exports.EntityType || (exports.EntityType = {}));
+var ActionOrigin;
+(function (ActionOrigin) {
+    ActionOrigin["USER"] = "user";
+    ActionOrigin["AUTOMATION"] = "automation";
+})(ActionOrigin = exports.ActionOrigin || (exports.ActionOrigin = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "1.1.5",
+  "version": "1.1.6-beta-1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "@autofleet/logger": "^4.0.6",
     "@autofleet/network": "^1.4.7",
     "@autofleet/netwrok": "^1.0.0",
-    "@autofleet/rabbit": "^3.2.14",
+    "@autofleet/rabbit": "^3.2.18",
     "@autofleet/zehut": "^3.0.10",
     "sequelize-typescript": "^2.1.5"
   },

package/src/audit-logger.ts

@@ -12,13 +12,26 @@ const getAuditContext = () => {
   return auditContext;
 };
 
+const isEmpty = (field) => {
+  if ([null, undefined].includes(field)) {
+    return true;
+  }
+  if (Array.isArray(field)) {
+    return field.length === 0;
+  }
+  if (typeof field === 'object' && !(field instanceof Date)) {
+    return Object.keys(field).length === 0;
+  }
+  return false;
+};
+
+const filterOutEmptyFields = (fields, instance) => fields.filter((field) => !isEmpty(instance.get(field)) || !isEmpty(instance.previous(field)));
+
 const getChangedFields = (instance, options) => {
   // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
   // It's a known issut with sequelize.
-  if (options.returning) {
-    return options.fields;
-  }
-  return instance.changed();
+  const changedProperties = options.returning ? options.fields : instance.changed();
+  return filterOutEmptyFields(changedProperties, instance);
 };
 
 class AuditLogger {

package/src/index.ts

@@ -1,6 +1,6 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import AuditLogger from './audit-logger';
-import { AuditLogContext, AuditLoggerOptions } from './types';
+import { ActionOrigin, AuditLogContext, AuditLoggerOptions } from './types';
 import { AUDIT_LOG_CONTEXT_KEY, USER_CONTEXT_KEY } from './const';
 import addAuditApi from './audit-api';
 import logger from './logger';
@@ -21,12 +21,16 @@ export const setAuditContext = (
     const currentTrace = getCurrentTrace();
     if (currentTrace && currentTrace.context && currentTrace.context.get) {
       const user = currentTrace.context.get(USER_CONTEXT_KEY);
+      const { performedBy, actionOrigin } = user?.id
+        ? { performedBy: user.id, actionOrigin: ActionOrigin.USER }
+        : { performedBy: req.headers['x-af-automation-id'], actionOrigin: ActionOrigin.AUTOMATION };
       const auditLogContext: AuditLogContext = {
         entityType,
         action,
         endpoint: req.url,
         method: req.method,
-        performedBy: user?.id,
+        performedBy,
+        actionOrigin,
       };
       currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
       await auditLogger.sendAuditLogContext(auditLogContext);

package/src/types.ts

@@ -14,6 +14,7 @@ export interface AuditLogContext {
   performedBy: string;
   endpoint: string;
   method: string;
+  actionOrigin?: string;
 }
 
 export interface AuditLogRow {
@@ -53,3 +54,8 @@ export enum EntityType {
   DRIVER = 'Driver',
   PRICE_CALCULATION = 'PriceCalculation',
 }
+
+export enum ActionOrigin {
+  USER = 'user',
+  AUTOMATION = 'automation',
+}