@autofleet/sadot 0.8.2 → 0.8.4

package/dist/events/index.js

@@ -7,18 +7,16 @@ exports.sendDimEvent = void 0;
 const events_1 = __importDefault(require("@autofleet/events"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const events = new events_1.default({ logger: logger_1.default });
-const KEYS_TO_CONVERT = ['value', 'defaultValue'];
+const KEYS_TO_CONVERT = ['value', 'defaultValue', 'blockEditingFromUI'];
 const stringifyBooleans = (savedObject, keysToConvert) => {
-    if (!Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
+    const savedObjectKeySet = new Set(Object.keys(savedObject));
+    if (keysToConvert.every((key) => !savedObjectKeySet.has(key))) {
         return savedObject;
     }
-    const objectToReturn = { ...savedObject };
-    keysToConvert.forEach((key) => {
-        if (typeof savedObject[key] === 'boolean') {
-            objectToReturn[key] = savedObject[key].toString();
-        }
-    });
-    return objectToReturn;
+    return {
+        ...savedObject,
+        ...Object.fromEntries(keysToConvert.map((key) => [key, typeof savedObject[key] === 'boolean' ? savedObject[key].toString() : savedObject[key]])),
+    };
 };
 const modelTableMapping = {
     CustomFieldDefinition: {

package/dist/index.js

@@ -35,7 +35,7 @@ const useCustomFields = async (app, getModel, options) => {
     if (app) {
         app.use('/api', api_1.default);
     }
-    const sequelize = (0, db_1.default)(options.databaseConfig);
+    const sequelize = options.sequelize ?? (0, db_1.default)(options.databaseConfig);
     if (process.env.NODE_ENV === 'test') {
         await (0, models_1.initTestModels)(sequelize);
     }

package/dist/tests/helpers/commonHooks.d.ts

@@ -0,0 +1,3 @@
+import type { Application } from 'express';
+import type { Models } from '../../types';
+export declare function commonTestHooks(app?: Application | null, models?: Models[]): void;

package/dist/tests/helpers/commonHooks.js

@@ -0,0 +1,54 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commonTestHooks = void 0;
+const __1 = __importDefault(require("../.."));
+const _1 = require(".");
+const database_config_1 = __importDefault(require("./database-config"));
+const db_1 = __importStar(require("../../utils/db"));
+function commonTestHooks(app = null, models = [{ name: 'TestModel', scopeAttributes: ['fleetId'] }]) {
+    let sequelize;
+    beforeAll(async () => {
+        sequelize = (0, db_1.default)(database_config_1.default);
+        await (0, db_1.createSequelizeMeta)(sequelize);
+        await (0, __1.default)(app, _1.getModel, {
+            models,
+            databaseConfig: database_config_1.default,
+            getUser: () => undefined,
+            sequelize,
+        });
+    });
+    afterEach(async () => {
+        jest.clearAllMocks();
+        await (0, _1.cleanup)();
+    });
+    afterAll(async () => {
+        await sequelize.close();
+    });
+}
+exports.commonTestHooks = commonTestHooks;

package/dist/tests/mocks/definition.mock.d.ts

@@ -15,13 +15,13 @@ export declare const coolFieldDefinition2: {
     updatedAt?: Date;
     deletedAt?: Date;
     defaultValue?: any;
+    blockEditingFromUI?: boolean;
     displayName?: string;
     validation?: any;
     fieldType: string;
     entityId: string;
     entityType: string;
     modelType: string;
-    blockEditingFromUI?: boolean;
 };
 export declare const coolFieldDefinition3: {
     name: string;
@@ -32,13 +32,13 @@ export declare const coolFieldDefinition3: {
     updatedAt?: Date;
     deletedAt?: Date;
     defaultValue?: any;
+    blockEditingFromUI?: boolean;
     displayName?: string;
     validation?: any;
     fieldType: string;
     entityId: string;
     entityType: string;
     modelType: string;
-    blockEditingFromUI?: boolean;
 };
 export declare const booleanField: (modelType: string) => CreateCustomFieldDefinition;
 export declare const selectField: (modelType: string, options: any) => CreateCustomFieldDefinition;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 import type { IncludeOptions } from 'sequelize';
-import type { ModelCtor } from 'sequelize-typescript';
+import type { ModelCtor, Sequelize } from 'sequelize-typescript';
 import type { getUser as GetUserType } from '@autofleet/zehut';
 export type ModelFetcher = (name: string) => any;
 export type ModelOptions = {
@@ -29,4 +29,5 @@ export type CustomFieldOptions = {
     models: Models[];
     databaseConfig: any;
     getUser: typeof GetUserType;
+    sequelize?: Sequelize;
 };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "start": "ts-node src/index.ts",
     "build": "rm -rf dist && tsc",
     "linter": "eslint .",
-    "test": "jest --forceExit --runInBand",
-    "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
+    "test": "jest --runInBand",
+    "coverage": "jest --coverage --runInBand && rm -rf ./coverage",
     "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
     "dev": "nodemon",
     "watch": "npm-watch build-to-local-repo",

package/src/events/index.ts

@@ -3,19 +3,17 @@ import logger from '../utils/logger';
 
 const events = new Events({ logger });
 
-const KEYS_TO_CONVERT = ['value', 'defaultValue'];
+const KEYS_TO_CONVERT = ['value', 'defaultValue', 'blockEditingFromUI'];
 
-const stringifyBooleans = (savedObject: any, keysToConvert: Array<string>) => {
-  if (!Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
+const stringifyBooleans = (savedObject: any, keysToConvert: string[]) => {
+  const savedObjectKeySet = new Set(Object.keys(savedObject));
+  if (keysToConvert.every((key) => !savedObjectKeySet.has(key))) {
     return savedObject;
   }
-  const objectToReturn = { ...savedObject };
-  keysToConvert.forEach((key) => {
-    if (typeof savedObject[key] === 'boolean') {
-      objectToReturn[key] = savedObject[key].toString();
-    }
-  });
-  return objectToReturn;
+  return {
+    ...savedObject,
+    ...Object.fromEntries(keysToConvert.map((key) => [key, typeof savedObject[key] === 'boolean' ? savedObject[key].toString() : savedObject[key]])),
+  };
 };
 
 const modelTableMapping = {

package/src/index.ts

@@ -30,7 +30,7 @@ const useCustomFields = async (
   if (app) {
     app.use('/api', api);
   }
-  const sequelize = initDB(options.databaseConfig);
+  const sequelize = options.sequelize ?? initDB(options.databaseConfig);
   if (process.env.NODE_ENV === 'test') {
     await initTestModels(sequelize);
   }

package/src/tests/helpers/commonHooks.ts

@@ -0,0 +1,31 @@
+import type { Application } from 'express';
+import type { Sequelize } from 'sequelize-typescript';
+import useCustomFields from '../..';
+import { cleanup, getModel } from '.';
+import databaseConfig from './database-config';
+import initDB, { createSequelizeMeta } from '../../utils/db';
+import type { Models } from '../../types';
+
+export function commonTestHooks(app: Application | null = null, models: Models[] = [{ name: 'TestModel', scopeAttributes: ['fleetId'] }]) {
+  let sequelize: Sequelize;
+
+  beforeAll(async () => {
+    sequelize = initDB(databaseConfig);
+    await createSequelizeMeta(sequelize);
+    await useCustomFields(app, getModel, {
+      models,
+      databaseConfig,
+      getUser: () => undefined,
+      sequelize,
+    });
+  });
+
+  afterEach(async () => {
+    jest.clearAllMocks();
+    await cleanup();
+  });
+
+  afterAll(async () => {
+    await sequelize.close();
+  });
+}

package/src/types/index.ts

@@ -1,5 +1,5 @@
 import type { IncludeOptions } from 'sequelize';
-import type { ModelCtor } from 'sequelize-typescript';
+import type { ModelCtor, Sequelize } from 'sequelize-typescript';
 import type { getUser as GetUserType } from '@autofleet/zehut';
 
 export type ModelFetcher = (name: string) => any;
@@ -33,4 +33,5 @@ export type CustomFieldOptions = {
   models: Models[];
   databaseConfig: any;
   getUser: typeof GetUserType;
+  sequelize?: Sequelize;
 };