@autofleet/shtinker 1.1.6-beta.27 → 1.1.6-beta.4

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,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,
@@ -64,6 +61,9 @@ class AuditLogger {
                         };
                         this.sendAuditLogRows(payload);
                     }
+                    else {
+                        this.logger.info('NO AUDIT CONTEXT: ', { entityId: instance.id });
+                    }
                 }
                 catch (error) {
                     logger_1.default.error('Failed to send audit log rows', error);

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.27",
+  "version": "1.1.6-beta.4",
   "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.18",
+    "@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,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,
@@ -64,6 +59,8 @@ class AuditLogger {
               })),
             };
             this.sendAuditLogRows(payload);
+          } else {
+            this.logger.info('NO AUDIT CONTEXT: ', { entityId: instance.id });
           }
         } catch (error) {
           logger.error('Failed to send audit log rows', error);

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 = {