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

package/dist/audit-logger.js

@@ -21,16 +21,25 @@ 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 getChangedFields = (instance, options, loggerLocal) => {
+const isEmpty = (field) => {
+    if (field == null) {
+        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) => {
     // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
     // It's a known issut with sequelize.
     if (options.returning) {
-        return options.fields;
+        return filterOutEmptyFields(options.fields, instance);
     }
-    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 instance.changed();
 };
 class AuditLogger {
@@ -44,12 +53,8 @@ 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, 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 changedProperties = getChangedFields(instance, options);
                         const payload = {
                             entityType: modelName,
                             entityId: instance.id,

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.2",
+  "version": "1.1.6-beta.20",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/audit-logger.ts

@@ -12,16 +12,27 @@ const getAuditContext = () => {
   return auditContext;
 };
 
-const getChangedFields = (instance, options, loggerLocal) => {
+const isEmpty = (field) => {
+  if (field == null) {
+    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) => {
   // When bulk updating in sequelize using the "returning" option, the instance.changed() stops working.
   // It's a known issut with sequelize.
   if (options.returning) {
-    return options.fields;
+    return filterOutEmptyFields(options.fields, instance);
   }
-  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 instance.changed();
 };
 
@@ -43,12 +54,8 @@ 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, 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 changedProperties = getChangedFields(instance, options);
             const payload: AuditLogPayload = {
               entityType: modelName,
               entityId: instance.id,

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