npm - @autofleet/shtinker - Versions diffs - 1.2.0 → 1.2.1-beta - Mend

@autofleet/shtinker 1.2.0 → 1.2.1-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/audit-logger.js CHANGED Viewed

@@ -13,10 +13,8 @@ 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';
 const getAuditContext = () => {
     var _a;
     const currentTrace = (0, zehut_1.getCurrentPayload)();
@@ -36,41 +34,17 @@ const isEmpty = (field) => {
     return false;
 };
 const filterOutEmptyFields = (fields, instance) => fields.filter((field) => !isEmpty(instance.get(field)) || !isEmpty(instance.previous(field)));
-const getChangedFieldsRows = (instance, options) => {
+const getChangedFields = (instance, options) => {
     // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
-    // It's a known issue with sequelize.
-    const changedFields = options.returning ? options.fields : instance.changed();
-    // Filter customFields - we'll handle them later
-    const filteredChangedFields = filterOutEmptyFields(changedFields.filter((field) => field !== CUSTOM_FIELDS_PROPERTY), instance);
-    return filteredChangedFields.map((property) => ({
-        property,
-        previousValue: instance.previous(property),
-        newValue: instance.get(property),
-    }));
-};
-const getChangedCustomFieldsRows = (instance) => {
-    const customFieldsChanged = instance.changed().includes(CUSTOM_FIELDS_PROPERTY);
-    if (!customFieldsChanged) {
-        return [];
-    }
-    const customFields = instance.get(CUSTOM_FIELDS_PROPERTY);
-    const previousCustomFields = instance.previous(CUSTOM_FIELDS_PROPERTY);
-    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],
-        newValue: customFields === null || customFields === void 0 ? void 0 : customFields[changedCustomField],
-    }));
+    // It's a known issut with sequelize.
+    const changedProperties = options.returning ? options.fields : instance.changed();
+    return filterOutEmptyFields(changedProperties, instance);
 };
 class AuditLogger {
     constructor(options) {
         this.rabbit = options.rabbit;
         this.sequelize = options.sequelize;
-        this.logger = options.logger || logger_1.default;
+        this.logger = options.logger;
     }
     registerHooks() {
         Object.entries(this.sequelize.models).forEach(([modelName, modelType]) => {
@@ -78,18 +52,21 @@ class AuditLogger {
                 try {
                     const auditContext = getAuditContext();
                     if (auditContext) {
-                        const changedFieldsRows = getChangedFieldsRows(instance, options);
-                        const changedCustomFieldsRows = getChangedCustomFieldsRows(instance);
+                        const changedProperties = getChangedFields(instance, options);
                         const payload = {
                             entityType: modelName,
                             entityId: instance.id,
-                            rows: [...changedFieldsRows, ...changedCustomFieldsRows],
+                            rows: changedProperties.map((property) => ({
+                                property,
+                                previousValue: instance.previous(property),
+                                newValue: instance.get(property),
+                            })),
                         };
                         this.sendAuditLogRows(payload);
                     }
                 }
                 catch (error) {
-                    this.logger.error('Failed to send audit log rows', error);
+                    logger_1.default.error('Failed to send audit log rows', error);
                 }
             }));
         });
@@ -100,7 +77,7 @@ class AuditLogger {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
             }
             catch (err) {
-                this.logger.error('Failed to send audit log context', err);
+                logger_1.default.error('Failed to send audit log context', err);
             }
         });
     }
@@ -110,7 +87,7 @@ class AuditLogger {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_ROWS_QUEUE, payload);
             }
             catch (err) {
-                this.logger.error('Failed to send audit log rows', err);
+                logger_1.default.error('Failed to send audit log rows', err);
             }
         });
     }

package/dist/const.d.ts CHANGED Viewed

@@ -2,4 +2,3 @@ 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";
-export declare const AUTOMATION_ID_HEADER = "x-af-automation-id";

package/dist/const.js CHANGED Viewed

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AUTOMATION_ID_HEADER = exports.USER_CONTEXT_KEY = 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';
-exports.AUTOMATION_ID_HEADER = 'x-af-automation-id';

package/dist/index.d.ts CHANGED Viewed

@@ -3,8 +3,8 @@ import { AuditLoggerOptions } from './types';
 export declare const enableAuditing: (options: AuditLoggerOptions) => void;
 export declare const setAuditContext: (entityType: string, action: string) => (req: any, res: any, next: any) => Promise<any>;
 export declare const setRabbitAuditContext: (entityType: string, action: string) => (endpoint: string, { userId, automationId }: {
-    userId: string;
-    automationId: string;
+    userId: any;
+    automationId: any;
 }) => Promise<any>;
 export * from './types';
 export * from './const';

