@autofleet/sadot 0.13.5-beta.0 → 0.13.5

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

@@ -1,4 +1,4 @@
-import { type WhereOptions, type IncludeOptions } from 'sequelize';
+import { type WhereOptions, type BindOrReplacements } from 'sequelize';
 import { type ModelStatic } from 'sequelize-typescript';
 import { CustomFieldDefinitionType } from '../constants';
 /**
@@ -14,11 +14,12 @@ import { CustomFieldDefinitionType } from '../constants';
  * @param {CustomFieldDefinitionType[]} excludedCustomFieldsTypes - An array of custom field types
  * to exclude from the search
  *
- * @returns {CustomFieldsSearchPayload} - An object containing the INCLUDE clause and WHERE clause to add to query payload
+ * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
+ * for Sequelize.
  */
 interface CustomFieldsSearchPayload {
     where: WhereOptions;
-    include: IncludeOptions[];
+    replacements: BindOrReplacements;
 }
 export declare const generateRandomString: (length?: number) => string;
 export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, customFieldsTypesToExclude?: CustomFieldDefinitionType[]) => CustomFieldsSearchPayload;

package/dist/utils/helpers/index.js

@@ -6,7 +6,6 @@ const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const node_crypto_1 = require("node:crypto");
 const constants_1 = require("../constants");
