@autofleet/sadot 0.5.5-beta.6 → 0.5.5-beta.7

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

@@ -35,7 +35,7 @@ const customFieldsSearchTestFlow = async ({ fieldType, fieldValue, searchTerm, e
     const [testModel1] = await (0, testModel_1.createTestModels)(definition.entityId, 2);
     await testModel1.update({ customFields: { [definition.name]: fieldValue } });
     const models = await models_1.TestModel.findAndCountAll({
-        where: { [sequelize_1.Op.or]: [(0, index_1.buildCustomFieldsSearchWhereClause)('TestModel')] },
+        where: { [sequelize_1.Op.or]: [(0, index_1.buildCustomFieldsSearchWhereClause)(models_1.TestModel, definition.entityId)] },
         replacements: { searchTerm: `%${searchTerm}%` },
     });
     expect(models.count).toBe(expectedNumberOfQueryResults);

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

@@ -1,4 +1,5 @@
 import { WhereOptions } from 'sequelize';
+import { ModelStatic } from 'sequelize-typescript';
 /**
  * This function builds a WHERE clause to be added to the main query.
  * The WHERE clause enable free term search by custom fields.
@@ -6,4 +7,4 @@ import { WhereOptions } from 'sequelize';
  * @param {string} name - The model type name to be search for.
  * @returns {WhereOptions} - A where clause to be added to the main query.
  */
-export declare const buildCustomFieldsSearchWhereClause: (modelName: string) => WhereOptions;
+export declare const buildCustomFieldsSearchWhereClause: (model: ModelStatic, entityId: string) => WhereOptions;

package/dist/utils/helpers/index.js

@@ -11,15 +11,17 @@ const sequelize_typescript_1 = require("sequelize-typescript");
  * @param {string} name - The model type name to be search for.
  * @returns {WhereOptions} - A where clause to be added to the main query.
  */
-const buildCustomFieldsSearchWhereClause = (modelName) => {
+const buildCustomFieldsSearchWhereClause = (model, entityId) => {
     const subQuery = 'EXISTS ('
         + ' SELECT 1'
         + ' 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 = '${modelName}' `
+        + ' 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 "cv"."model_id" = "${modelName}"."id"`
+        + ` AND "cv"."model_id" = "${model.name}"."id"`
         + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
     return {
         [sequelize_1.Op.or]: [

package/package.json

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

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

@@ -24,7 +24,7 @@ const customFieldsSearchTestFlow = async ({
   await testModel1.update({ customFields: { [definition.name]: fieldValue } });
   const models = await TestModel.findAndCountAll(
     {
-      where: { [Op.or]: [buildCustomFieldsSearchWhereClause('TestModel')] },
+      where: { [Op.or]: [buildCustomFieldsSearchWhereClause(TestModel, definition.entityId)] },
       replacements: { searchTerm: `%${searchTerm}%` },
     },
   );

package/src/utils/helpers/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 import { WhereOptions, Op } from 'sequelize';
-import { Sequelize } from 'sequelize-typescript';
+import { ModelStatic, Sequelize } from 'sequelize-typescript';
 
 /**
  * This function builds a WHERE clause to be added to the main query.
@@ -10,15 +10,20 @@ import { Sequelize } from 'sequelize-typescript';
  * @returns {WhereOptions} - A where clause to be added to the main query.
  */
 
-export const buildCustomFieldsSearchWhereClause = (modelName: string): WhereOptions => {
+export const buildCustomFieldsSearchWhereClause = (
+  model: ModelStatic,
+  entityId : string,
+): WhereOptions => {
   const subQuery = 'EXISTS ('
       + ' SELECT 1'
       + ' 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 = '${modelName}' `
+      + ' 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 "cv"."model_id" = "${modelName}"."id"`
+        + ` AND "cv"."model_id" = "${model.name}"."id"`
         + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
   return {
     [Op.or]: [