@autofleet/sadot 0.5.5-beta.18 → 0.5.5-beta.2

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

@@ -1,22 +1,2 @@
-import { WhereOptions, BindOrReplacements, DataType as SequelizeDataTypes } from 'sequelize';
-import { ModelStatic } from 'sequelize-typescript';
-/**
- * Builds a WHERE clause and replacements for free-text search by custom fields.
- *
- * This function constructs a WHERE clause and replacement bindings that allow searching
- * for a given term within custom fields associated with a specific model type and entity ID.
- * The WHERE clause and replacements are designed to be added to the main query.
- *
- * @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.
- *
- * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
- * for Sequelize.
- */
-interface CustomFieldsSearchPayload {
-    where: WhereOptions;
-    replacements: BindOrReplacements;
-}
-export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, excludedCustomFieldsTypes?: SequelizeDataTypes[]) => CustomFieldsSearchPayload;
-export {};
+import { WhereOptions } from 'sequelize';
+export declare const buildCustomFieldsSearchWhereClause: (searchTerm: string) => WhereOptions;

package/dist/utils/helpers/index.js

@@ -1,29 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCustomFieldSearchQueryPayload = void 0;
+exports.buildCustomFieldsSearchWhereClause = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
-const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, excludedCustomFieldsTypes = [sequelize_typescript_1.DataType.DATE]) => {
-    const subQuery = 'EXISTS ('
-        + ' SELECT 1'
-        + ' FROM "custom_field_values" AS "cv"'
-        + ' INNER JOIN custom_field_definitions AS cd '
-        + ` ON cd.entity_id = '${entityId}'`
-        + ' AND cv.custom_field_definition_id = cd.id '
-        + ` AND cd.model_type = '${model.name}' `
-        + ' WHERE'
-        + ' "cv"."deleted_at" IS NULL'
-        + ' AND "cd"."field_type" NOT IN (\'datetime\')'
-        + ` AND "cv"."model_id" = "${model.name}"."id"`
-        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
-    return {
-        where: {
-            [sequelize_1.Op.or]: [
-                sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.literal(subQuery), true),
-            ],
-        },
-        replacements: { searchTerm: `%${searchTerm}%` },
-    };
-};
-exports.generateCustomFieldSearchQueryPayload = generateCustomFieldSearchQueryPayload;
+const buildCustomFieldsSearchWhereClause = (searchTerm) => ({
+    where: {
+        [sequelize_1.Op.or]: [
+            sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.cast(sequelize_typescript_1.Sequelize.col('customFieldValue.value'), 'text'), { [sequelize_1.Op.iLike]: `%${searchTerm}%` }),
+        ],
+    },
+});
+exports.buildCustomFieldsSearchWhereClause = buildCustomFieldsSearchWhereClause;

package/package.json

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

package/src/utils/helpers/index.ts

@@ -1,54 +1,13 @@
 /* eslint-disable import/prefer-default-export */
-import {
-  WhereOptions, Op, BindOrReplacements, DataType as SequelizeDataTypes,
-} from 'sequelize';
-import { DataType, ModelStatic, Sequelize } from 'sequelize-typescript';
+import { WhereOptions, Op } from 'sequelize';
+import { Sequelize } from 'sequelize-typescript';
 
-/**
- * Builds a WHERE clause and replacements for free-text search by custom fields.
- *
- * This function constructs a WHERE clause and replacement bindings that allow searching
- * for a given term within custom fields associated with a specific model type and entity ID.
- * The WHERE clause and replacements are designed to be added to the main query.
- *
- * @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.
- *
- * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
- * for Sequelize.
- */
-
-interface CustomFieldsSearchPayload {
-  where: WhereOptions;
-  replacements: BindOrReplacements;
-}
-
-export const generateCustomFieldSearchQueryPayload = (
+export const buildCustomFieldsSearchWhereClause = (
   searchTerm: string,
-  model: ModelStatic,
-  entityId : string,
-  excludedCustomFieldsTypes : SequelizeDataTypes[] = [DataType.DATE],
-): CustomFieldsSearchPayload => {
-  const subQuery = 'EXISTS ('
-      + ' SELECT 1'
-      + ' FROM "custom_field_values" AS "cv"'
-      + ' INNER JOIN custom_field_definitions AS cd '
-        + ` ON cd.entity_id = '${entityId}'`
-        + ' AND cv.custom_field_definition_id = cd.id '
-        + ` AND cd.model_type = '${model.name}' `
-      + ' WHERE'
-        + ' "cv"."deleted_at" IS NULL'
-        + ' AND "cd"."field_type" NOT IN (\'datetime\')'
-        + ` AND "cv"."model_id" = "${model.name}"."id"`
-        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
-
-  return {
-    where: {
-      [Op.or]: [
-        Sequelize.where(Sequelize.literal(subQuery), true),
-      ],
-    },
-    replacements: { searchTerm: `%${searchTerm}%` },
-  };
-};
+) : WhereOptions => ({
+  where: {
+    [Op.or]: [
+      Sequelize.where(Sequelize.cast(Sequelize.col('customFieldValue.value'), 'text'), { [Op.iLike]: `%${searchTerm}%` }),
+    ],
+  },
+});

