@autofleet/sadot 0.7.0-beta.2.2 → 0.7.0

package/dist/scopes/filter.d.ts

@@ -17,6 +17,10 @@ export type CustomFieldFilterOptions = {
     where?: WhereOptions;
     replacements?: Record<string, string>;
 };
+type customFieldsFilterScopeParams = {
+    replacementsMap: Record<string, string>;
+    scopeValue: Record<string, ConditionValue>;
+};
 /**
  * A Sequelize scope for filtering models by custom fields.
  * This scope builds a WHERE clause to be applied on the main query.
@@ -24,10 +28,7 @@ export type CustomFieldFilterOptions = {
  * @param name - The model type name used to join custom_field_definitions.
  * @returns A function that takes conditions and returns the Sequelize options object.
  */
-export declare const customFieldsFilterScope: (name: string) => ({ replacementsMap, scopeValue }: {
-    replacementsMap: any;
-    scopeValue: any;
-}) => CustomFieldFilterOptions;
+export declare const customFieldsFilterScope: (name: string) => ({ replacementsMap: replacements, scopeValue: conditions, }: customFieldsFilterScopeParams) => CustomFieldFilterOptions;
 export declare const scopeName = "filterByCustomFields";
 export declare const customFieldsSortScope: (name: string) => ({ replacementsMap, scopeValue: sort }: {
     replacementsMap: any;

package/dist/scopes/filter.js

@@ -28,9 +28,7 @@ const AND_DELIMETER = ' AND ';
  * @param name - The model type name used to join custom_field_definitions.
  * @returns A function that takes conditions and returns the Sequelize options object.
  */
-const customFieldsFilterScope = (name) => ({ replacementsMap, scopeValue }) => {
-    const conditions = scopeValue;
-    const replacements = replacementsMap;
+const customFieldsFilterScope = (name) => ({ replacementsMap: replacements, scopeValue: conditions, }) => {
     if (!conditions || Object.keys(conditions).length === 0) {
         return {};
     }
@@ -54,25 +52,23 @@ const customFieldsFilterScope = (name) => ({ replacementsMap, scopeValue }) => {
             }
             return condition
                 .map((c) => {
-                const valRep = Object.keys(replacements).find((key) => replacements[key] === c.value);
+                const valRep = Object.keys(replacements).find((replacementKey) => replacements[replacementKey] === c.value);
                 return `(custom_fields->> :${replacemetKey} )${castIfNeeded(c.value)} ${c.operator} :${valRep}`;
             }).join(AND_DELIMETER);
         }
-        if (typeof condition === 'string') {
-            const conditionRep = Object.keys(replacements).find((key) => replacements[key] === condition);
+        if (typeof condition === 'string' || typeof condition === 'number') {
+            const conditionRep = Object.keys(replacements).find((replacementKey) => replacements[replacementKey] === condition);
             return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition)} = :${conditionRep}`;
         }
         if (condition?.operator) {
-            const valueRep = Object.keys(replacements).find((key) => replacements[key] === condition.value);
+            const valueRep = Object.keys(replacements).find((replacementKey) => replacements[replacementKey] === condition.value);
             return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition.value)} ${condition.operator} :${valueRep}`;
         }
         return false;
     })
         .filter(Boolean);
     if (conditionsStrings.length === 0) {
-        return {
-            replacements,
-        };
+        return {};
     }
     const customFieldConditions = conditionsStrings.join(AND_DELIMETER);
     const subQuery = `${'SELECT model_id FROM ('
@@ -100,7 +96,6 @@ const customFieldsSortScope = (name) => ({ replacementsMap, scopeValue: sort })
     const randomStr = (0, helpers_1.generateRandomString)();
     const includes = Object.entries(sort).map(([key]) => {
         const replacemetKey = Object.keys(replacementsMap).find((randomString) => replacementsMap[randomString] === key);
-        console.log('sort replacemetKey:', replacemetKey);
         return ([
             sequelize_typescript_1.Sequelize.literal(`(
             SELECT value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.0-beta.2.2",
+  "version": "0.7.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -60,7 +60,7 @@
     "typescript-eslint": "^0.0.1-alpha.0"
   },
   "peerDependencies": {
-    "@autofleet/sheilta": ">=1.4.0-beta.2"
+    "@autofleet/sheilta": ">=1.4.0"
   },
   "engines": {
     "node": ">=16.0.0"

package/src/scopes/filter.ts

@@ -13,25 +13,31 @@ const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
  * More types to be added (TBA).
  */
 type ConditionWithOperator = {
-  operator: string;
-  value: string;
+    operator: string;
+    value: string;
 };
 export type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];
 
 export type CustomFieldSort = {
-  field: string;
-  direction: 'ASC' | 'DESC';
+    field: string;
+    direction: 'ASC' | 'DESC';
 }
 
 export type CustomFieldFilterOptions = {
-  where?: WhereOptions;
-  replacements?: Record<string, string>;
+    where?: WhereOptions;
+    replacements?: Record<string, string>;
+}
+
+type customFieldsFilterScopeParams = {
+    replacementsMap: Record<string, string>;
+    scopeValue: Record<string, ConditionValue>;
 }
 
 const castIfNeeded = (conditionValue: string): string => {
   if (moment.isDate(conditionValue)) {
     return '::timestamp';
-  } if (!Number.isNaN(Number(conditionValue))) {
+  }
+  if (!Number.isNaN(Number(conditionValue))) {
     return '::numeric';
   }
   return '';
@@ -47,9 +53,12 @@ const AND_DELIMETER = ' AND ';
  */
 export const customFieldsFilterScope = (
   name: string,
-) => ({ replacementsMap, scopeValue }): CustomFieldFilterOptions => {
-  const conditions: Record<string, ConditionValue> = scopeValue;
-  const replacements: Record<string, string> = replacementsMap;
+) => (
+  {
+    replacementsMap: replacements,
+    scopeValue: conditions,
+  }: customFieldsFilterScopeParams,
+): CustomFieldFilterOptions => {
   if (!conditions || Object.keys(conditions).length === 0) {
     return {};
   }
@@ -57,7 +66,9 @@ export const customFieldsFilterScope = (
   const conditionsStrings = Object.entries(conditions)
     .map(
       ([key, condition]) => {
-        const replacemetKey = Object.keys(replacements).find((randomString) => replacements[randomString] === key);
+        const replacemetKey = Object.keys(replacements).find(
+          (randomString) => replacements[randomString] === key,
+        );
         if (!replacemetKey) return false;
 
         if (Array.isArray(condition)) {
@@ -67,23 +78,31 @@ export const customFieldsFilterScope = (
           }
           if (typeof condition[0] === 'string') {
             const values = condition.map((v) => {
-              const valRandom = Object.keys(replacements).find((randomString) => replacements[randomString] === v);
+              const valRandom = Object.keys(replacements).find(
+                (randomString) => replacements[randomString] === v,
+              );
               return ` :${valRandom} `;
             }).join(',');
             return `(custom_fields->> :${replacemetKey} ) IN ( ${values} )`;
           }
           return condition
             .map((c) => {
-              const valRep = Object.keys(replacements).find((key) => replacements[key] === c.value);
+              const valRep = Object.keys(replacements).find(
+                (replacementKey) => replacements[replacementKey] === c.value,
+              );
               return `(custom_fields->> :${replacemetKey} )${castIfNeeded(c.value)} ${c.operator} :${valRep}`;
             }).join(AND_DELIMETER);
         }
-        if (typeof condition === 'string') {
-          const conditionRep = Object.keys(replacements).find((key) => replacements[key] === condition);
+        if (typeof condition === 'string' || typeof condition === 'number') {
+          const conditionRep = Object.keys(replacements).find(
+            (replacementKey) => replacements[replacementKey] === condition,
+          );
           return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition)} = :${conditionRep}`;
         }
         if (condition?.operator) {
-          const valueRep = Object.keys(replacements).find((key) => replacements[key] === condition.value);
+          const valueRep = Object.keys(replacements).find(
+            (replacementKey) => replacements[replacementKey] === condition.value,
+          );
           return `(custom_fields->> :${replacemetKey} ) ${castIfNeeded(condition.value)} ${condition.operator} :${valueRep}`;
         }
         return false;
@@ -91,18 +110,16 @@ export const customFieldsFilterScope = (
     )
     .filter(Boolean);
   if (conditionsStrings.length === 0) {
-    return {
-      replacements,
-    };
+    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 '
-  + '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 = '${name}'`
-  + 'GROUP BY cv.model_id'
-  + ') AS CustomFieldAggregation WHERE '} ${customFieldConditions}`;
+    + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '
+    + '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 = '${name}'`
+    + 'GROUP BY cv.model_id'
+    + ') AS CustomFieldAggregation WHERE '} ${customFieldConditions}`;
   return {
     where: {
       id: {
@@ -123,8 +140,9 @@ export const customFieldsSortScope = (
   }
   const randomStr = generateRandomString();
   const includes = Object.entries(sort).map(([key]) => {
-    const replacemetKey = Object.keys(replacementsMap).find((randomString) => replacementsMap[randomString] === key);
-    console.log('sort replacemetKey:', replacemetKey);
+    const replacemetKey = Object.keys(replacementsMap).find(
+      (randomString) => replacementsMap[randomString] === key,
+    );
     return ([
       Sequelize.literal(`(
             SELECT value