@autofleet/sadot 0.5.5-beta.0 → 0.5.5-beta.1

package/dist/index.d.ts

@@ -11,4 +11,4 @@ export * from './utils/constants';
 declare const useCustomFields: (app: Application | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
 export default useCustomFields;
 export declare const disableCustomFields: (models: any, getModel: any) => void;
-export declare const buildCustomFieldsSearchLiteral: (modelName: string, searchTerm: string) => WhereOptions;
+export declare const buildCustomFieldsSearchWhereClause: (searchTerm: string) => WhereOptions;

package/dist/index.js

@@ -17,8 +17,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCustomFieldsSearchLiteral = exports.disableCustomFields = void 0;
+exports.buildCustomFieldsSearchWhereClause = exports.disableCustomFields = void 0;
 const sequelize_typescript_1 = require("sequelize-typescript");
+const sequelize_1 = require("sequelize");
 const models_1 = require("./models");
 const api_1 = __importDefault(require("./api"));
 const db_1 = __importDefault(require("./utils/db"));
@@ -51,8 +52,11 @@ const disableCustomFields = (models, getModel) => {
     (0, init_1.removeHooks)(models, getModel);
 };
 exports.disableCustomFields = disableCustomFields;
-const buildCustomFieldsSearchLiteral = (modelName, searchTerm) => 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}%')`);
-exports.buildCustomFieldsSearchLiteral = buildCustomFieldsSearchLiteral;
+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.0",
+  "version": "0.5.5-beta.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { Application } from 'express';
 import { Sequelize } from 'sequelize-typescript';
-import { WhereOptions } from 'sequelize';
+import { WhereOptions, Op } from 'sequelize';
 import {
   initTables, initTestModels,
 } from './models';
@@ -45,10 +45,12 @@ export const disableCustomFields = (models, getModel): void => {
   removeHooks(models, getModel);
 };
 
-export const buildCustomFieldsSearchLiteral = (
-  modelName: string,
+export const buildCustomFieldsSearchWhereClause = (
   searchTerm: string,
-) : WhereOptions => 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}%')`);
+) : WhereOptions => ({
+  where: {
+    [Op.or]: [
+      Sequelize.where(Sequelize.cast(Sequelize.col('customFieldValue.value'), 'text'), { [Op.iLike]: `%${searchTerm}%` }),
+    ],
+  },
+});