@autofleet/sadot 0.7.0 → 0.7.2

package/dist/repository/value.js

@@ -31,6 +31,7 @@ const models_1 = require("../models");
 const DefinitionRepo = __importStar(require("./definition"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const errors_1 = require("../errors");
+const constants_1 = require("../utils/constants");
 const findByModelIdAndDefinition = async (modelId, customFieldDefinitionId) => models_1.CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [models_1.CustomFieldDefinition] });
 exports.findByModelIdAndDefinition = findByModelIdAndDefinition;
 const create = async (data, withAssociations = false) => {
@@ -66,6 +67,18 @@ const findValuesByModelIds = async (modelIds, options) => {
     });
 };
 exports.findValuesByModelIds = findValuesByModelIds;
+const formatFunctions = {
+    [constants_1.CustomFieldDefinitionType.DATE]: (value) => {
+        if (value) {
+            const date = new Date(value);
+            if (date.toString() === 'Invalid Date') {
+                throw new Error(`Invalid date value: ${value}`);
+            }
+            return date.toISOString();
+        }
+        return null;
+    },
+};
 /**
  * Try to update custom field values for a model instance.
  * Create new value record if not exists, but fails if value's definition not exist.
@@ -99,12 +112,16 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
     if (valuesWithDisabledDefinitions?.length > 0) {
         logger_1.default.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
     }
-    const values = names.map((name) => ({
-        modelId,
-        value: valuesToUpdate[name],
-        updatedAt: new Date(),
-        customFieldDefinitionId: fieldDefinitions.find((def) => def.name === name).id,
-    }));
+    const values = names.map((name) => {
+        const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
+        const formatFunction = formatFunctions[fieldDefinition.fieldType];
+        return {
+            modelId,
+            value: formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name],
+            updatedAt: new Date(),
+            customFieldDefinitionId: fieldDefinition.id,
+        };
+    });
     return Promise.all(values.map(async (value) => {
         const [cfv] = await models_1.CustomFieldValue.upsert(value, {
             transaction: options.transaction,

package/dist/scopes/filter.js

@@ -110,7 +110,10 @@ const customFieldsSortScope = (name) => ({ replacementsMap, scopeValue: sort })
           `), randomStr,
         ]);
     });
-    const orders = Object.entries(sort).map(([, value]) => sequelize_typescript_1.Sequelize.literal(`"${randomStr}" ${value}`));
+    const orders = Object.entries(sort).map(([, sortObject]) => {
+        const direction = typeof sortObject === 'string' ? sortObject : Object.values(sortObject)[0];
+        return sequelize_typescript_1.Sequelize.literal(`"${randomStr}" ${direction || 'ASC'}`);
+    });
     return {
         attributes: {
             include: includes,

package/package.json

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

package/src/repository/value.ts

@@ -6,6 +6,7 @@ import type { CreateCustomFieldValue, ValuesToUpdate } from '../types/value';
 import logger from '../utils/logger';
 import { MissingDefinitionError } from '../errors';
 import type { ModelOptions } from '../types';
+import { CustomFieldDefinitionType } from '../utils/constants';
 
 export const findByModelIdAndDefinition = async (modelId: string, customFieldDefinitionId: string) =>
   CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [CustomFieldDefinition] });
@@ -42,6 +43,19 @@ export const findValuesByModelIds = async (modelIds: string[], options?): Promis
   });
 };
 
+const formatFunctions = {
+  [CustomFieldDefinitionType.DATE]: (value) => {
+    if (value) {
+      const date = new Date(value);
+      if (date.toString() === 'Invalid Date') {
+        throw new Error(`Invalid date value: ${value}`);
+      }
+      return date.toISOString();
+    }
+    return null;
+  },
+};
+
 /**
  * Try to update custom field values for a model instance.
  * Create new value record if not exists, but fails if value's definition not exist.
@@ -86,12 +100,16 @@ export const updateValues = async (
     logger.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
   }
 
-  const values: CreateCustomFieldValue[] = names.map((name) => ({
-    modelId,
-    value: valuesToUpdate[name],
-    updatedAt: new Date(),
-    customFieldDefinitionId: fieldDefinitions.find((def) => def.name === name).id,
-  }));
+  const values: CreateCustomFieldValue[] = names.map((name) => {
+    const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
+    const formatFunction = formatFunctions[fieldDefinition.fieldType];
+    return {
+      modelId,
+      value: formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name],
+      updatedAt: new Date(),
+      customFieldDefinitionId: fieldDefinition.id,
+    };
+  });
 
   return Promise.all(values.map(async (value) => {
     const [cfv] = await CustomFieldValue.upsert(value, {

package/src/scopes/filter.ts

@@ -158,7 +158,10 @@ export const customFieldsSortScope = (
     ]);
   });
 
-  const orders = Object.entries(sort).map(([, value]) => Sequelize.literal(`"${randomStr}" ${value}`));
+  const orders = Object.entries(sort).map(([, sortObject]) => {
+    const direction = typeof sortObject === 'string' ? sortObject : Object.values(sortObject)[0];
+    return Sequelize.literal(`"${randomStr}" ${direction || 'ASC'}`);
+  });
   return {
     attributes: {
       include: includes,