@autofleet/sequelize-utils 5.1.3 → 5.1.5

package/dist/events/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/events/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __importDefault(require("@autofleet/events"));
+const logger_1 = __importDefault(require("../logger"));
+exports.default = new events_1.default({ logger: logger_1.default });

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import { Sequelize } from 'sequelize';
+import addModelEventHooks from './model-event-hooks';
 declare const _default: (sequelize: Sequelize) => {
     transactionWithRetry: any;
     httpBasedTransaction: any;
+    addModelEventHooks: any;
 };
 export default _default;

package/dist/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,16 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const debug_1 = __importDefault(require("debug"));
+const model_event_hooks_1 = __importDefault(require("./model-event-hooks"));
 const log = debug_1.default('sequelize-utils');
 const rollbackErrorText = 'rollback has been called on this transaction';
 const abortErrorText = 'Transaction cancelled due to request cancellation';
 exports.default = (sequelize) => {
-    const transactionWithRetry = (funcToRun, retriesCount = 2, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const transactionWithRetry = async (funcToRun, retriesCount = 2, options) => {
         try {
-            const transValue = yield sequelize.transaction(options || {}, (transaction) => __awaiter(void 0, void 0, void 0, function* () {
-                const funcValue = yield funcToRun(transaction);
+            const transValue = await sequelize.transaction(options || {}, async (transaction) => {
+                const funcValue = await funcToRun(transaction);
                 return funcValue;
-            }));
+            });
             return transValue;
         }
         catch (e) {
@@ -38,22 +30,22 @@ exports.default = (sequelize) => {
             }
             throw e;
         }
-    });
+    };
     // eslint-disable-next-line @typescript-eslint/ban-types
     const httpBasedTransaction = (req, cb) => {
         if (req.socket.destroyed) {
             log(abortErrorText);
             throw new Error(abortErrorText);
         }
-        return sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
+        return sequelize.transaction(async (transaction) => {
             // https://github.com/nodejs/node/blob/e46c680bf2b211bbd52cf959ca17ee98c7f657f5/test/parallel/test-http-aborted.js#L9
-            const rollback = () => __awaiter(void 0, void 0, void 0, function* () {
+            const rollback = async () => {
                 log(abortErrorText);
-                yield transaction.rollback();
-            });
+                await transaction.rollback();
+            };
             req.socket.once('close', rollback);
             try {
-                const response = yield cb(transaction);
+                const response = await cb(transaction);
                 req.socket.removeListener('close', rollback);
                 return response;
             }
@@ -64,10 +56,11 @@ exports.default = (sequelize) => {
                 req.socket.removeListener('close', rollback);
                 throw e;
             }
-        }));
+        });
     };
     return {
         httpBasedTransaction,
         transactionWithRetry,
+        addModelEventHooks: model_event_hooks_1.default,
     };
 };

package/dist/logger.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/logger.js

@@ -0,0 +1,7 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = __importDefault(require("@autofleet/logger"));
+exports.default = logger_1.default();

package/dist/model-event-hooks.d.ts

@@ -0,0 +1,8 @@
+import { Sequelize } from 'sequelize';
+interface ModelMapping {
+    [ModelName: string]: {
+        tableName: string;
+    };
+}
+declare const addModelEventHooks: (sequelize: Sequelize, modelTableMapping: ModelMapping) => Promise<void>;
+export default addModelEventHooks;

