@autofleet/sadot 0.13.1 → 0.13.2-beta.1

package/dist/hooks/hooks.js

@@ -36,6 +36,7 @@ const DefinitionRepo = __importStar(require("../repository/definition"));
 const errors_2 = require("../errors");
 const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 const updateInstanceValues_1 = __importDefault(require("./utils/updateInstanceValues"));
+const constants_1 = require("../utils/constants");
 // Initialize Ajv with relaxed settings to avoid warnings
 const ajv = new ajv_1.default({
     allErrors: true,
@@ -195,16 +196,8 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
         }
     }
 };
-/**
- * Hook to handle validation and custom fields during creation
- */
-const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCustomFieldsEntries: false }) => async (instance, options) => {
-    logger_1.default.debug('sadot - before create hook');
-    const { fields } = options;
+const getFieldDefinitions = async ({ modelType, modelOptions, identifiers, options }) => {
     const { include, useEntityIdFromInclude } = modelOptions;
-    const modelType = instance.constructor.name;
-    const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
-    // Step 1: Handle custom fields default values and required fields
     const where = {
         modelType,
         disabled: false,
@@ -215,7 +208,32 @@ const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
         transaction: options.transaction,
         include: include?.(identifiers),
     });
-    const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
+    return fieldDefinitions;
+};
+const formatDates = (fieldDefinitions = [], instance) => {
+    fieldDefinitions.forEach((fieldDefinition) => {
+        const { fieldType, name } = fieldDefinition;
+        if ([constants_1.CustomFieldDefinitionType.DATE, constants_1.CustomFieldDefinitionType.DATETIME].includes(fieldType)) {
+            const value = instance.customFields?.[name];
+            if (value) {
+                // eslint-disable-next-line no-param-reassign
+                instance.customFields[name] = new Date(value).toISOString();
+            }
+        }
+    });
+};
+/**
+ * Hook to handle validation and custom fields during creation
+ */
+const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCustomFieldsEntries: false }) => async (instance, options) => {
+    logger_1.default.debug('sadot - before create hook');
+    const { fields } = options;
+    const modelType = instance.constructor.name;
+    const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
+    // Step 1: Handle custom fields default values and required fields
+    const fieldDefinitions = await getFieldDefinitions({
+        modelType, modelOptions, identifiers, options
+    });
     // Apply default values
     const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
     if (fieldsWithDefaultValue.length) {
@@ -229,6 +247,7 @@ const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
         });
     }
     // 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));
@@ -237,6 +256,8 @@ const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
     }
     // Step 2: Validate the model data (including custom fields)
     await validateModel(instance, options, scopeAttributes, true);
+    // 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) {
@@ -268,8 +289,13 @@ const beforeUpdate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
     const { fields } = options;
     const modelType = instance.constructor.name;
     const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
+    const fieldDefinitions = await getFieldDefinitions({
+        modelType, modelOptions, identifiers, options
+    });
     // Step 1: Validate the model data (including custom fields)
     await validateModel(instance, options, scopeAttributes, false);
+    // 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.13.1",
+  "version": "0.13.2-beta.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -8,6 +8,7 @@
     "build": "rm -rf dist && tsc",
     "linter": "eslint .",
     "test": "jest --runInBand",
+    "test-debug": "node --inspect-brk node_modules/.bin/jest --testTimeout=10000000",
     "coverage": "jest --coverage --runInBand",
     "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
     "dev": "nodemon",

package/src/hooks/hooks.ts

@@ -1,14 +1,17 @@
 import type { WhereOptions } from 'sequelize';
 import Ajv from 'ajv';
+import Joi from 'joi';
 import addFormats from 'ajv-formats';
 import { BadRequest } from '@autofleet/errors';
 import logger from '../utils/logger';
 import * as ValidatorRepo from '../repository/validator';
 import * as DefinitionRepo from '../repository/definition';
-import { MissingRequiredCustomFieldError } from '../errors';
+import { InvalidValueError, MissingRequiredCustomFieldError } from '../errors';
 import type { CustomFieldOptions, ModelOptions } from '../types';
 import applyScopeToInstance from '../utils/scopeAttributes';
 import updateInstanceValues from './utils/updateInstanceValues';
