@autofleet/sadot 0.6.8-beta.2 → 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,6 +22,13 @@ 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 {};

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 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-    return Array.from({ length }, () => characters.charAt(Math.floor(Math.random() * characters.length))).join('');
+    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.2",
+  "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,15 +30,23 @@ 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 => {

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';
 
 /**
@@ -27,7 +28,7 @@ interface CustomFieldsSearchPayload {
 
 export const generateRandomString = (length = 5): string => {
   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-  return Array.from({ length }, () => characters.charAt(Math.floor(Math.random() * characters.length))).join('');
+  return Array.from({ length }, () => characters.charAt(randomInt(characters.length))).join('');
 };
 
 export const generateCustomFieldSearchQueryPayload = (