package/dist/model-event-hooks.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __importDefault(require("./events"));
+const logger_1 = __importDefault(require("./logger"));
+const addModelEventHooks = async (sequelize, modelTableMapping) => {
+    const updateEventToDimTable = (object, isDelete = false) => {
+        try {
+            const objectToSend = object.get();
+            if (isDelete) {
+                objectToSend.deletedAt = new Date();
+            }
+            const tableName = modelTableMapping[object.constructor.name]?.tableName;
+            const eventVersion = '1';
+            if (tableName) {
+                events_1.default.sendObject(tableName, eventVersion, objectToSend, Object.keys(object.rawAttributes));
+            }
+        }
+        catch (e) {
+            logger_1.default.error('dimTables error', { e });
+        }
+    };
+    sequelize.addHook('afterSave', async (savedObject, options) => {
+        logger_1.default.info('dimTables after save start', { savedObject });
+        if (options.transaction) {
+            options.transaction.afterCommit(() => updateEventToDimTable(savedObject));
+        }
+        else {
+            await updateEventToDimTable(savedObject);
+        }
+    });
+    sequelize.addHook('afterDestroy', async (savedObject, options) => {
+        logger_1.default.info('dimTables after save start', { savedObject });
+        if (options.transaction) {
+            options.transaction.afterCommit(() => updateEventToDimTable(savedObject, true));
+        }
+        else {
+            await updateEventToDimTable(savedObject, true);
+        }
+    });
+};
+exports.default = addModelEventHooks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sequelize-utils",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,6 +19,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@autofleet/errors": "^1.1.0",
+    "@autofleet/events": "^1.5.7",
+    "@autofleet/logger": "^2.0.2",
     "@autofleet/network": "^1.3.7",
     "debug": "^4.3.2",
     "jest": "^27.0.6",

package/src/events/index.ts

@@ -0,0 +1,4 @@
+import Events from '@autofleet/events';
+import logger from '../logger';
+
+export default new Events({ logger });

package/src/index.ts

@@ -1,6 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import { DatabaseError, Sequelize, Transaction } from 'sequelize';
 import debug from 'debug';
+import addModelEventHooks from './model-event-hooks';
 
 const log = debug('sequelize-utils');
 
@@ -9,7 +10,8 @@ const abortErrorText = 'Transaction cancelled due to request cancellation';
 
 export default (sequelize: Sequelize): {
   transactionWithRetry: any,
-  httpBasedTransaction: any
+  httpBasedTransaction: any,
+  addModelEventHooks: any
 } => {
   const transactionWithRetry = async (funcToRun: any, retriesCount = 2, options?: any): Promise<any> => {
     try {
@@ -63,5 +65,6 @@ export default (sequelize: Sequelize): {
   return {
     httpBasedTransaction,
     transactionWithRetry,
+    addModelEventHooks,
   };
 };

package/src/logger.ts

@@ -0,0 +1,3 @@
+import Logger from '@autofleet/logger';
+
+export default Logger();

package/src/model-event-hooks.ts

@@ -0,0 +1,51 @@
+import { Sequelize } from 'sequelize';
+import events from './events';
+import logger from './logger';
+
+interface ModelMapping {
+  [ModelName: string]: {
+    tableName: string
+  };
+}
+
+const addModelEventHooks = async (sequelize: Sequelize, modelTableMapping: ModelMapping) => {
+  const updateEventToDimTable = (object, isDelete = false) => {
+    try {
+      const objectToSend = object.get();
+      if (isDelete) {
+        objectToSend.deletedAt = new Date();
+      }
+      const tableName = modelTableMapping[object.constructor.name]?.tableName;
+      const eventVersion = '1';
+      if (tableName) {
+        events.sendObject(
+          tableName,
+          eventVersion,
+          objectToSend,
+          Object.keys(object.rawAttributes),
+        );
+      }
+    } catch (e) {
+      logger.error('dimTables error', { e });
+    }
+  };
+
+  sequelize.addHook('afterSave', async (savedObject, options) => {
+    logger.info('dimTables after save start', { savedObject });
+    if (options.transaction) {
+      options.transaction.afterCommit(() => updateEventToDimTable(savedObject));
+    } else {
+      await updateEventToDimTable(savedObject);
+    }
+  });
+  sequelize.addHook('afterDestroy', async (savedObject, options) => {
+    logger.info('dimTables after save start', { savedObject });
+    if (options.transaction) {
+      options.transaction.afterCommit(() => updateEventToDimTable(savedObject, true));
+    } else {
+      await updateEventToDimTable(savedObject, true);
+    }
+  });
+};
+
+export default addModelEventHooks;

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2020",
     "module": "commonjs",
     "declaration": true,
     "outDir": "./dist",