@autofleet/sadot 0.6.8-beta.1 → 0.6.8-beta.3

package/dist/scopes/filter.d.ts

@@ -17,6 +17,13 @@ export type CustomFieldFilterOptions = {
     where?: WhereOptions;
     replacements?: Record<string, string>;
 };
+/**
+ * A Sequelize scope for filtering models by custom fields.
+ * This scope builds a WHERE clause to be applied on the main query.
+ *
+ * @param name - The model type name used to join custom_field_definitions.
+ * @returns A function that takes conditions and returns the Sequelize options object.
+ */
 export declare const customFieldsFilterScope: (name: string) => (conditions: Record<string, ConditionValue>) => CustomFieldFilterOptions;
 export declare const scopeName = "filterByCustomFields";
 export declare const customFieldsSortScope: (name: string) => (sort: CustomFieldSort[]) => {

package/dist/scopes/filter.js

@@ -5,14 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFieldsSortScope = exports.scopeName = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
+// eslint-disable-next-line import/no-extraneous-dependencies
+const dayjs_1 = __importDefault(require("dayjs"));
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const common_types_1 = require("@autofleet/common-types");
-const moment_1 = __importDefault(require("moment"));
 const helpers_1 = require("../utils/helpers");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 const castIfNeeded = (conditionValue) => {
-    if (moment_1.default.isDate(conditionValue)) {
+    if ((0, dayjs_1.default)(conditionValue).isValid()) {
         return '::timestamp';
     }
     if (!Number.isNaN(Number(conditionValue))) {
@@ -21,18 +22,24 @@ const castIfNeeded = (conditionValue) => {
     return '';
 };
 const AND_DELIMETER = ' AND ';
+/**
+ * A Sequelize scope for filtering models by custom fields.
+ * This scope builds a WHERE clause to be applied on the main query.
+ *
+ * @param name - The model type name used to join custom_field_definitions.
+ * @returns A function that takes conditions and returns the Sequelize options object.
+ */
 const customFieldsFilterScope = (name) => (conditions) => {
     if (!conditions || Object.keys(conditions).length === 0) {
         return {};
     }
-    const randomStr = (0, helpers_1.generateRandomString)();
-    const replacementMapPrefix = `customFieldsFilterScopeConditionMap_${randomStr}`;
+    const ConditionNameRandomStr = (0, helpers_1.generateRandomString)();
     const replacements = {};
-    replacements[`customFieldsFilterScopeConditionName_${randomStr}`] = `${name}`;
+    replacements[ConditionNameRandomStr] = `${name}`;
     // Build the WHERE clause for custom field filtering
     const conditionsStrings = Object.entries(conditions)
-        .map(([key, condition], index) => {
-        const replacemetKey = `${replacementMapPrefix}Key${index}`;
+        .map(([key, condition]) => {
+        const replacemetKey = (0, helpers_1.generateRandomString)();
         replacements[replacemetKey] = `${key}`;
         if (Array.isArray(condition)) {
             if (condition.length === 0) {
@@ -48,19 +55,19 @@ const customFieldsFilterScope = (name) => (conditions) => {
                 return `(custom_fields->> :${replacemetKey} ) IN ( ${values} )`;
             }
             return condition
-                .map((c, cIndex) => {
-                const valRep = `${replacementMapPrefix}Values${index}${cIndex}`;
+                .map((c) => {
+                const valRep = (0, helpers_1.generateRandomString)();
                 replacements[valRep] = `${c.value}`;
                 return `(custom_fields->> :${replacemetKey} )${castIfNeeded(c.value)} ${c.operator} :${valRep}`;
             }).join(AND_DELIMETER);
         }
         if (typeof condition === 'string') {
-            const conditionRep = `${replacementMapPrefix}Condition${index}`;
+            const conditionRep = (0, helpers_1.generateRandomString)();
             replacements[conditionRep] = `${condition}`;
             return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition)} = :${conditionRep}`;
         }
         if (condition?.operator) {
-            const valueRep = `${replacementMapPrefix}Values${index}`;
+            const valueRep = (0, helpers_1.generateRandomString)();
             replacements[valueRep] = `${condition.value}`;
             return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition.value)} ${condition.operator} :${valueRep}`;
         }
@@ -75,7 +82,7 @@ const customFieldsFilterScope = (name) => (conditions) => {
         + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '
         + 'FROM custom_field_values AS cv '
         + 'INNER JOIN custom_field_definitions AS cd ON cv.custom_field_definition_id = cd.id '
-        + `AND cd.model_type = :${`customFieldsFilterScopeConditionName_${randomStr}`} `
+        + `AND cd.model_type = :${ConditionNameRandomStr} `
         + 'GROUP BY cv.model_id'
         + ') AS CustomFieldAggregation WHERE '} ${customFieldConditions}`;
     return {
@@ -95,10 +102,9 @@ const customFieldsSortScope = (name) => (sort) => {
     }
     const randomStr = (0, helpers_1.generateRandomString)();
     const replacements = {};
-    const includes = Object.entries(sort).map(([key], index) => {
-        const keyReplacement = `key_${randomStr}_${index}`;
-        replacements[`keyCustomFields_${randomStr}_${index}`] = `customFields_${key}`;
-        replacements[keyReplacement] = `${key}`;
+    const includes = Object.entries(sort).map(([key]) => {
+        const keyRandomReplacement = (0, helpers_1.generateRandomString)();
+        replacements[keyRandomReplacement] = `${key}`;
         return ([
             sequelize_typescript_1.Sequelize.literal(`(
             SELECT value
@@ -107,7 +113,7 @@ const customFieldsSortScope = (name) => (sort) => {
                     ON cv.custom_field_definition_id = cd.id
                     AND cd.model_type = '${name}'
                     WHERE cv.model_id = "${name}"."id"
-                          AND cd.name = :${keyReplacement}
+                          AND cd.name = :${keyRandomReplacement}
                           ) AS CustomFieldAggregation
             )
           `), randomStr,

package/dist/utils/helpers/index.js

@@ -4,10 +4,11 @@ exports.generateCustomFieldSearchQueryPayload = exports.generateRandomString = v
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
+const node_crypto_1 = require("node:crypto");
 const constants_1 = require("../constants");
 const generateRandomString = (length = 5) => {
-    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    return Array.from({ length }, () => characters.charAt(Math.floor(Math.random() * characters.length))).join('');
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    return Array.from({ length }, () => characters.charAt((0, node_crypto_1.randomInt)(characters.length))).join('');
 };
 exports.generateRandomString = generateRandomString;
 const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, customFieldsTypesToExclude = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.6.8-beta.1",
+  "version": "0.6.8-beta.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -34,9 +34,9 @@
     "@autofleet/errors": "^1.0.10",
     "@autofleet/events": "^2.0.0",
     "@autofleet/logger": "^2.0.5",
+    "dayjs": "^1.11.11",
     "express": "^4.18.2",
     "joi": "^17.7.0",
-    "moment": "^2.30.1",
     "pg": "^8.10.0",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.31.1",

package/src/scopes/filter.ts

@@ -1,8 +1,9 @@
 /* eslint-disable import/prefer-default-export */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import dayjs from 'dayjs';
 import { Op, type WhereOptions } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 import { customFields } from '@autofleet/common-types';
-import moment from 'moment';
 import { generateRandomString } from '../utils/helpers';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
@@ -29,31 +30,38 @@ export type CustomFieldFilterOptions = {
 }
 
 const castIfNeeded = (conditionValue: string): string => {
-  if (moment.isDate(conditionValue)) {
+  if (dayjs(conditionValue).isValid()) {
     return '::timestamp';
   } if (!Number.isNaN(Number(conditionValue))) {
     return '::numeric';
   }
   return '';
 };
+
 const AND_DELIMETER = ' AND ';
 
+/**
+ * A Sequelize scope for filtering models by custom fields.
+ * This scope builds a WHERE clause to be applied on the main query.
+ *
+ * @param name - The model type name used to join custom_field_definitions.
+ * @returns A function that takes conditions and returns the Sequelize options object.
+ */
 export const customFieldsFilterScope = (
   name: string,
 ) => (conditions: Record<string, ConditionValue>): CustomFieldFilterOptions => {
   if (!conditions || Object.keys(conditions).length === 0) {
     return {};
   }
-  const randomStr = generateRandomString();
-  const replacementMapPrefix = `customFieldsFilterScopeConditionMap_${randomStr}`;
+  const ConditionNameRandomStr = generateRandomString();
   const replacements: Record<string, string> = {};
-  replacements[`customFieldsFilterScopeConditionName_${randomStr}`] = `${name}`;
+  replacements[ConditionNameRandomStr] = `${name}`;
 
   // Build the WHERE clause for custom field filtering
   const conditionsStrings = Object.entries(conditions)
     .map(
-      ([key, condition], index) => {
-        const replacemetKey = `${replacementMapPrefix}Key${index}`;
+      ([key, condition]) => {
+        const replacemetKey = generateRandomString();
         replacements[replacemetKey] = `${key}`;
         if (Array.isArray(condition)) {
           if (condition.length === 0) {
@@ -69,19 +77,19 @@ export const customFieldsFilterScope = (
             return `(custom_fields->> :${replacemetKey} ) IN ( ${values} )`;
           }
           return condition
-            .map((c, cIndex) => {
-              const valRep = `${replacementMapPrefix}Values${index}${cIndex}`;
+            .map((c) => {
+              const valRep = generateRandomString();
               replacements[valRep] = `${c.value}`;
               return `(custom_fields->> :${replacemetKey} )${castIfNeeded(c.value)} ${c.operator} :${valRep}`;
             }).join(AND_DELIMETER);
         }
         if (typeof condition === 'string') {
-          const conditionRep = `${replacementMapPrefix}Condition${index}`;
+          const conditionRep = generateRandomString();
           replacements[conditionRep] = `${condition}`;
           return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition)} = :${conditionRep}`;
         }
         if (condition?.operator) {
-          const valueRep = `${replacementMapPrefix}Values${index}`;
+          const valueRep = generateRandomString();
           replacements[valueRep] = `${condition.value}`;
           return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition.value)} ${condition.operator} :${valueRep}`;
         }
@@ -98,7 +106,7 @@ export const customFieldsFilterScope = (
     + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '
     + 'FROM custom_field_values AS cv '
     + 'INNER JOIN custom_field_definitions AS cd ON cv.custom_field_definition_id = cd.id '
-    + `AND cd.model_type = :${`customFieldsFilterScopeConditionName_${randomStr}`} `
+    + `AND cd.model_type = :${ConditionNameRandomStr} `
     + 'GROUP BY cv.model_id'
     + ') AS CustomFieldAggregation WHERE '} ${customFieldConditions}`;
   return {
@@ -121,10 +129,9 @@ export const customFieldsSortScope = (
   }
   const randomStr = generateRandomString();
   const replacements: Record<string, string> = {};
-  const includes = Object.entries(sort).map(([key], index) => {
-    const keyReplacement = `key_${randomStr}_${index}`;
-    replacements[`keyCustomFields_${randomStr}_${index}`] = `customFields_${key}`;
-    replacements[keyReplacement] = `${key}`;
+  const includes = Object.entries(sort).map(([key]) => {
+    const keyRandomReplacement = generateRandomString();
+    replacements[keyRandomReplacement] = `${key}`;
     return ([
       Sequelize.literal(`(
             SELECT value
@@ -133,7 +140,7 @@ export const customFieldsSortScope = (
                     ON cv.custom_field_definition_id = cd.id
                     AND cd.model_type = '${name}'
                     WHERE cv.model_id = "${name}"."id"
-                          AND cd.name = :${keyReplacement}
+                          AND cd.name = :${keyRandomReplacement}
                           ) AS CustomFieldAggregation
             )
           `), randomStr,

package/src/utils/helpers/index.ts

@@ -1,6 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import { type WhereOptions, Op, type BindOrReplacements } from 'sequelize';
 import { type ModelStatic, Sequelize } from 'sequelize-typescript';
+import { randomInt } from 'node:crypto';
 import { CustomFieldDefinitionType } from '../constants';
 
 /**
@@ -26,8 +27,8 @@ interface CustomFieldsSearchPayload {
 }
 
 export const generateRandomString = (length = 5): string => {
-  const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  return Array.from({ length }, () => characters.charAt(Math.floor(Math.random() * characters.length))).join('');
+  const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+  return Array.from({ length }, () => characters.charAt(randomInt(characters.length))).join('');
 };
 
 export const generateCustomFieldSearchQueryPayload = (