@autofleet/sequelize-utils 5.2.7 → 6.0.0-0

package/.env

@@ -0,0 +1,5 @@
+AF_SERVICE_NAME=sequelize-utils
+DB_NAME=stored_events_test
+NODE_ENV=test
+DB_USERNAME=postgres
+DB_PASSWORD=postgres

package/dist/events/index.d.ts

@@ -1,3 +0,0 @@
-import Events from '@autofleet/events';
-declare const _default: Events;
-export default _default;

package/dist/events/index.js

@@ -1,8 +0,0 @@
-"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,10 +1,11 @@
 import type { Sequelize, Transaction } from 'sequelize';
+import type { LoggerInstanceManager } from '@autofleet/logger';
 import addModelEventHooks from './model-event-hooks';
 import { transactionWithRetry as _transactionWithRetry } from './transaction-with-retry';
 import { httpBasedTransaction as _httpBasedTransaction } from './http-based-transaction';
 import runAfterTransactionCommits from './runAfterTransactionCommits';
 type ArgsWithoutSequelize<T> = T extends (arg1: Sequelize, ...args: infer U) => any ? U : never;
-declare const _default: (sequelize: Sequelize) => {
+declare const _default: (sequelize: Sequelize, logger?: LoggerInstanceManager) => {
     transactionWithRetry: <T>(...args: ArgsWithoutSequelize<typeof _transactionWithRetry<T>>) => Promise<T>;
     httpBasedTransaction: <T>(...args: ArgsWithoutSequelize<typeof _httpBasedTransaction<T>>) => Promise<T>;
     registerModelEventHooks: (...args: ArgsWithoutSequelize<typeof addModelEventHooks>) => void;

package/dist/index.js

@@ -7,10 +7,10 @@ const model_event_hooks_1 = __importDefault(require("./model-event-hooks"));
 const transaction_with_retry_1 = require("./transaction-with-retry");
 const http_based_transaction_1 = require("./http-based-transaction");
 const runAfterTransactionCommits_1 = __importDefault(require("./runAfterTransactionCommits"));
-exports.default = (sequelize) => {
+exports.default = (sequelize, logger) => {
     const transactionWithRetry = (funcToRun, retriesCount, options) => (0, transaction_with_retry_1.transactionWithRetry)(sequelize, funcToRun, retriesCount, options);
     const httpBasedTransaction = (req, res, cb) => (0, http_based_transaction_1.httpBasedTransaction)(sequelize, req, res, cb);
-    const registerModelEventHooks = (modelTableMapping) => (0, model_event_hooks_1.default)(sequelize, modelTableMapping);
+    const registerModelEventHooks = (modelTableMapping, events) => (0, model_event_hooks_1.default)(sequelize, modelTableMapping, events, logger);
     const useOrCreateTransaction = (transaction, cb) => {
         if (transaction) {
             return cb(transaction);

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

@@ -1,8 +1,10 @@
 import type { Sequelize } from 'sequelize';
+import type Events from '@autofleet/events';
+import type { LoggerInstanceManager } from '@autofleet/logger';
 export interface ModelMapping {
     [ModelName: string]: {
         tableName: string;
     };
 }
-declare const addModelEventHooks: (sequelize: Sequelize, modelTableMapping: ModelMapping) => void;
+declare const addModelEventHooks: (sequelize: Sequelize, modelTableMapping: ModelMapping, events: Events, logger?: LoggerInstanceManager) => void;
 export default addModelEventHooks;

package/dist/model-event-hooks.js

@@ -3,7 +3,6 @@ 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 runAfterTransactionCommits_1 = __importDefault(require("./runAfterTransactionCommits"));
 const isDate = (input) => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
@@ -14,8 +13,13 @@ const formatDatesInObject = (obj) => {
     });
     return newObj;
 };
-const addModelEventHooks = (sequelize, modelTableMapping) => {
+const addModelEventHooks = (sequelize, modelTableMapping, events, logger) => {
+    if (!events) {
+        logger.warn('Events object must be provided to addModelEventHooks');
+        return;
+    }
     const updateEventToDimTable = (object, isDelete = false) => {
+        const localLogger = logger || logger_1.default;
         try {
             const objectToSend = object.get();
             if (isDelete) {
@@ -27,12 +31,12 @@ const addModelEventHooks = (sequelize, modelTableMapping) => {
             if (!tableName) {
                 return;
             }
-            events_1.default.sendObject(tableName, eventVersion, objectToSendFormatted, Object.keys(object.rawAttributes)).catch((e) => {
-                logger_1.default.error('sendObject error', { tableName, eventVersion, e });
+            events.sendObject(tableName, eventVersion, objectToSendFormatted, Object.keys(object.rawAttributes)).catch((e) => {
+                localLogger.error('sendObject error', { tableName, eventVersion, e });
             });
         }
         catch (e) {
-            logger_1.default.error('dimTables error', { e });
+            localLogger.error('dimTables error', { e });
         }
     };
     sequelize.addHook('afterSave', (savedObject, options) => (0, runAfterTransactionCommits_1.default)(() => updateEventToDimTable(savedObject), options));

package/dist/test-utils/events.d.ts

@@ -0,0 +1,3 @@
+import Events from '@autofleet/events';
+declare const _default: Events;
+export default _default;

package/dist/test-utils/events.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sequelize-utils",
-  "version": "5.2.7",
+  "version": "6.0.0-0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,16 +15,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@autofleet/errors": "^1.2.3",
-    "@autofleet/events": "^4.0.0",
-    "@autofleet/network": "^1.3.7",
     "debug": "^4.3.2"
   },
   "peerDependencies": {
+    "@autofleet/events": ">=4",
     "@autofleet/logger": ">=4",
     "sequelize": ">=5"
   },
   "devDependencies": {
+    "@autofleet/network": "^1.3.7",
     "@autofleet/logger": "^4.1.0",
     "@types/debug": "^4.1.6",
     "@types/express": "^4.17.13",

package/src/events/index.ts

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

package/src/index.ts

@@ -5,6 +5,8 @@ import type {
   TransactionOptions,
 } from 'sequelize';
 import type { IncomingMessage, ServerResponse } from 'http';
+import type { LoggerInstanceManager } from '@autofleet/logger';
+import type Events from '@autofleet/events';
 import addModelEventHooks, { ModelMapping } from './model-event-hooks';
 import { transactionWithRetry as _transactionWithRetry } from './transaction-with-retry';
 import { httpBasedTransaction as _httpBasedTransaction } from './http-based-transaction';
@@ -12,7 +14,7 @@ import runAfterTransactionCommits from './runAfterTransactionCommits';
 
 type ArgsWithoutSequelize<T> = T extends (arg1: Sequelize, ...args: infer U) => any ? U : never;
 
-export default (sequelize: Sequelize): {
+export default (sequelize: Sequelize, logger?: LoggerInstanceManager): {
   transactionWithRetry: <T>(...args: ArgsWithoutSequelize<typeof _transactionWithRetry<T>>) => Promise<T>;
   httpBasedTransaction: <T>(...args: ArgsWithoutSequelize<typeof _httpBasedTransaction<T>>) => Promise<T>;
   registerModelEventHooks: (...args: ArgsWithoutSequelize<typeof addModelEventHooks>) => void;
@@ -21,7 +23,7 @@ export default (sequelize: Sequelize): {
 } => {
   const transactionWithRetry = <T>(funcToRun: (transaction: Transaction) => Promise<T>, retriesCount?: number, options?: TransactionOptions): Promise<T> => _transactionWithRetry(sequelize, funcToRun, retriesCount, options);
   const httpBasedTransaction = <T>(req: IncomingMessage, res: ServerResponse, cb: (transaction: Transaction) => Promise<T>): Promise<T> => _httpBasedTransaction(sequelize, req, res, cb);
-  const registerModelEventHooks = (modelTableMapping: ModelMapping) => addModelEventHooks(sequelize, modelTableMapping);
+  const registerModelEventHooks = (modelTableMapping: ModelMapping, events: Events) => addModelEventHooks(sequelize, modelTableMapping, events, logger);
   const useOrCreateTransaction = <T>(transaction: Transaction, cb: (t: Transaction) => Promise<T>) => {
     if (transaction) {
       return cb(transaction);

package/src/model-event-hooks.ts

@@ -1,6 +1,7 @@
 import type { Model, Sequelize } from 'sequelize';
-import events from './events';
-import logger from './logger';
+import type Events from '@autofleet/events';
+import type { LoggerInstanceManager } from '@autofleet/logger';
+import packageLogger from './logger';
 import runAfterTransactionCommits from './runAfterTransactionCommits';
 
 export interface ModelMapping {
@@ -18,8 +19,13 @@ const formatDatesInObject = (obj: object) => {
   return newObj;
 };
 
-const addModelEventHooks = (sequelize: Sequelize, modelTableMapping: ModelMapping): void => {
+const addModelEventHooks = (sequelize: Sequelize, modelTableMapping: ModelMapping, events: Events, logger?: LoggerInstanceManager): void => {
+  if (!events) {
+    logger.warn('Events object must be provided to addModelEventHooks');
+    return;
+  }
   const updateEventToDimTable = (object: Model, isDelete = false) => {
+    const localLogger = logger || packageLogger;
     try {
       const objectToSend = object.get();
       if (isDelete) {
@@ -38,10 +44,10 @@ const addModelEventHooks = (sequelize: Sequelize, modelTableMapping: ModelMappin
         // @ts-expect-error the rawAttributes is typed as static, while it actually is on the instance level.
         Object.keys(object.rawAttributes),
       ).catch((e) => {
-        logger.error('sendObject error', { tableName, eventVersion, e });
+        localLogger.error('sendObject error', { tableName, eventVersion, e });
       });
     } catch (e) {
-      logger.error('dimTables error', { e });
+      localLogger.error('dimTables error', { e });
     }
   };
 

package/src/test-utils/events.ts

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