@autofleet/sadot 0.13.2-beta.3 → 0.13.2-beta.5

package/dist/hooks/hooks.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeBulkUpdate = exports.beforeBulkCreate = exports.beforeUpdate = exports.beforeCreate = void 0;
 const ajv_1 = __importDefault(require("ajv"));
+const joi_1 = __importDefault(require("joi"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
 const errors_1 = require("@autofleet/errors");
 const logger_1 = __importDefault(require("../utils/logger"));
@@ -196,7 +197,7 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
         }
     }
 };
-const getFieldDefinitions = async ({ modelType, modelOptions, identifiers, options }) => {
+const getFieldDefinitions = async ({ modelType, modelOptions, identifiers, options, }) => {
     const { include, useEntityIdFromInclude } = modelOptions;
     const where = {
         modelType,
@@ -210,14 +211,21 @@ const getFieldDefinitions = async ({ modelType, modelOptions, identifiers, optio
     });
     return fieldDefinitions;
 };
-const formatDates = (fieldDefinitions = [], instance) => {
-    fieldDefinitions.forEach((fieldDefinition) => {
+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) {
+                const { value: joiValue, error: validationError } = joi_1.default.date().validate(value);
+                if (validationError) {
+                    throw new errors_2.InvalidValueError(value, name, validationError);
+                }
                 // eslint-disable-next-line no-param-reassign
-                instance.customFields[name] = new Date(value).toISOString();
+                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;
             }
         }
     });
@@ -232,7 +240,7 @@ const beforeCreate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
     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
+        modelType, modelOptions, identifiers, options,
     });
     // Apply default values
     const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
@@ -290,7 +298,7 @@ const beforeUpdate = (scopeAttributes, modelOptions = {}, sadotOptions = { useCu
     const modelType = instance.constructor.name;
     const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
     const fieldDefinitions = await getFieldDefinitions({
-        modelType, modelOptions, identifiers, options
+        modelType, modelOptions, identifiers, options,
     });
     // Step 1: Validate the model data (including custom fields)
     await validateModel(instance, options, scopeAttributes, false);

package/dist/index.js

@@ -54,7 +54,10 @@ 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 });
+    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;
+    });
     (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

@@ -26,7 +26,7 @@ exports.CustomValidator = CustomValidator_1.default;
 const productionModels = [CustomFieldDefinition_1.default, CustomFieldValue_1.default, CustomValidator_1.default];
 const testModels = [TestModel_1.default, AssociatedTestModel_1.default, ContextAwareTestModel_1.default, ContextTestModel_1.default];
 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, getUser, { schemaPrefix, schemaVersion, useCustomFieldsEntries, } = {
     schemaPrefix: SADOT_MIGRATION_PREFIX,
     schemaVersion: SCHEMA_VERSION,
@@ -87,10 +87,13 @@ const initTables = async (sequelize, getUser, { schemaPrefix, schemaVersion, use
         timestamps: false,
         schema: 'public',
     });
+    logger_1.default.info('custom-fields: starting migrations');
     const migrations = await SequelizeMeta.findAll({ where: { name: { [sequelize_1.Op.like]: `${schemaPrefix}%` } }, raw: true });
     const currentSadotSchemaVersion = migrations.at(-1);
     const expectedSchemaVersionIndex = migrations.findIndex((m) => m.name === CUSTOM_FIELDS_SCHEMA_VERSION);
+    logger_1.default.info('custom-fields: migrations', { migrations, currentSadotSchemaVersion, expectedSchemaVersionIndex });
     if (!currentSadotSchemaVersion || currentSadotSchemaVersion.name !== CUSTOM_FIELDS_SCHEMA_VERSION) {
+        logger_1.default.info('custom-fields: syncing models');
         await CustomFieldDefinition_1.default.sync({ alter: true });
         await CustomFieldValue_1.default.sync({ alter: true });
         // T.Y TODO: Remove the if statement once we're ready to add the new entries table for all MS

package/dist/models/test.js

@@ -0,0 +1,9 @@
+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});

package/package.json

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

package/src/models/index.ts

@@ -29,14 +29,10 @@ const initTables = async (
   sequelize: Sequelize,
   getUser: CustomFieldOptions['getUser'],
   {
-    schemaPrefix,
-    schemaVersion,
-    useCustomFieldsEntries,
-  }: InitTablesOptions = {
-    schemaPrefix: SADOT_MIGRATION_PREFIX,
-    schemaVersion: SCHEMA_VERSION,
-    useCustomFieldsEntries: false,
-  },
+    schemaPrefix = SADOT_MIGRATION_PREFIX,
+    schemaVersion = SCHEMA_VERSION,
+    useCustomFieldsEntries = false,
+  }: InitTablesOptions,
 ): Promise<void> => {
   const CUSTOM_FIELDS_SCHEMA_VERSION = `${schemaPrefix}_${schemaVersion}${useCustomFieldsEntries ? '_withEntries' : ''}`;
   logger.info('custom-fields: initialize custom-fields tables');