@autofleet/sadot 0.5.3 → 0.5.4-beta.0

package/dist/index.d.ts

@@ -10,3 +10,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 getCustomFieldsSearchLiteral: (modelName: string, searchTerm: string) => string;

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disableCustomFields = void 0;
+exports.getCustomFieldsSearchLiteral = exports.disableCustomFields = void 0;
 const models_1 = require("./models");
 const api_1 = __importDefault(require("./api"));
 const db_1 = __importDefault(require("./utils/db"));
@@ -50,3 +50,5 @@ const disableCustomFields = (models, getModel) => {
     (0, init_1.removeHooks)(models, getModel);
 };
 exports.disableCustomFields = disableCustomFields;
+const getCustomFieldsSearchLiteral = (modelName, searchTerm) => `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.getCustomFieldsSearchLiteral = getCustomFieldsSearchLiteral;

package/dist/scopes/include.d.ts

@@ -0,0 +1,9 @@
+import { WhereOptions } from 'sequelize';
+export type CustomFieldSearchOptions = {
+    where?: WhereOptions;
+};
+export declare const customFieldsSearchScope: (name: string) => ({ searchTerm, queryWithSearchTerm }: {
+    searchTerm: any;
+    queryWithSearchTerm: any;
+}) => CustomFieldSearchOptions;
+export declare const scopeName = "searchByCustomFields";

package/dist/scopes/include.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scopeName = exports.customFieldsSearchScope = void 0;
+const sequelize_typescript_1 = require("sequelize-typescript");
+const customFieldsSearchScope = (name) => ({ searchTerm, queryWithSearchTerm }) => {
+    const subQuery = `${'EXISTS (SELECT 1 '
+        + 'FROM "custom_field_values" AS "cv" '
+        + 'WHERE '
+        + '"cv"."deleted_at" IS NULL AND '
+        + `"cv"."model_id" = "${name}"."id" AND `
+        + `CAST("cv"."value" AS TEXT) ILIKE '%${searchTerm}%')`}`;
+    return {
+        where: {
+            $or: [
+                sequelize_typescript_1.Sequelize.literal(`(${subQuery})`),
+                ...queryWithSearchTerm.$and[0].$or,
+            ],
+        },
+    };
+};
+exports.customFieldsSearchScope = customFieldsSearchScope;
+exports.scopeName = 'searchByCustomFields';

package/dist/utils/init.js

@@ -10,6 +10,7 @@ const models_1 = require("../models");
 const hooks_1 = require("../hooks");
 const scopes_1 = require("../scopes");
 const logger_1 = __importDefault(require("./logger"));
+const include_1 = require("../scopes/include");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 const addHooks = (models, getModel) => {
     models.forEach(async ({ name, scopeAttributes }) => {
@@ -91,6 +92,7 @@ const addScopes = (models, getModel) => {
             addAssociations(model, name);
             // Add filter scope
             model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name));
+            model.addScope('searchByCustomFields', (0, include_1.customFieldsSearchScope)(name));
         }
         catch (e) {
             logger_1.default.error(`Could not add custom fields scopes to model ${name}. `, e);

package/package.json

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

package/src/index.ts

@@ -43,3 +43,8 @@ export default useCustomFields;
 export const disableCustomFields = (models, getModel): void => {
   removeHooks(models, getModel);
 };
+
+export const getCustomFieldsSearchLiteral = (
+  modelName: string,
+  searchTerm: string,
+) : string => `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}%')`;

package/src/scopes/include.ts

@@ -0,0 +1,30 @@
+/* eslint-disable import/prefer-default-export */
+import { WhereOptions } from 'sequelize';
+import { Sequelize } from 'sequelize-typescript';
+
+export type CustomFieldSearchOptions = {
+  where?: WhereOptions;
+}
+
+export const customFieldsSearchScope = (
+  name: string,
+) => ({ searchTerm, queryWithSearchTerm }) : CustomFieldSearchOptions => {
+  const subQuery = `${
+    'EXISTS (SELECT 1 '
+    + 'FROM "custom_field_values" AS "cv" '
+    + 'WHERE '
+    + '"cv"."deleted_at" IS NULL AND '
+    + `"cv"."model_id" = "${name}"."id" AND `
+    + `CAST("cv"."value" AS TEXT) ILIKE '%${searchTerm}%')`}`;
+
+  return {
+    where: {
+      $or: [
+        Sequelize.literal(`(${subQuery})`),
+        ...queryWithSearchTerm.$and[0].$or,
+      ],
+    },
+  };
+};
+
+export const scopeName = 'searchByCustomFields';

package/src/utils/init.ts

@@ -15,6 +15,7 @@ import {
 import { customFieldsFilterScope } from '../scopes';
 import logger from './logger';
 import type { ModelFetcher, ModelOptions } from '../types';
+import { customFieldsSearchScope } from '../scopes/include';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
 
@@ -96,6 +97,7 @@ export const addScopes = (models: ModelOptions[], getModel: ModelFetcher): void
       addAssociations(model, name);
       // Add filter scope
       model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, customFieldsFilterScope(name));
+      model.addScope('searchByCustomFields', customFieldsSearchScope(name));
     } catch (e) {
       logger.error(`Could not add custom fields scopes to model ${name}. `, e);
     }