package/dist/tests/functional/searching/index.d.ts

@@ -1,8 +0,0 @@
-interface CustomFieldsSearchTestFlowInput {
-    fieldType: string;
-    fieldValue: string | number;
-    searchTerm: string;
-    expectedNumberOfQueryResults: number;
-}
-declare const customFieldsSearchTestFlow: ({ fieldType, fieldValue, searchTerm, expectedNumberOfQueryResults, }: CustomFieldsSearchTestFlowInput) => Promise<void>;
-export default customFieldsSearchTestFlow;

package/dist/tests/functional/searching/index.js

@@ -1,44 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../../../index");
-const DefinitionRepo = __importStar(require("../../../repository/definition"));
-const definition_mock_1 = require("../../mocks/definition.mock");
-const testModel_1 = require("../../mocks/testModel");
-const models_1 = require("../../../models");
-const customFieldsSearchTestFlow = async ({ fieldType, fieldValue, searchTerm, expectedNumberOfQueryResults, }) => {
-    const definition = (0, definition_mock_1.createDefinition)({ fieldType, name: 'coolDefinition' });
-    await DefinitionRepo.create({ ...definition });
-    const [testModel1] = await (0, testModel_1.createTestModels)(definition.entityId, 2);
-    await testModel1.update({ customFields: { [definition.name]: fieldValue } });
-    const models = await models_1.TestModel.findAndCountAll({
-        ...(0, index_1.generateCustomFieldSearchQueryPayload)(searchTerm, models_1.TestModel, definition.entityId),
-    });
-    expect(models.count).toBe(expectedNumberOfQueryResults);
-    if (expectedNumberOfQueryResults > 0) {
-        expect(models.rows[0].dataValues.id).toBe(testModel1.id);
-    }
-};
-exports.default = customFieldsSearchTestFlow;

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

@@ -1,40 +0,0 @@
-import { DataType } from 'sequelize-typescript';
-import { generateCustomFieldSearchQueryPayload } from '../../../index';
-import * as DefinitionRepo from '../../../repository/definition';
-import { createDefinition } from '../../mocks/definition.mock';
-import { createTestModels } from '../../mocks/testModel';
-import { TestModel } from '../../../models';
-
-interface CustomFieldsSearchTestFlowInput {
-  fieldType: string;
-  fieldValue: string | number;
-  searchTerm: string;
-  expectedNumberOfQueryResults: number;
-}
-
-const customFieldsSearchTestFlow = async ({
-  fieldType,
-  fieldValue,
-  searchTerm,
-  expectedNumberOfQueryResults,
-}: CustomFieldsSearchTestFlowInput) : Promise<void> => {
-  const definition = createDefinition({ fieldType, name: 'coolDefinition' });
-  await DefinitionRepo.create({ ...definition });
-  const [testModel1] = await createTestModels(definition.entityId, 2);
-  await testModel1.update({ customFields: { [definition.name]: fieldValue } });
-  const models = await TestModel.findAndCountAll(
-    {
-      ...generateCustomFieldSearchQueryPayload(
-        searchTerm,
-        TestModel,
-        definition.entityId,
-      ),
-    },
-  );
-  expect(models.count).toBe(expectedNumberOfQueryResults);
-  if (expectedNumberOfQueryResults > 0) {
-    expect(models.rows[0].dataValues.id).toBe(testModel1.id);
-  }
-};
-
-export default customFieldsSearchTestFlow;