@autofleet/sadot 0.13.2-beta.6 → 0.13.2

package/dist/hooks/hooks.js

@@ -222,10 +222,7 @@ const formatDates = (fieldDefinitions, instance) => {
                     throw new errors_2.InvalidValueError(value, name, validationError);
                 }
                 // eslint-disable-next-line no-param-reassign
-                const typeofjoi = typeof joiValue;
-                logger_1.default.info('sadot - formatting date', { name, value, joiValue, type: typeof joiValue });
                 instance.customFields[name] = joiValue.toISOString();
-                new Date().toString;
             }
         }
     });

package/dist/index.js

@@ -54,10 +54,7 @@ const useCustomFields = async (app, getModel, options) => {
     }
     // The order is important
     (0, init_1.addHooks)(models, getModel, { useCustomFieldsEntries });
-    await (0, models_1.initTables)(sequelize, options.getUser, { useCustomFieldsEntries }).catch((e) => {
-        logger_1.default.error('sadot - error while initializing custom fields tables', e);
-        throw e;
-    });
+    await (0, models_1.initTables)(sequelize, options.getUser, { useCustomFieldsEntries });
     (0, init_1.addScopes)(models, getModel, { useCustomFieldsEntries });
     (0, init_1.applyCustomAssociation)(models);
     logger_1.default.debug('sadot - custom fields finished initializing with models', models);

package/dist/models/index.js

@@ -27,11 +27,7 @@ const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.de
 const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextTestModel_1.default];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = '49c9dd1d-b1cc-445b-a911-fd349d783110';
-const initTables = async (sequelize, getUser, { schemaPrefix, schemaVersion, useCustomFieldsEntries, } = {
-    schemaPrefix: SADOT_MIGRATION_PREFIX,
-    schemaVersion: SCHEMA_VERSION,
-    useCustomFieldsEntries: false,
-}) => {
+const initTables = async (sequelize, getUser, { schemaPrefix = SADOT_MIGRATION_PREFIX, schemaVersion = SCHEMA_VERSION, useCustomFieldsEntries = false, } = {}) => {
     const CUSTOM_FIELDS_SCHEMA_VERSION = `${schemaPrefix}_${schemaVersion}${useCustomFieldsEntries ? '_withEntries' : ''}`;
     logger_1.default.info('custom-fields: initialize custom-fields tables');
     // Detect models and import them to the orm

package/package.json

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

package/src/hooks/hooks.ts

@@ -258,10 +258,7 @@ const formatDates = (fieldDefinitions: CustomFieldDefinition[], instance: any) =
           throw new InvalidValueError(value, name, validationError);
         }
         // eslint-disable-next-line no-param-reassign
-        const typeofjoi = typeof joiValue;
-        logger.info('sadot - formatting date', { name, value, joiValue, type: typeof joiValue });
         instance.customFields[name] = joiValue.toISOString();
-        new Date().toString
       }
     }
   });
@@ -278,72 +275,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
@@ -356,48 +353,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/index.ts

@@ -37,10 +37,7 @@ const useCustomFields = async (
   }
   // The order is important
   addHooks(models, getModel, { useCustomFieldsEntries });
-  await initTables(sequelize, options.getUser, { useCustomFieldsEntries }).catch((e) => {
-    logger.error('sadot - error while initializing custom fields tables', e);
-    throw e;
-  });
+  await initTables(sequelize, options.getUser, { useCustomFieldsEntries });
   addScopes(models, getModel, { useCustomFieldsEntries });
   applyCustomAssociation(models);
 

package/src/models/index.ts

@@ -32,7 +32,7 @@ const initTables = async (
     schemaPrefix = SADOT_MIGRATION_PREFIX,
     schemaVersion = SCHEMA_VERSION,
     useCustomFieldsEntries = false,
-  }: InitTablesOptions,
+  }: InitTablesOptions = {},
 ): Promise<void> => {
   const CUSTOM_FIELDS_SCHEMA_VERSION = `${schemaPrefix}_${schemaVersion}${useCustomFieldsEntries ? '_withEntries' : ''}`;
   logger.info('custom-fields: initialize custom-fields tables');

package/dist/models/test.js

@@ -1,9 +0,0 @@
-const SADOT_MIGRATION_PREFIX = 'sadot-migration';
-const SCHEMA_VERSION = '49c9dd1d-b1cc-445b-a911-fd349d783110';
-const initTables = async ({ schemaPrefix = SADOT_MIGRATION_PREFIX, schemaVersion = SCHEMA_VERSION, useCustomFieldsEntries = false }) => {
-    console.log('custom-fields: initialize custom-fields tables', {
-        schemaPrefix, schemaVersion, useCustomFieldsEntries,
-    });
-}
-
-initTables({useCustomFieldsEntries: true});