@autofleet/shtinker 1.1.6-beta-5 → 1.1.6-beta.1

package/dist/audit-logger.js

@@ -21,24 +21,17 @@ 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) => {
+const getChangedFields = (instance, options, loggerLocal) => {
     // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
     // It's a known issut with sequelize.
-    const changedProperties = options.returning ? options.fields : instance.changed();
-    return filterOutEmptyFields(changedProperties, instance);
+    if (options.returning) {
+        return options.fields;
+    }
+    const changedProperties = instance.changed();
+    loggerLocal.info('changedProperties: ', { changedProperties });
+    const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+    loggerLocal.info('changedPropertiesWithoutEmptyFields: ', { changedPropertiesWithoutEmptyFields });
+    return changedPropertiesWithoutEmptyFields;
 };
 class AuditLogger {
     constructor(options) {
@@ -51,8 +44,9 @@ class AuditLogger {
             modelType.addHook('afterSave', (instance, options) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const auditContext = getAuditContext();
+                    this.logger.info('auditContext:', { auditContext });
                     if (auditContext) {
-                        const changedProperties = getChangedFields(instance, options);
+                        const changedProperties = getChangedFields(instance, options, this.logger);
                         const payload = {
                             entityType: modelName,
                             entityId: instance.id,

package/dist/index.d.ts

@@ -2,10 +2,7 @@ import AuditLogger from './audit-logger';
 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: any;
-    automationId: any;
-}) => Promise<any>;
+export declare const setRabbitAuditContext: (entityType: string, action: string) => (endpoint: string) => Promise<any>;
 export * from './types';
 export * from './const';
 export default AuditLogger;

package/dist/index.js

@@ -29,7 +29,6 @@ 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"));
@@ -43,18 +42,15 @@ exports.enableAuditing = enableAuditing;
 const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const currentTrace = (0, zehut_1.getCurrentPayload)();
+        logger_1.default.info('getCurrentTrace', { getCurrentTrace: 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,
-                actionOrigin,
+                performedBy: user === null || user === void 0 ? void 0 : user.id,
             };
             currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
             yield auditLogger.sendAuditLogContext(auditLogContext);
@@ -66,20 +62,17 @@ const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(vo
     return next();
 });
 exports.setAuditContext = setAuditContext;
-const setRabbitAuditContext = (entityType, action) => (endpoint, { userId, automationId }) => __awaiter(void 0, void 0, void 0, function* () {
+const setRabbitAuditContext = (entityType, action) => (endpoint) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    console.log({ automationId });
     const currentTrace = (0, zehut_1.getCurrentPayload)();
-    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 user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
         const auditLogContext = {
             entityType,
             action,
             endpoint,
             method: 'rabbit',
-            performedBy: (user === null || user === void 0 ? void 0 : user.id) || contextAutomationId,
-            actionOrigin: userId ? types_1.ActionOrigin.USER : types_1.ActionOrigin.AUTOMATION,
+            performedBy: user === null || user === void 0 ? void 0 : user.id,
         };
         currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
         yield auditLogger.sendAuditLogContext(auditLogContext);

package/dist/logger.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@autofleet/logger").LoggerInstanceManager;
+declare const _default: import("winston").Logger;
 export default _default;

package/dist/types.d.ts

@@ -11,7 +11,6 @@ export interface AuditLogContext {
     performedBy: string;
     endpoint: string;
     method: string;
-    actionOrigin?: string;
 }
 export interface AuditLogRow {
     property: string;
@@ -47,7 +46,3 @@ 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.ActionOrigin = exports.EntityType = exports.Action = void 0;
+exports.EntityType = exports.Action = void 0;
 var Action;
 (function (Action) {
     Action["CREATE"] = "create";
@@ -27,8 +27,3 @@ 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.6-beta-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.20-beta-1",
+    "@autofleet/rabbit": "^3.2.14",
     "@autofleet/zehut": "^3.0.10",
     "sequelize-typescript": "^2.1.5"
   },

package/src/audit-logger.ts

@@ -12,26 +12,17 @@ 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) => {
+const getChangedFields = (instance, options, loggerLocal) => {
   // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
   // It's a known issut with sequelize.
-  const changedProperties = options.returning ? options.fields : instance.changed();
-  return filterOutEmptyFields(changedProperties, instance);
+  if (options.returning) {
+    return options.fields;
+  }
+  const changedProperties = instance.changed();
+  loggerLocal.info('changedProperties: ', { changedProperties });
+  const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+  loggerLocal.info('changedPropertiesWithoutEmptyFields: ', { changedPropertiesWithoutEmptyFields });
+  return changedPropertiesWithoutEmptyFields;
 };
 
 class AuditLogger {
@@ -52,8 +43,9 @@ class AuditLogger {
       modelType.addHook('afterSave', async (instance: any, options: any) => {
         try {
           const auditContext = getAuditContext();
+          this.logger.info('auditContext:', { auditContext });
           if (auditContext) {
-            const changedProperties = getChangedFields(instance, options);
+            const changedProperties = getChangedFields(instance, options, this.logger);
             const payload: AuditLogPayload = {
               entityType: modelName,
               entityId: instance.id,

package/src/index.ts

@@ -1,6 +1,6 @@
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import AuditLogger from './audit-logger';
-import { ActionOrigin, AuditLogContext, AuditLoggerOptions } from './types';
+import { AuditLogContext, AuditLoggerOptions } from './types';
 import { AUDIT_LOG_CONTEXT_KEY, USER_CONTEXT_KEY } from './const';
 import addAuditApi from './audit-api';
 import logger from './logger';
@@ -19,18 +19,15 @@ export const setAuditContext = (
 ) => async (req: any, res: any, next: any): Promise<any> => {
   try {
     const currentTrace = getCurrentTrace();
+    logger.info('getCurrentTrace', { 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,
-        actionOrigin,
+        performedBy: user?.id,
       };
       currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
       await auditLogger.sendAuditLogContext(auditLogContext);
@@ -44,20 +41,16 @@ export const setAuditContext = (
 export const setRabbitAuditContext = (
   entityType: string,
   action: string,
-) => async (endpoint: string, { userId, automationId }): Promise<any> => {
-  console.log({ automationId });
-
+) => async (endpoint: string): Promise<any> => {
   const currentTrace = getCurrentTrace();
-  const user = currentTrace.context.get(USER_CONTEXT_KEY);
-  const contextAutomationId = currentTrace.context.get('x-af-automation-id');
   if (currentTrace?.context?.get) {
+    const user = currentTrace.context.get(USER_CONTEXT_KEY);
     const auditLogContext: AuditLogContext = {
       entityType,
       action,
       endpoint,
       method: 'rabbit',
-      performedBy: user?.id || contextAutomationId,
-      actionOrigin: userId ? ActionOrigin.USER : ActionOrigin.AUTOMATION,
+      performedBy: user?.id,
     };
     currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
     await auditLogger.sendAuditLogContext(auditLogContext);

package/src/types.ts

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