@autofleet/sadot 0.13.2-beta.0 → 0.13.2-beta.1

package/package.json

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

package/src/hooks/hooks.ts

@@ -253,12 +253,15 @@ const formatDates = (fieldDefinitions: CustomFieldDefinition[], instance: any) =
     if ([CustomFieldDefinitionType.DATE, CustomFieldDefinitionType.DATETIME].includes(fieldType)) {
       const value = instance.customFields?.[name];
       if (value) {
-        const validationError = Joi.date().validate(value).error;
+        const { value: joiValue, error: validationError } = Joi.date().validate(value);
         if (validationError) {
           throw new InvalidValueError(value, name, validationError);
         }
         // eslint-disable-next-line no-param-reassign
-        instance.customFields[name] = new Date(value).toISOString();
+        const typeofjoi = typeof joiValue;
+        logger.info('sadot - formatting date', { name, value, joiValue, type: typeof joiValue });
+        instance.customFields[name] = joiValue.toISOString();
+        new Date().toString
       }
     }
   });
@@ -275,72 +278,72 @@ export const beforeCreate = (
   instance,
   options,
 ): Promise<void> => {
-  logger.debug('sadot - before create hook');
-  const { fields } = options;
-  const modelType = instance.constructor.name;
+    logger.debug('sadot - before create hook');
+    const { fields } = options;
+    const modelType = instance.constructor.name;
 
-  const identifiers = applyScopeToInstance(instance, scopeAttributes);
+    const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
-  // Step 1: Handle custom fields default values and required fields
+    // Step 1: Handle custom fields default values and required fields
 
-  const fieldDefinitions = await getFieldDefinitions({
-    modelType, modelOptions, identifiers, options,
-  });
+    const fieldDefinitions = await getFieldDefinitions({
+      modelType, modelOptions, identifiers, options,
+    });
 
-  // Apply default values
-  const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
-  if (fieldsWithDefaultValue.length) {
-    // eslint-disable-next-line no-param-reassign
-    instance.customFields ||= {};
-    fieldsWithDefaultValue
-      .filter((def) => (instance.customFields?.[def.name] === undefined))
-      .forEach(({ name, defaultValue }) => {
-        // eslint-disable-next-line no-param-reassign
-        instance.customFields[name] = defaultValue;
-      });
-  }
+    // Apply default values
+    const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
+    if (fieldsWithDefaultValue.length) {
+      // eslint-disable-next-line no-param-reassign
+      instance.customFields ||= {};
+      fieldsWithDefaultValue
+        .filter((def) => (instance.customFields?.[def.name] === undefined))
+        .forEach(({ name, defaultValue }) => {
+          // eslint-disable-next-line no-param-reassign
+          instance.customFields[name] = defaultValue;
+        });
+    }
 
-  // Check for required fields
-  const requiredFieldsNames = Array.from(
-    new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)),
-  );
-  const { customFields } = instance;
-  const fieldsNames = Object.keys(customFields ?? {});
-  const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-  if (missingFields?.length) {
-    throw new MissingRequiredCustomFieldError(missingFields);
-  }
+    // Check for required fields
+    const requiredFieldsNames = Array.from(
+      new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)),
+    );
+    const { customFields } = instance;
+    const fieldsNames = Object.keys(customFields ?? {});
+    const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
+    if (missingFields?.length) {
+      throw new MissingRequiredCustomFieldError(missingFields);
+    }
 
-  // Step 2: Validate the model data (including custom fields)
-  await validateModel(instance, options, scopeAttributes, true);
+    // Step 2: Validate the model data (including custom fields)
+    await validateModel(instance, options, scopeAttributes, true);
 
-  // format date and datetime fields
-  formatDates(fieldDefinitions, instance);
+    // format date and datetime fields
+    formatDates(fieldDefinitions, instance);
 
-  // Step 3: Save custom field values if they exist
-  const customFieldsIdx = fields.indexOf('customFields');
-  if (customFieldsIdx === -1 || !customFields || !Object.keys(customFields).length) {
-    // No custom fields to update
-    return;
-  }
+    // Step 3: Save custom field values if they exist
+    const customFieldsIdx = fields.indexOf('customFields');
+    if (customFieldsIdx === -1 || !customFields || !Object.keys(customFields).length) {
+      // No custom fields to update
+      return;
+    }
 
