@autofleet/sadot 0.5.5-beta.3 → 0.5.5-beta.4

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

@@ -34,13 +34,13 @@ const customFieldsSearchTestFlow = async ({ fieldType, fieldValue, searchTerm, e
     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.findAll({
-        where: { [sequelize_1.Op.or]: [(0, index_1.buildCustomFieldsSearchWhereClause)(searchTerm)] },
-        include: { model: models_1.CustomFieldValue, as: 'customFieldValue' },
+    const models = await models_1.TestModel.findAndCountAll({
+        where: { [sequelize_1.Op.or]: [(0, index_1.buildCustomFieldsSearchWhereClause)('TestModel')] },
+        replacements: { searchTerm: `%${searchTerm}%` },
     });
-    expect(models.length).toBe(expectedNumberOfQueryResults);
+    expect(models.count).toBe(expectedNumberOfQueryResults);
     if (expectedNumberOfQueryResults > 0) {
-        expect(models[0].id).toBe(testModel1.id);
+        expect(models.rows[0].dataValues.id).toBe(testModel1.id);
     }
 };
 exports.default = customFieldsSearchTestFlow;

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

@@ -1,2 +1,2 @@
 import { WhereOptions } from 'sequelize';
-export declare const buildCustomFieldsSearchWhereClause: (searchTerm: string) => WhereOptions;
+export declare const buildCustomFieldsSearchWhereClause: (modelName: string) => WhereOptions;

package/dist/utils/helpers/index.js

@@ -4,11 +4,18 @@ exports.buildCustomFieldsSearchWhereClause = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
-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}%` }),
-        ],
-    },
+const buildCustomFieldsSearchWhereClause = (modelName) => ({
+    [sequelize_1.Op.or]: [
+        sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.literal(`
+        EXISTS (
+        SELECT 1
+        FROM "custom_field_values" AS "cv"
+        WHERE 
+          "cv"."deleted_at" IS NULL 
+          AND "cv"."model_id" = "${modelName}"."id"
+          AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm
+      )
+    `), true),
+    ],
 });
 exports.buildCustomFieldsSearchWhereClause = buildCustomFieldsSearchWhereClause;

package/package.json

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

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

@@ -3,7 +3,7 @@ import { buildCustomFieldsSearchWhereClause } from '../../../index';
 import * as DefinitionRepo from '../../../repository/definition';
 import { createDefinition } from '../../mocks/definition.mock';
 import { createTestModels } from '../../mocks/testModel';
-import { CustomFieldValue, TestModel } from '../../../models';
+import { TestModel } from '../../../models';
 
 interface CustomFieldsSearchTestFlowInput {
   fieldType: string;
@@ -22,15 +22,15 @@ const customFieldsSearchTestFlow = async ({
   await DefinitionRepo.create({ ...definition });
   const [testModel1] = await createTestModels(definition.entityId, 2);
   await testModel1.update({ customFields: { [definition.name]: fieldValue } });
-  const models = await TestModel.findAll(
+  const models = await TestModel.findAndCountAll(
     {
-      where: { [Op.or]: [buildCustomFieldsSearchWhereClause(searchTerm)] },
-      include: { model: CustomFieldValue, as: 'customFieldValue' },
+      where: { [Op.or]: [buildCustomFieldsSearchWhereClause('TestModel')] },
+      replacements: { searchTerm: `%${searchTerm}%` },
     },
   );
-  expect(models.length).toBe(expectedNumberOfQueryResults);
+  expect(models.count).toBe(expectedNumberOfQueryResults);
   if (expectedNumberOfQueryResults > 0) {
-    expect(models[0].id).toBe(testModel1.id);
+    expect(models.rows[0].dataValues.id).toBe(testModel1.id);
   }
 };
 

package/src/utils/helpers/index.ts

@@ -2,12 +2,17 @@
 import { WhereOptions, Op } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 
-export const buildCustomFieldsSearchWhereClause = (
-  searchTerm: string,
-) : WhereOptions => ({
-  where: {
-    [Op.or]: [
-      Sequelize.where(Sequelize.cast(Sequelize.col('customFieldValue.value'), 'text'), { [Op.iLike]: `%${searchTerm}%` }),
-    ],
-  },
+export const buildCustomFieldsSearchWhereClause = (modelName: string): WhereOptions => ({
+  [Op.or]: [
+    Sequelize.where(Sequelize.literal(`
+        EXISTS (
+        SELECT 1
+        FROM "custom_field_values" AS "cv"
+        WHERE 
+          "cv"."deleted_at" IS NULL 
+          AND "cv"."model_id" = "${modelName}"."id"
+          AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm
+      )
+    `), true),
+  ],
 });