@autofleet/sadot 0.7.0-beta.2 → 0.7.0-beta.2.1

package/dist/repository/value.js

@@ -73,8 +73,11 @@ exports.findValuesByModelIds = findValuesByModelIds;
  */
 const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
     const names = Object.keys(valuesToUpdate);
-    logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, {
-        names, options, valuesToUpdate, identifiers,
+    logger_1.default.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
+        names,
+        optionsKeys: options ? Object.keys(options) : null,
+        valuesToUpdate,
+        identifiers,
     });
     const { modelOptions, transaction } = options;
     const where = {
@@ -87,7 +90,7 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
     const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) || [];
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
-        logger_1.default.info(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
+        logger_1.default.warn(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
         const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
         throw new errors_1.MissingDefinitionError(missingDefinitions);
     }

package/dist/scopes/filter.js

@@ -21,6 +21,12 @@ const castIfNeeded = (conditionValue) => {
     return '';
 };
 const AND_DELIMETER = ' AND ';
+const OR_DELIMETER = ' OR ';
+const CD_TABLE_ALIAS = 'cd';
+const CD_NAME_COLUMN = `${CD_TABLE_ALIAS}.name`;
+const CV_TABLE_ALIAS = 'cv';
+const CV_VALUE_COLUMN = `(${CV_TABLE_ALIAS}.value)`;
+const castValueToJsonb = (value) => `to_jsonb(${value}::text)`;
 /**
  * Helper function to build condition strings for the WHERE clause.
  */
@@ -41,7 +47,7 @@ const buildConditionString = (key, condition, replacements) => {
             return `(custom_fields->> :${replacementKey})${castIfNeeded(c.value)} ${c.operator} :${valRep}`;
         }).join(AND_DELIMETER);
     }
-    if (typeof condition === 'string') {
+    if (typeof condition === 'string' || typeof condition === 'number') {
         const conditionRep = replacements[condition];
         return `(custom_fields->> :${replacementKey}) ${castIfNeeded(condition)} = :${conditionRep}`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.0-beta.2",
+  "version": "0.7.0-beta.2.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -62,6 +62,9 @@
   "peerDependencies": {
     "@autofleet/sheilta": ">=1.4.0-beta.2"
   },
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "author": "Autofleet",
   "license": "ISC"
 }

package/src/repository/value.ts

@@ -55,8 +55,11 @@ export const updateValues = async (
   options: FindOptions & { modelOptions?: ModelOptions } = {},
 ): Promise<CustomFieldValue[]> => {
   const names = Object.keys(valuesToUpdate);
-  logger.info(`custom-fields: updating values for ${modelType} ${modelId}`, {
-    names, options, valuesToUpdate, identifiers,
+  logger.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
+    names,
+    optionsKeys: options ? Object.keys(options) : null,
+    valuesToUpdate,
+    identifiers,
   });
   const { modelOptions, transaction } = options;
 
@@ -72,7 +75,7 @@ export const updateValues = async (
 
   const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
   if (fieldDefinitions.length !== names.length) {
-    logger.info(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
+    logger.warn(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
     const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
     throw new MissingDefinitionError(missingDefinitions);
   }

package/src/scopes/filter.ts

@@ -38,6 +38,13 @@ const castIfNeeded = (conditionValue: string): string => {
   return '';
 };
 const AND_DELIMETER = ' AND ';
+const OR_DELIMETER = ' OR ';
+
+const CD_TABLE_ALIAS = 'cd';
+const CD_NAME_COLUMN = `${CD_TABLE_ALIAS}.name`;
+const CV_TABLE_ALIAS = 'cv';
+const CV_VALUE_COLUMN = `(${CV_TABLE_ALIAS}.value)`;
+const castValueToJsonb = (value) => `to_jsonb(${value}::text)`;
 
 /**
  * Helper function to build condition strings for the WHERE clause.
@@ -61,7 +68,7 @@ const buildConditionString = (key: string, condition: ConditionValue | Condition
     }).join(AND_DELIMETER);
   }
 
-  if (typeof condition === 'string') {
+  if (typeof condition === 'string'|| typeof condition === 'number') {
     const conditionRep = replacements[condition];
     return `(custom_fields->> :${replacementKey}) ${castIfNeeded(condition)} = :${conditionRep}`;
   }
@@ -97,11 +104,9 @@ export const customFieldsFilterScope = (
   const conditionsStrings = Object.entries(conditions)
     .map(([key, condition]) => buildConditionString(key, condition, replacements))
     .filter(Boolean) as string[];
-
   if (conditionsStrings.length === 0) {
     return { replacements };
   }
-
   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 '