@autofleet/sadot 0.7.3 → 0.7.4-beta-5d31a6b9.0

package/.env

@@ -0,0 +1,3 @@
+DB_USERNAME=emiltayeb
+DB_PASSWORD=123456
+NODE_ENV=test

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

@@ -23,4 +23,5 @@ interface CustomFieldsSearchPayload {
 }
 export declare const generateRandomString: (length?: number) => string;
 export declare const generateCustomFieldSearchQueryPayload: (searchTerm: string, model: ModelStatic, entityId: string, customFieldsTypesToExclude?: CustomFieldDefinitionType[]) => CustomFieldsSearchPayload;
+export declare const excludeCustomFieldFilterScope: (modelType: string, keyToExclude: string, valuesToExclude: string | string[]) => Omit<CustomFieldsSearchPayload, 'replacements'>;
 export {};

package/dist/utils/helpers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCustomFieldSearchQueryPayload = exports.generateRandomString = void 0;
+exports.excludeCustomFieldFilterScope = exports.generateCustomFieldSearchQueryPayload = exports.generateRandomString = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
@@ -38,3 +38,29 @@ const generateCustomFieldSearchQueryPayload = (searchTerm, model, entityId, cust
     };
 };
 exports.generateCustomFieldSearchQueryPayload = generateCustomFieldSearchQueryPayload;
+const excludeCustomFieldFilterScope = (modelType, keyToExclude, valuesToExclude) => {
+    const keyToIgnore = keyToExclude.split('.')[1];
+    const valsToIgnore = Array.isArray(valuesToExclude) ? valuesToExclude.map((v) => `'"${v}"'`).join(', ') : null;
+    const customFieldsQuery = valsToIgnore ? `AND cv.value IN (${valsToIgnore})` : '';
+    const existsCondition = `
+      EXISTS (
+        SELECT 1
+        FROM custom_field_values cv
+        INNER JOIN custom_field_definitions cd 
+          ON cv.custom_field_definition_id = cd.id 
+        WHERE 
+          cv.model_id = "${modelType}"."id" 
+          AND cd.model_type = '${modelType}'
+          AND cd.name = '${keyToIgnore}' 
+         ${customFieldsQuery}
+      )
+  `;
+    return {
+        where: {
+            [sequelize_1.Op.and]: [
+                sequelize_typescript_1.Sequelize.literal(existsCondition),
+            ],
+        },
+    };
+};
+exports.excludeCustomFieldFilterScope = excludeCustomFieldFilterScope;

package/package.json

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

package/src/scopes/filter.ts

@@ -112,6 +112,7 @@ export const customFieldsFilterScope = (
   if (conditionsStrings.length === 0) {
     return {};
   }
+
   const customFieldConditions = conditionsStrings.join(AND_DELIMETER);
   const subQuery = `${'SELECT model_id FROM ('
     + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '

package/src/utils/helpers/index.ts

@@ -1,5 +1,7 @@
 /* eslint-disable import/prefer-default-export */
-import { type WhereOptions, Op, type BindOrReplacements } 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';
@@ -64,3 +66,34 @@ export const generateCustomFieldSearchQueryPayload = (
     replacements: { searchTerm: `%${searchTerm}%` },
   };
 };
+
+export const excludeCustomFieldFilterScope = (
+  modelType: string,
+  keyToExclude: string,
+  valuesToExclude: string | string[],
+): Omit<CustomFieldsSearchPayload, 'replacements'> => {
+  const keyToIgnore = keyToExclude.split('.')[1];
+  const valsToIgnore = Array.isArray(valuesToExclude) ? valuesToExclude.map((v) => `'"${v}"'`).join(', ') : null;
+  const customFieldsQuery = valsToIgnore ? `AND cv.value IN (${valsToIgnore})` : '';
+  const existsCondition = `
+      EXISTS (
+        SELECT 1
+        FROM custom_field_values cv
+        INNER JOIN custom_field_definitions cd 
+          ON cv.custom_field_definition_id = cd.id 
+        WHERE 
+          cv.model_id = "${modelType}"."id" 
+          AND cd.model_type = '${modelType}'
+          AND cd.name = '${keyToIgnore}' 
+         ${customFieldsQuery}
+      )
+  `;
+
+  return {
+    where: {
+      [Op.and]: [
+        Sequelize.literal(existsCondition),
+      ],
+    },
+  };
+};