@autofleet/shtinker 1.1.6-beta.18 → 1.1.6-beta.2

package/dist/audit-logger.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const moment_1 = __importDefault(require("moment"));
 const zehut_1 = require("@autofleet/zehut");
 const const_1 = require("./const");
 const logger_1 = __importDefault(require("./logger"));
@@ -22,43 +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 (field == null) {
-        return true;
-    }
-    if (Array.isArray(field)) {
-        return field.length === 0;
-    }
-    if (typeof field === 'object') {
-        if (moment_1.default.isMoment(field)) {
-            logger_1.default.info(`Field ${field} is moment obj: `, { keysLength: Object.keys(field).length });
-            return false;
-        }
-        if (moment_1.default.isDate(field)) {
-            logger_1.default.info(`Field ${field} is date obj: `, { keysLength: Object.keys(field).length });
-            return false;
-        }
-        return Object.keys(field).length === 0;
-    }
-    return false;
-};
-const filterOutEmptyFields = (fields, instance) => fields.filter((field) => {
-    logger_1.default.info('filterOutEmptyFields: ', { field, previousValue: instance.previous(field), newValue: instance.get(field) });
-    return !isEmpty(instance.previous(field)) || !isEmpty(instance.get(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.
     if (options.returning) {
-        const nonEmptyChangedFields = filterOutEmptyFields(options.fields, instance);
-        logger_1.default.info('BULK UPDATING', { options, nonEmptyChangedFields });
-        return nonEmptyChangedFields;
+        return options.fields;
     }
     const changedProperties = instance.changed();
-    logger_1.default.info('changedProperties: ', { changedProperties });
-    const nonEmptyChangedProperties = filterOutEmptyFields(changedProperties, instance);
-    logger_1.default.info('nonEmptyChangedProperties: ', { nonEmptyChangedProperties });
-    return nonEmptyChangedProperties;
+    loggerLocal.info('changedProperties: ', { changedProperties });
+    const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+    loggerLocal.info('changedPropertiesWithoutEmptyFields: ', { changedPropertiesWithoutEmptyFields });
+    return instance.changed();
 };
 class AuditLogger {
     constructor(options) {
@@ -71,8 +44,12 @@ 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);
+                        this.logger.info('changedProperties:', { changedProperties });
+                        const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+                        this.logger.info('changedPropertiesWithoutEmptyFields:', { changedPropertiesWithoutEmptyFields });
                         const payload = {
                             entityType: modelName,
                             entityId: instance.id,

package/dist/index.js

@@ -42,6 +42,7 @@ 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 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "1.1.6-beta.18",
+  "version": "1.1.6-beta.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,7 +18,6 @@
     "@autofleet/netwrok": "^1.0.0",
     "@autofleet/rabbit": "^3.2.14",
     "@autofleet/zehut": "^3.0.10",
-    "moment": "^2.30.1",
     "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {

package/src/audit-logger.ts

@@ -1,4 +1,3 @@
-import moment from 'moment';
 import { getCurrentPayload as getCurrentTrace } from '@autofleet/zehut';
 import { Sequelize } from 'sequelize';
 
@@ -13,45 +12,17 @@ const getAuditContext = () => {
   return auditContext;
 };
 
-const isEmpty = (field) => {
-  if (field == null) {
-    return true;
-  }
-  if (Array.isArray(field)) {
-    return field.length === 0;
-  }
-  if (typeof field === 'object') {
-    if (moment.isMoment(field)) {
-      logger.info(`Field ${field} is moment obj: `, { keysLength: Object.keys(field).length });
-      return false;
-    }
-    if (moment.isDate(field)) {
-      logger.info(`Field ${field} is date obj: `, { keysLength: Object.keys(field).length });
-      return false;
-    }
-    return Object.keys(field).length === 0;
-  }
-  return false;
-}
-
-const filterOutEmptyFields = (fields, instance) => fields.filter((field) => {
-  logger.info('filterOutEmptyFields: ', { field, previousValue: instance.previous(field), newValue: instance.get(field) })
-  return !isEmpty(instance.previous(field)) || !isEmpty(instance.get(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.
   if (options.returning) {
-    const nonEmptyChangedFields = filterOutEmptyFields(options.fields, instance);
-    logger.info('BULK UPDATING', { options, nonEmptyChangedFields });
-    return nonEmptyChangedFields;
+    return options.fields;
   }
   const changedProperties = instance.changed();
-  logger.info('changedProperties: ', { changedProperties });
-  const nonEmptyChangedProperties = filterOutEmptyFields(changedProperties, instance);
-  logger.info('nonEmptyChangedProperties: ', { nonEmptyChangedProperties });
-  return nonEmptyChangedProperties;
+  loggerLocal.info('changedProperties: ', { changedProperties });
+  const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+  loggerLocal.info('changedPropertiesWithoutEmptyFields: ', { changedPropertiesWithoutEmptyFields });
+  return instance.changed();
 };
 
 class AuditLogger {
@@ -72,8 +43,12 @@ 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);
+            this.logger.info('changedProperties:', { changedProperties });
+            const changedPropertiesWithoutEmptyFields = changedProperties.filter((property) => instance.previous(property) != null || instance.get(property) != null);
+            this.logger.info('changedPropertiesWithoutEmptyFields:', { changedPropertiesWithoutEmptyFields });
             const payload: AuditLogPayload = {
               entityType: modelName,
               entityId: instance.id,

package/src/index.ts

@@ -19,6 +19,7 @@ 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 auditLogContext: AuditLogContext = {