package/dist/index.js CHANGED Viewed

@@ -29,30 +29,25 @@ 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"));
 let auditLogger;
 const enableAuditing = (options) => {
-    if (process.env.DISABLE_AUDIT_LOGS !== 'true') {
-        auditLogger = new audit_logger_1.default(options);
-        (0, audit_api_1.default)(options);
-        auditLogger.registerHooks();
-    }
+    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* () {
-    var _a;
     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);
             const { performedBy, actionOrigin } = (user === null || user === void 0 ? void 0 : user.id)
-                ? { performedBy: user.id, actionOrigin: "user" /* ActionOrigin.USER */ }
-                : { performedBy: (_a = req.headers[const_1.AUTOMATION_ID_HEADER]) !== null && _a !== void 0 ? _a : null, actionOrigin: req.headers[const_1.AUTOMATION_ID_HEADER] ? "automation" /* ActionOrigin.AUTOMATION */ : null };
+                ? { performedBy: user.id, actionOrigin: types_1.ActionOrigin.USER }
+                : { performedBy: req.headers['x-af-automation-id'], actionOrigin: types_1.ActionOrigin.AUTOMATION };
             const auditLogContext = {
                 entityType,
                 action,
@@ -72,22 +67,19 @@ const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(vo
 });
 exports.setAuditContext = setAuditContext;
 const setRabbitAuditContext = (entityType, action) => (endpoint, { userId, automationId }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
-    if (process.env.DISABLE_AUDIT_LOGS === 'true') {
-        return;
-    }
+    var _a;
+    console.log({ automationId });
     const currentTrace = (0, zehut_1.getCurrentPayload)();
-    if ((_b = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _b === void 0 ? void 0 : _b.get) {
-        const { performedBy, actionOrigin } = userId
-            ? { performedBy: userId, actionOrigin: "user" /* ActionOrigin.USER */ }
-            : { performedBy: automationId !== null && automationId !== void 0 ? automationId : null, actionOrigin: automationId ? "automation" /* ActionOrigin.AUTOMATION */ : null };
+    const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
+    const contextAutomationId = currentTrace.context.get('x-af-automation-id');
+    if ((_a = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _a === void 0 ? void 0 : _a.get) {
         const auditLogContext = {
             entityType,
             action,
             endpoint,
             method: 'rabbit',
-            performedBy,
-            actionOrigin,
+            performedBy: (user === null || user === void 0 ? void 0 : user.id) || contextAutomationId,
+            actionOrigin: userId ? types_1.ActionOrigin.USER : types_1.ActionOrigin.AUTOMATION,
         };
         currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
         yield auditLogger.sendAuditLogContext(auditLogContext);

package/dist/types.d.ts CHANGED Viewed

@@ -39,8 +39,7 @@ export declare enum Action {
     BULK_UPSERT = "bulk-upsert",
     UPSERT = "upsert",
     JOIN = "join",
-    MOVE = "move",
-    REOPTIMIZATION = "reoptimization"
+    MOVE = "move"
 }
 export declare enum EntityType {
     RIDE = "Ride",
@@ -48,7 +47,7 @@ export declare enum EntityType {
     DRIVER = "Driver",
     PRICE_CALCULATION = "PriceCalculation"
 }
-export declare const enum ActionOrigin {
+export declare enum ActionOrigin {
     USER = "user",
     AUTOMATION = "automation"
 }

package/dist/types.js CHANGED Viewed

@@ -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";
@@ -19,7 +19,6 @@ var Action;
     Action["UPSERT"] = "upsert";
     Action["JOIN"] = "join";
     Action["MOVE"] = "move";
-    Action["REOPTIMIZATION"] = "reoptimization";
 })(Action = exports.Action || (exports.Action = {}));
 var EntityType;
 (function (EntityType) {
@@ -28,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 CHANGED Viewed

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

package/src/index.ts CHANGED Viewed

@@ -23,6 +23,7 @@ export const setAuditContext = (
     if (process.env.DISABLE_AUDIT_LOGS === 'true') {
       return next();
     }
+    logger.info('shtinker automation context', { contextData: req.headers[AUTOMATION_ID_HEADER] });
     const currentTrace = getCurrentTrace();
     if (currentTrace && currentTrace.context && currentTrace.context.get) {
       const user = currentTrace.context.get(USER_CONTEXT_KEY);