-  // Save custom field values
-  await updateInstanceValues({
-    modelId: instance.id,
-    modelType,
-    identifiers,
-    customFields,
-    options: {
-      useCustomFieldsEntries: sadotOptions.useCustomFieldsEntries,
-      transaction: options.transaction,
-      modelOptions,
-    },
-  });
+    // Save custom field values
+    await updateInstanceValues({
+      modelId: instance.id,
+      modelType,
+      identifiers,
+      customFields,
+      options: {
+        useCustomFieldsEntries: sadotOptions.useCustomFieldsEntries,
+        transaction: options.transaction,
+        modelOptions,
+      },
+    });
 
-  // Remove customFields from fields array after handling
-  // eslint-disable-next-line no-param-reassign
-  fields.splice(customFieldsIdx, 1);
-};
+    // Remove customFields from fields array after handling
+    // eslint-disable-next-line no-param-reassign
+    fields.splice(customFieldsIdx, 1);
+  };
 
 /**
  * Hook to handle validation and custom fields during update
@@ -353,48 +356,48 @@ export const beforeUpdate = (
   instance,
   options,
 ): Promise<void> => {
-  logger.debug('sadot - before update hook');
-  const { fields } = options;
-  const modelType = instance.constructor.name;
-  const identifiers = applyScopeToInstance(instance, scopeAttributes);
+    logger.debug('sadot - before update hook');
+    const { fields } = options;
+    const modelType = instance.constructor.name;
+    const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
-  const fieldDefinitions = await getFieldDefinitions({
-    modelType, modelOptions, identifiers, options,
-  });
+    const fieldDefinitions = await getFieldDefinitions({
+      modelType, modelOptions, identifiers, options,
+    });
 
-  // Step 1: Validate the model data (including custom fields)
-  await validateModel(instance, options, scopeAttributes, false);
+    // Step 1: Validate the model data (including custom fields)
+    await validateModel(instance, options, scopeAttributes, false);
 
-  // format date and datetime fields
-  formatDates(fieldDefinitions, instance);
+    // format date and datetime fields
+    formatDates(fieldDefinitions, instance);
 
-  // Step 2: Update custom field values if they exist
-  const customFieldsIdx = fields.indexOf('customFields');
-  if (customFieldsIdx > -1) {
-    const { customFields } = instance;
+    // Step 2: Update custom field values if they exist
+    const customFieldsIdx = fields.indexOf('customFields');
+    if (customFieldsIdx > -1) {
+      const { customFields } = instance;
 
-    if (!Object.keys(customFields).length) {
-      return;
-    }
+      if (!Object.keys(customFields).length) {
+        return;
+      }
 
-    // Save custom field values
-    await updateInstanceValues({
-      modelId: instance.id,
-      modelType,
-      identifiers,
-      customFields,
-      options: {
-        useCustomFieldsEntries: sadotOptions.useCustomFieldsEntries,
-        transaction: options.transaction,
-        modelOptions,
-      },
-    });
+      // Save custom field values
+      await updateInstanceValues({
+        modelId: instance.id,
+        modelType,
+        identifiers,
+        customFields,
+        options: {
+          useCustomFieldsEntries: sadotOptions.useCustomFieldsEntries,
+          transaction: options.transaction,
+          modelOptions,
+        },
+      });
 
-    // Remove customFields from fields array after handling
-    // eslint-disable-next-line no-param-reassign
-    fields.splice(customFieldsIdx, 1);
-  }
-};
+      // Remove customFields from fields array after handling
+      // eslint-disable-next-line no-param-reassign
+      fields.splice(customFieldsIdx, 1);
+    }
+  };
 
 /**
  * Hook to enable individual hooks for bulk create operations

package/src/models/index.ts

@@ -23,7 +23,7 @@ const productionModels: ProductionModel[] = [CustomFieldDefinition, CustomFieldV
 const testModels = [TestModel, AssociatedTestModel, ContextAwareTestModel, ContextTestModel];
 
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
-const SCHEMA_VERSION = 'fb0fa867-1241-4816-b08d-5ed9060c7ae5';
+const SCHEMA_VERSION = '49c9dd1d-b1cc-445b-a911-fd349d783110';
 
 const initTables = async (
   sequelize: Sequelize,