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

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

@@ -1,2 +1,9 @@
 import { WhereOptions } from 'sequelize';
+/**
+ * This function builds a WHERE clause to be added to the main query.
+ * The WHERE clause enable free term search by custom fields.
+ *
+ * @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;

package/dist/utils/helpers/index.js

@@ -4,18 +4,27 @@ exports.buildCustomFieldsSearchWhereClause = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
-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),
-    ],
-});
+/**
+ * This function builds a WHERE clause to be added to the main query.
+ * The WHERE clause enable free term search by custom fields.
+ *
+ * @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 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}' `
+        + ' WHERE'
+        + ' "cv"."deleted_at" IS NULL'
+        + ` AND "cv"."model_id" = "${modelName}"."id"`
+        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
+    return {
+        [sequelize_1.Op.or]: [
+            sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.literal(subQuery), true),
+        ],
+    };
+};
 exports.buildCustomFieldsSearchWhereClause = buildCustomFieldsSearchWhereClause;

package/package.json

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

package/src/utils/helpers/index.ts

@@ -2,17 +2,27 @@
 import { WhereOptions, Op } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 
-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),
-  ],
-});
+/**
+ * This function builds a WHERE clause to be added to the main query.
+ * The WHERE clause enable free term search by custom fields.
+ *
+ * @param {string} name - The model type name to be search for.
+ * @returns {WhereOptions} - A where clause to be added to the main query.
+ */
+
+export const buildCustomFieldsSearchWhereClause = (modelName: 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}' `
+      + ' WHERE'
+        + ' "cv"."deleted_at" IS NULL'
+        + ` AND "cv"."model_id" = "${modelName}"."id"`
+        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
+  return {
+    [Op.or]: [
+      Sequelize.where(Sequelize.literal(subQuery), true),
+    ],
+  };
+};