@autofleet/shtinker 1.1.6-beta.9 → 1.1.6

package/dist/audit-logger.js

@@ -21,22 +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 = (value) => {
-    return Array.isArray(value) ? value.length === 0 : !value;
+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) => {
-    logger_1.default.info('START getChangedFields');
     // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
     // It's a known issut with sequelize.
-    if (options.returning) {
-        logger_1.default.info('BULK UPDATING', { options });
-        return options.fields;
-    }
-    const changedProperties = instance.changed();
-    logger_1.default.info('changedProperties: ', { changedProperties });
-    const nonEmptyChangedProperties = changedProperties.filter((property) => isEmpty(instance.previous(property)) || isEmpty(instance.get(property)));
-    logger_1.default.info('nonEmptyChangedProperties: ', { nonEmptyChangedProperties });
-    return nonEmptyChangedProperties;
+    const changedProperties = options.returning ? options.fields : instance.changed();
+    return filterOutEmptyFields(changedProperties, instance);
 };
 class AuditLogger {
     constructor(options) {
@@ -49,7 +51,6 @@ 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 payload = {
@@ -63,9 +64,6 @@ 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,7 +42,6 @@ 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("winston").Logger;
+declare const _default: import("@autofleet/logger").LoggerInstanceManager;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "1.1.6-beta.9",
+  "version": "1.1.6",
   "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,23 +12,26 @@ const getAuditContext = () => {
   return auditContext;
 };
 
-const isEmpty = (value) => {
-  return Array.isArray(value) ? value.length === 0 : !value;
+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) => {
-  logger.info('START getChangedFields');
   // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
   // It's a known issut with sequelize.
-  if (options.returning) {
-    logger.info('BULK UPDATING', { options });
-    return options.fields;
-  }
-  const changedProperties = instance.changed();
-  logger.info('changedProperties: ', { changedProperties });
-  const nonEmptyChangedProperties = changedProperties.filter((property) => isEmpty(instance.previous(property)) || isEmpty(instance.get(property)));
-  logger.info('nonEmptyChangedProperties: ', { nonEmptyChangedProperties });
-  return nonEmptyChangedProperties;
+  const changedProperties = options.returning ? options.fields : instance.changed();
+  return filterOutEmptyFields(changedProperties, instance);
 };
 
 class AuditLogger {
@@ -49,7 +52,6 @@ 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 payload: AuditLogPayload = {
@@ -62,8 +64,6 @@ 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,7 +19,6 @@ 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 = {