-const models_1 = require("../../models");
 const generateRandomString = (length = 5) => {
     const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
     return Array.from({ length }, () => characters.charAt((0, node_crypto_1.randomInt)(characters.length))).join('');
@@ -15,34 +14,27 @@ exports.generateRandomString = generateRandomString;
 const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, customFieldsTypesToExclude = [
     constants_1.CustomFieldDefinitionType.DATETIME,
     constants_1.CustomFieldDefinitionType.DATE,
-]) => ({
-    include: [{
-            attributes: ['value', 'model_id'],
-            model: models_1.CustomFieldValue,
-            as: 'customFieldValue',
-            required: false,
-            include: [
-                {
-                    model: models_1.CustomFieldDefinition,
-                    as: 'customFieldDefinition',
-                    attributes: ['entity_id', 'field_type', 'model_type'],
-                    required: true,
-                    on: {
-                        id: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('id'), { [sequelize_1.Op.eq]: sequelize_typescript_1.Sequelize.col('customFieldValue.custom_field_definition_id') }),
-                        entityId: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('entity_id'), { [sequelize_1.Op.eq]: `${entityId}` }),
-                        modelType: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('model_type'), { [sequelize_1.Op.eq]: `${model.name}` }),
-                        fieldType: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('field_type'), { [sequelize_1.Op.notIn]: customFieldsTypesToExclude }),
-                    },
-                    where: {
-                        deleted_at: null,
-                    },
-                },
+]) => {
+    const excludedTypesString = customFieldsTypesToExclude.map((type) => `'${type}'`).join(',');
+    const subQuery = 'EXISTS ('
+        + ' SELECT 1'
+        + ' FROM "custom_field_values" AS "cv"'
+        + ' 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}'`
+        + ` ${excludedTypesString ? `AND cd.field_type NOT IN (${excludedTypesString})` : ''}`
+        + ' WHERE'
+        + ' "cv"."deleted_at" IS NULL'
+        + ` AND "cv"."model_id" = "${model.name}"."id"`
+        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
+    return {
+        where: {
+            [sequelize_1.Op.or]: [
+                sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.literal(subQuery), true),
             ],
-            on: {
-                value: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.cast(sequelize_typescript_1.Sequelize.col('value'), 'text'), { [sequelize_1.Op.iLike]: `%${searchTerm}%` }),
-                model_id: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('model_id'), { [sequelize_1.Op.eq]: sequelize_typescript_1.Sequelize.col(`${model.name}.id`) }),
-            },
-        }],
-    where: sequelize_typescript_1.Sequelize.where(sequelize_typescript_1.Sequelize.col('customFieldValue.model_id'), { [sequelize_1.Op.not]: null }),
-});
+        },
+        replacements: { searchTerm: `%${searchTerm}%` },
+    };
+};
 exports.generateCustomFieldSearchQueryPayload = generateCustomFieldSearchQueryPayload;

package/dist/utils/init.js

@@ -73,7 +73,9 @@ exports.removeHooks = removeHooks;
 /**
  *  Necessary associations for the {@link customFieldsFilterScope} scope
  */
-const addAssociations = (model, modelName) => {
+const addAssociations = (model, modelName, options) => {
+    if (options?.useCustomFieldsEntries)
+        return;
     model.hasMany(models_1.CustomFieldValue, { foreignKey: 'modelId', as: 'customFieldValue' });
     // TBC: maybe can be removed
     models_1.CustomFieldValue.belongsTo(model, { foreignKey: 'modelId', as: modelName });
@@ -90,7 +92,7 @@ const addScopes = (models, getModel, options = { useCustomFieldsEntries: false }
                 return;
             }
             // Necessary associations for the filtering scope
-            addAssociations(model, name);
+            addAssociations(model, name, options);
             // Add filter scope
             model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, (0, scopes_1.customFieldsFilterScope)(name, options));
             model.addScope(custom_fields_1.CUSTOM_FIELDS_SORT_SCOPE, (0, filter_1.customFieldsSortScope)(name, options));

package/package.json

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

package/src/utils/helpers/index.ts

@@ -1,11 +1,8 @@
 /* eslint-disable import/prefer-default-export */
-import {
-  type WhereOptions, Op, type IncludeOptions,
-} from 'sequelize';
+import { type WhereOptions, Op, type BindOrReplacements } from 'sequelize';
 import { type ModelStatic, Sequelize } from 'sequelize-typescript';
 import { randomInt } from 'node:crypto';
 import { CustomFieldDefinitionType } from '../constants';
-import { CustomFieldDefinition, CustomFieldValue } from '../../models';
 
 /**
  * Builds a WHERE clause and replacements for free-text search by custom fields.
@@ -20,12 +17,13 @@ import { CustomFieldDefinition, CustomFieldValue } from '../../models';
  * @param {CustomFieldDefinitionType[]} excludedCustomFieldsTypes - An array of custom field types
  * to exclude from the search
  *
- * @returns {CustomFieldsSearchPayload} - An object containing the INCLUDE clause and WHERE clause to add to query payload
+ * @returns {CustomFieldsSearchPayload} - An object containing the WHERE clause and replacements
+ * for Sequelize.
  */
 
 interface CustomFieldsSearchPayload {
   where: WhereOptions;
-  include: IncludeOptions[];
+  replacements: BindOrReplacements;
 }
 
 export const generateRandomString = (length = 5): string => {
@@ -41,33 +39,28 @@ export const generateCustomFieldSearchQueryPayload = (
     CustomFieldDefinitionType.DATETIME,
     CustomFieldDefinitionType.DATE,
   ],
-): CustomFieldsSearchPayload => ({
-  include: [{
-    attributes: ['value', 'model_id'],
-    model: CustomFieldValue,
-    as: 'customFieldValue',
-    required: false,
-    include: [
-      {
-        model: CustomFieldDefinition,
-        as: 'customFieldDefinition',
-        attributes: ['entity_id', 'field_type', 'model_type'],
-        required: true,
-        on: {
-          id: Sequelize.where(Sequelize.col('id'), { [Op.eq]: Sequelize.col('customFieldValue.custom_field_definition_id') }),
-          entityId: Sequelize.where(Sequelize.col('entity_id'), { [Op.eq]: `${entityId}` }),
-          modelType: Sequelize.where(Sequelize.col('model_type'), { [Op.eq]: `${model.name}` }),
-          fieldType: Sequelize.where(Sequelize.col('field_type'), { [Op.notIn]: customFieldsTypesToExclude }),
-        },
-        where: {
-          deleted_at: null,
-        },
-      },
-    ],
-    on: {
-      value: Sequelize.where(Sequelize.cast(Sequelize.col('value'), 'text'), { [Op.iLike]: `%${searchTerm}%` }),
-      model_id: Sequelize.where(Sequelize.col('model_id'), { [Op.eq]: Sequelize.col(`${model.name}.id`) }),
+): CustomFieldsSearchPayload => {
+  const excludedTypesString = customFieldsTypesToExclude.map((type) => `'${type}'`).join(',');
+
+  const subQuery = 'EXISTS ('
+      + ' SELECT 1'
+      + ' FROM "custom_field_values" AS "cv"'
+      + ' 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}'`
+        + ` ${excludedTypesString ? `AND cd.field_type NOT IN (${excludedTypesString})` : ''}`
+      + ' WHERE'
+        + ' "cv"."deleted_at" IS NULL'
+        + ` AND "cv"."model_id" = "${model.name}"."id"`
+        + ' AND CAST("cv"."value" AS TEXT) ILIKE :searchTerm)';
+
+  return {
+    where: {
+      [Op.or]: [
+        Sequelize.where(Sequelize.literal(subQuery), true),
+      ],
     },
-  }],
-  where: Sequelize.where(Sequelize.col('customFieldValue.model_id'), { [Op.not]: null }),
-});
+    replacements: { searchTerm: `%${searchTerm}%` },
+  };
+};

package/src/utils/init.ts

@@ -84,7 +84,8 @@ export const removeHooks = (models: Models[], getModel: ModelFetcher): void => {
 /**
  *  Necessary associations for the {@link customFieldsFilterScope} scope
  */
-const addAssociations = (model: ModelCtor, modelName: string): void => {
+const addAssociations = (model: ModelCtor, modelName: string, options: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>): void => {
+  if (options?.useCustomFieldsEntries) return;
   model.hasMany(CustomFieldValue, { foreignKey: 'modelId', as: 'customFieldValue' });
   // TBC: maybe can be removed
   CustomFieldValue.belongsTo(model, { foreignKey: 'modelId', as: modelName });
@@ -102,7 +103,7 @@ export const addScopes = (models: Models[], getModel: ModelFetcher, options: Pic
         return;
       }
       // Necessary associations for the filtering scope
-      addAssociations(model, name);
+      addAssociations(model, name, options);
       // Add filter scope
       model.addScope(CUSTOM_FIELDS_FILTER_SCOPE, customFieldsFilterScope(name, options));
       model.addScope(CUSTOM_FIELDS_SORT_SCOPE, customFieldsSortScope(name, options));