@autofleet/sadot 0.7.4-beta-5d31a6b9.0 → 0.7.4

package/dist/events/index.js

@@ -7,18 +7,18 @@ 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'];
-const stringifyBools = (savedObject, keysToConvert) => {
-    if (Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
-        const objectToReturn = { ...savedObject };
-        keysToConvert.forEach((key) => {
-            if (typeof savedObject[key] === 'boolean') {
-                objectToReturn[key] = savedObject[key].toString();
-            }
-        });
-        return objectToReturn;
+const KEYS_TO_CONVERT = ['value', 'defaultValue'];
+const stringifyBooleans = (savedObject, keysToConvert) => {
+    if (!Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
+        return savedObject;
     }
-    return savedObject;
+    const objectToReturn = { ...savedObject };
+    keysToConvert.forEach((key) => {
+        if (typeof savedObject[key] === 'boolean') {
+            objectToReturn[key] = savedObject[key].toString();
+        }
+    });
+    return objectToReturn;
 };
 const modelTableMapping = {
     CustomFieldDefinition: {
@@ -32,16 +32,17 @@ const modelTableMapping = {
 };
 const sendDimEvent = (instance) => {
     const mapping = modelTableMapping[instance.constructor.name];
-    if (mapping) {
-        let objectToSend = instance.get();
-        try {
-            objectToSend = stringifyBools(instance.get(), KEYS_TO_CONVERT);
-        }
-        catch (err) {
-            logger_1.default.error('Failed to convert booleans in dim event payload', err);
-        }
-        events.sendObject(mapping.tableName, mapping.eventVersion, objectToSend);
+    if (!mapping) {
+        return;
+    }
+    let objectToSend = instance.get();
+    try {
+        objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);
+    }
+    catch (err) {
+        logger_1.default.error('Failed to convert booleans in dim event payload', err);
     }
+    events.sendObject(mapping.tableName, mapping.eventVersion, objectToSend);
 };
 exports.sendDimEvent = sendDimEvent;
 exports.default = events;

package/dist/utils/helpers/index.d.ts

@@ -23,5 +23,4 @@ interface CustomFieldsSearchPayload {
 }
 export declare const generateRandomString: (length?: number) => string;
 export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, customFieldsTypesToExclude?: CustomFieldDefinitionType[]) => CustomFieldsSearchPayload;
-export declare const excludeCustomFieldFilterScope: (modelType: string, keyToExclude: string, valuesToExclude: string | string[]) => Omit<CustomFieldsSearchPayload, 'replacements'>;
 export {};

package/dist/utils/helpers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.excludeCustomFieldFilterScope = exports.generateCustomFieldSearchQueryPayload = exports.generateRandomString = void 0;
+exports.generateCustomFieldSearchQueryPayload = exports.generateRandomString = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
@@ -38,29 +38,3 @@ const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, cust
     };
 };
 exports.generateCustomFieldSearchQueryPayload = generateCustomFieldSearchQueryPayload;
-const excludeCustomFieldFilterScope = (modelType, keyToExclude, valuesToExclude) => {
-    const keyToIgnore = keyToExclude.split('.')[1];
-    const valsToIgnore = Array.isArray(valuesToExclude) ? valuesToExclude.map((v) => `'"${v}"'`).join(', ') : null;
-    const customFieldsQuery = valsToIgnore ? `AND cv.value IN (${valsToIgnore})` : '';
-    const existsCondition = `
-      EXISTS (
-        SELECT 1
-        FROM custom_field_values cv
-        INNER JOIN custom_field_definitions cd 
-          ON cv.custom_field_definition_id = cd.id 
-        WHERE 
-          cv.model_id = "${modelType}"."id" 
-          AND cd.model_type = '${modelType}'
-          AND cd.name = '${keyToIgnore}' 
-         ${customFieldsQuery}
-      )
-  `;
-    return {
-        where: {
-            [sequelize_1.Op.and]: [
-                sequelize_typescript_1.Sequelize.literal(existsCondition),
-            ],
-        },
-    };
-};
-exports.excludeCustomFieldFilterScope = excludeCustomFieldFilterScope;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.4-beta-5d31a6b9.0",
+  "version": "0.7.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/events/index.ts

@@ -3,19 +3,19 @@ import logger from '../utils/logger';
 
 const events = new Events({ logger });
 
-const KEYS_TO_CONVERT = ['value'];
+const KEYS_TO_CONVERT = ['value', 'defaultValue'];
 
-const stringifyBools = (savedObject: any, keysToConvert: Array<string>) => {
-  if (Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
-    const objectToReturn = { ...savedObject };
-    keysToConvert.forEach((key) => {
-      if (typeof savedObject[key] === 'boolean') {
-        objectToReturn[key] = savedObject[key].toString();
-      }
-    });
-    return objectToReturn;
+const stringifyBooleans = (savedObject: any, keysToConvert: Array<string>) => {
+  if (!Object.keys(savedObject).some((key) => keysToConvert.includes(key))) {
+    return savedObject;
   }
-  return savedObject;
+  const objectToReturn = { ...savedObject };
+  keysToConvert.forEach((key) => {
+    if (typeof savedObject[key] === 'boolean') {
+      objectToReturn[key] = savedObject[key].toString();
+    }
+  });
+  return objectToReturn;
 };
 
 const modelTableMapping = {
@@ -31,20 +31,21 @@ const modelTableMapping = {
 
 export const sendDimEvent = (instance): void => {
   const mapping = modelTableMapping[instance.constructor.name];
-  if (mapping) {
-    let objectToSend = instance.get();
-    try {
-      objectToSend = stringifyBools(instance.get(), KEYS_TO_CONVERT);
-    } catch (err) {
-      logger.error('Failed to convert booleans in dim event payload', err);
-    }
-
-    events.sendObject(
-      mapping.tableName,
-      mapping.eventVersion,
-      objectToSend,
-    );
+  if (!mapping) {
+    return;
   }
+  let objectToSend = instance.get();
+  try {
+    objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);
+  } catch (err) {
+    logger.error('Failed to convert booleans in dim event payload', err);
+  }
+
+  events.sendObject(
+    mapping.tableName,
+    mapping.eventVersion,
+    objectToSend,
+  );
 };
 
 export default events;

package/src/scopes/filter.ts

@@ -112,7 +112,6 @@ export const customFieldsFilterScope = (
   if (conditionsStrings.length === 0) {
     return {};
   }
-
   const customFieldConditions = conditionsStrings.join(AND_DELIMETER);
   const subQuery = `${'SELECT model_id FROM ('
     + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '

package/src/utils/helpers/index.ts

@@ -1,7 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import {
-  type WhereOptions, Op, type BindOrReplacements,
-} from 'sequelize';
+import { type WhereOptions, Op, type BindOrReplacements } from 'sequelize';
 import { type ModelStatic, Sequelize } from 'sequelize-typescript';
 import { randomInt } from 'node:crypto';
 import { CustomFieldDefinitionType } from '../constants';
@@ -66,34 +64,3 @@ export const generateCustomFieldSearchQueryPayload = (
     replacements: { searchTerm: `%${searchTerm}%` },
   };
 };
-
-export const excludeCustomFieldFilterScope = (
-  modelType: string,
-  keyToExclude: string,
-  valuesToExclude: string | string[],
-): Omit<CustomFieldsSearchPayload, 'replacements'> => {
-  const keyToIgnore = keyToExclude.split('.')[1];
-  const valsToIgnore = Array.isArray(valuesToExclude) ? valuesToExclude.map((v) => `'"${v}"'`).join(', ') : null;
-  const customFieldsQuery = valsToIgnore ? `AND cv.value IN (${valsToIgnore})` : '';
-  const existsCondition = `
-      EXISTS (
-        SELECT 1
-        FROM custom_field_values cv
-        INNER JOIN custom_field_definitions cd 
-          ON cv.custom_field_definition_id = cd.id 
-        WHERE 
-          cv.model_id = "${modelType}"."id" 
-          AND cd.model_type = '${modelType}'
-          AND cd.name = '${keyToIgnore}' 
-         ${customFieldsQuery}
-      )
-  `;
-
-  return {
-    where: {
-      [Op.and]: [
-        Sequelize.literal(existsCondition),
-      ],
-    },
-  };
-};

package/.env

@@ -1,3 +0,0 @@
-DB_USERNAME=emiltayeb
-DB_PASSWORD=123456
-NODE_ENV=test