+import { CustomFieldDefinitionType } from '../utils/constants';
+import type { CustomFieldDefinition } from '../models';
 
 // Initialize Ajv with relaxed settings to avoid warnings
 const ajv = new Ajv({
@@ -218,25 +221,18 @@ const validateModel = async (
   }
 };
 
-/**
- * Hook to handle validation and custom fields during creation
- */
-export const beforeCreate = (
-  scopeAttributes: string[],
-  modelOptions: ModelOptions = {},
-  sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'> = { useCustomFieldsEntries: false },
-) => async (
-  instance,
+const getFieldDefinitions = async ({
+  modelType,
+  modelOptions,
+  identifiers,
   options,
-): Promise<void> => {
-  logger.debug('sadot - before create hook');
-  const { fields } = options;
+}: {
+  modelType: any,
+  modelOptions: ModelOptions,
+  identifiers: any[],
+  options: any
+}) => {
   const { include, useEntityIdFromInclude } = modelOptions;
-  const modelType = instance.constructor.name;
-
-  const identifiers = applyScopeToInstance(instance, scopeAttributes);
-
-  // Step 1: Handle custom fields default values and required fields
   const where: WhereOptions = {
     modelType,
     disabled: false,
@@ -248,64 +244,33 @@ export const beforeCreate = (
     transaction: options.transaction,
     include: include?.(identifiers),
   });
+  return fieldDefinitions;
+};
 
-  const requiredFieldsNames = Array.from(
-    new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)),
-  );
-
-  // 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 }) => {
+const formatDates = (fieldDefinitions: CustomFieldDefinition[], instance: any) => {
+  (fieldDefinitions || []).forEach((fieldDefinition) => {
+    const { fieldType, name } = fieldDefinition;
+    if ([CustomFieldDefinitionType.DATE, CustomFieldDefinitionType.DATETIME].includes(fieldType)) {
+      const value = instance.customFields?.[name];
+      if (value) {
+        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] = defaultValue;
-      });
-  }
-
-  // Check for required fields
-  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 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,
-    },
+        const typeofjoi = typeof joiValue;
+        logger.info('sadot - formatting date', { name, value, joiValue, type: typeof joiValue });
+        instance.customFields[name] = joiValue.toISOString();
+        new Date().toString
+      }
+    }
   });
-
-  // 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
+ * Hook to handle validation and custom fields during creation
  */
-export const beforeUpdate = (
+export const beforeCreate = (
   scopeAttributes: string[],
   modelOptions: ModelOptions = {},
   sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'> = { useCustomFieldsEntries: false },
@@ -313,20 +278,52 @@ 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 create hook');
+    const { fields } = options;
+    const modelType = instance.constructor.name;
+
+    const identifiers = applyScopeToInstance(instance, scopeAttributes);
+
+    // Step 1: Handle custom fields default values and required fields
+
+    const fieldDefinitions = await getFieldDefinitions({
+      modelType, modelOptions, identifiers, options,
+    });
 
-  // Step 1: Validate the model data (including custom fields)
-  await validateModel(instance, options, scopeAttributes, false);
+    // 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;
+        });
+    }
 
-  // Step 2: Update custom field values if they exist
-  const customFieldsIdx = fields.indexOf('customFields');
-  if (customFieldsIdx > -1) {
+    // 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);
+
+    // format date and datetime fields
+    formatDates(fieldDefinitions, instance);
 
-    if (!Object.keys(customFields).length) {
+    // 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;
     }
 
@@ -346,8 +343,61 @@ export const beforeUpdate = (
     // 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
+ */
+export const beforeUpdate = (
+  scopeAttributes: string[],
+  modelOptions: ModelOptions = {},
+  sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'> = { useCustomFieldsEntries: false },
+) => async (
+  instance,
+  options,
+): Promise<void> => {
+    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,
+    });
+
+    // Step 1: Validate the model data (including custom fields)
+    await validateModel(instance, options, scopeAttributes, false);
+
+    // 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;
+
+      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,
+        },
+      });
+
+      // 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,