@autofleet/sadot 0.6.3 → 0.6.4

package/dist/scopes/filter.d.ts

@@ -4,7 +4,11 @@ import { WhereOptions } from 'sequelize';
  * Currently supporting strings and arrays of strings.
  * More types to be added (TBA).
  */
-export type ConditionValue = string | string[];
+type ConditionWithOperator = {
+    operator: string;
+    value: string;
+};
+export type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];
 export type CustomFieldSort = {
     field: string;
     direction: 'ASC' | 'DESC';
@@ -30,3 +34,4 @@ export declare const customFieldsSortScope: (name: string) => (sort: CustomField
     };
     order: import("sequelize/types/utils").Literal[];
 };
+export {};

package/dist/scopes/filter.js

@@ -6,6 +6,13 @@ const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const common_types_1 = require("@autofleet/common-types");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+const castIfNeeded = (conditionValue) => {
+    if (!Number.isNaN(Date.parse(conditionValue))) {
+        return '::timestamp';
+    }
+    return '';
+};
+const AND_DELIMETER = ' AND ';
 /**
  * A Sequelize scope for filtering models by custom fields.
  * This scope builds a WHERE clause to be applied on the main query.
@@ -19,30 +26,39 @@ const customFieldsFilterScope = (name) => (conditions) => {
     }
     // Build the WHERE clause for custom field filtering
     const conditionsStrings = Object.entries(conditions)
-        .map(([key, value]) => {
-        if (Array.isArray(value)) {
-            if (value.length === 0) {
+        .map(([key, condition]) => {
+        if (Array.isArray(condition)) {
+            if (condition.length === 0) {
                 // if empty array, the condition is ignored
                 return false;
             }
-            const values = value.map((v) => `'${v}'`).join(',');
-            return `custom_fields->>'${key}' IN (${values})`;
+            if (typeof condition[0] === 'string') {
+                const values = condition.map((v) => `'${v}'`).join(',');
+                return `(custom_fields->>'${key}') IN (${values})`;
+            }
+            return condition
+                .map((c) => `(custom_fields->>'${key}')${castIfNeeded(c.value)} ${c.operator} '${c.value}'`).join(AND_DELIMETER);
+        }
+        if (typeof condition === 'string') {
+            return `(custom_fields->>'${key}')${castIfNeeded(condition)} = '${condition}'`;
+        }
+        if (condition?.operator) {
+            return `(custom_fields->>'${key}')${castIfNeeded(condition.value)} ${condition.operator} '${condition.value}'`;
         }
-        return `custom_fields->>'${key}' = '${value}'`;
+        return false;
     })
         .filter(Boolean);
     if (conditionsStrings.length === 0) {
         return {};
     }
-    const customFieldConditions = conditionsStrings.join(' AND ');
+    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}`;
+        + ') AS CustomFieldAggregation WHERE '}${customFieldConditions}`;
     return {
         where: {
             id: {

package/package.json

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

package/src/scopes/filter.ts

@@ -10,7 +10,11 @@ const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
  * Currently supporting strings and arrays of strings.
  * More types to be added (TBA).
  */
-export type ConditionValue = string | string[];
+type ConditionWithOperator = {
+    operator: string;
+    value: string;
+};
+export type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];
 
 export type CustomFieldSort = {
     field: string;
@@ -21,6 +25,13 @@ export type CustomFieldFilterOptions = {
   where?: WhereOptions;
 }
 
+const castIfNeeded = (conditionValue: string): string => {
+  if (!Number.isNaN(Date.parse(conditionValue))) {
+    return '::timestamp';
+  }
+  return '';
+};
+const AND_DELIMETER = ' AND ';
 /**
  * A Sequelize scope for filtering models by custom fields.
  * This scope builds a WHERE clause to be applied on the main query.
@@ -37,24 +48,33 @@ export const customFieldsFilterScope = (
   // Build the WHERE clause for custom field filtering
   const conditionsStrings = Object.entries(conditions)
     .map(
-      ([key, value]) => {
-        if (Array.isArray(value)) {
-          if (value.length === 0) {
+      ([key, condition]) => {
+        if (Array.isArray(condition)) {
+          if (condition.length === 0) {
             // if empty array, the condition is ignored
             return false;
           }
-          const values = value.map((v) => `'${v}'`).join(',');
-          return `custom_fields->>'${key}' IN (${values})`;
+          if (typeof condition[0] === 'string') {
+            const values = condition.map((v) => `'${v}'`).join(',');
+            return `(custom_fields->>'${key}') IN (${values})`;
+          }
+          return condition
+            .map((c) => `(custom_fields->>'${key}')${castIfNeeded(c.value)} ${c.operator} '${c.value}'`).join(AND_DELIMETER);
         }
-        return `custom_fields->>'${key}' = '${value}'`;
+        if (typeof condition === 'string') {
+          return `(custom_fields->>'${key}')${castIfNeeded(condition)} = '${condition}'`;
+        }
+        if (condition?.operator) {
+          return `(custom_fields->>'${key}')${castIfNeeded(condition.value)} ${condition.operator} '${condition.value}'`;
+        }
+        return false;
       },
     )
     .filter(Boolean);
-
   if (conditionsStrings.length === 0) {
     return {};
   }
-  const customFieldConditions = conditionsStrings.join(' AND ');
+  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 '
@@ -62,8 +82,7 @@ export const customFieldsFilterScope = (
     + '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}`;
+    + ') AS CustomFieldAggregation WHERE '}${customFieldConditions}`;
 
   return {
     where: {