@autofleet/sadot 0.5.5-beta.27 → 0.5.5-beta.28

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

@@ -11,6 +11,8 @@ import { CustomFieldDefinitionType } from '../validations/type';
  * @param {string} searchTerm - The term to search for within custom fields.
  * @param {ModelStatic} model - The Sequelize model representing the entity type to search for.
  * @param {string} entityId - The entity ID to filter the custom fields by.
+ * @param {CustomFieldDefinitionType[]} excludedCustomFieldsTypes - An array of custom field types
+ * to exclude from the search
  *
  * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
  * for Sequelize.
@@ -19,5 +21,5 @@ interface CustomFieldsSearchPayload {
     where: WhereOptions;
     replacements: BindOrReplacements;
 }
-export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, excludedCustomFieldsTypes?: CustomFieldDefinitionType[]) => CustomFieldsSearchPayload;
+export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, customFieldsTypesToExclude?: CustomFieldDefinitionType[]) => CustomFieldsSearchPayload;
 export {};

package/dist/utils/helpers/index.js

@@ -5,8 +5,11 @@ exports.generateCustomFieldSearchQueryPayload = void 0;
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const type_1 = require("../validations/type");
-const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, excludedCustomFieldsTypes = [type_1.CustomFieldDefinitionType.DATETIME]) => {
-    const excludedTypesString = excludedCustomFieldsTypes.map((type) => `'${type}'`).join(',');
+const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, customFieldsTypesToExclude = [
+    type_1.CustomFieldDefinitionType.DATETIME,
+    type_1.CustomFieldDefinitionType.DATE,
+]) => {
+    const excludedTypesString = customFieldsTypesToExclude.map((type) => `'${type}'`).join(',');
     const subQuery = 'EXISTS ('
         + ' SELECT 1'
         + ' FROM "custom_field_values" AS "cv"'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.5.5-beta.27",
+  "version": "0.5.5-beta.28",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/tests/functional/searching/index.ts

@@ -1,4 +1,3 @@
-import { DataType } from 'sequelize-typescript';
 import { generateCustomFieldSearchQueryPayload } from '../../../index';
 import * as DefinitionRepo from '../../../repository/definition';
 import { createDefinition } from '../../mocks/definition.mock';

package/src/utils/helpers/index.ts

@@ -13,6 +13,8 @@ import { CustomFieldDefinitionType } from '../validations/type';
  * @param {string} searchTerm - The term to search for within custom fields.
  * @param {ModelStatic} model - The Sequelize model representing the entity type to search for.
  * @param {string} entityId - The entity ID to filter the custom fields by.
+ * @param {CustomFieldDefinitionType[]} excludedCustomFieldsTypes - An array of custom field types
+ * to exclude from the search
  *
  * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
  * for Sequelize.
@@ -27,9 +29,12 @@ export const generateCustomFieldSearchQueryPayload = (
   searchTerm: string,
   model: ModelStatic,
   entityId : string,
-  excludedCustomFieldsTypes : CustomFieldDefinitionType[] = [CustomFieldDefinitionType.DATETIME],
+  customFieldsTypesToExclude : CustomFieldDefinitionType[] = [
+    CustomFieldDefinitionType.DATETIME,
+    CustomFieldDefinitionType.DATE,
+  ],
 ): CustomFieldsSearchPayload => {
-  const excludedTypesString = excludedCustomFieldsTypes.map((type) => `'${type}'`).join(',');
+  const excludedTypesString = customFieldsTypesToExclude.map((type) => `'${type}'`).join(',');
 
   const subQuery = 'EXISTS ('
       + ' SELECT 1'