@autofleet/sadot 0.7.6 → 0.7.7-beta-0ecad376.0

package/dist/hooks/create.js

@@ -48,43 +48,27 @@ exports.beforeBulkCreate = beforeBulkCreate;
 const beforeCreate = (scopeAttributes, modelOptions = {}) => async (instance, options) => {
     logger_1.default.debug('sadot - before create hook');
     const { fields } = options;
-    const { include, useEntityIdFromInclude } = modelOptions;
     const modelType = instance.constructor.name;
     const identifiers = (0, scopeAttributes_1.default)(instance, scopeAttributes);
-    const where = {
-        modelType,
-        disabled: false,
-        ...(!useEntityIdFromInclude && { entityId: identifiers }),
-    };
-    const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: false, transaction: options.transaction, include: include?.(identifiers) });
-    const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
+    // get all model's required definitions
+    const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, modelOptions);
     const customFieldsIdx = fields.indexOf('customFields');
-    if ((customFieldsIdx === -1 || !instance.customFields) && requiredFieldsNames?.length > 0) {
-        throw new errors_1.MissingRequiredCustomFieldError(requiredFieldsNames);
-    }
-    const fieldsWithDefaultValue = fieldDefinitions.filter((def) => ![null, undefined].includes(def.defaultValue));
-    if (fieldsWithDefaultValue.length) {
-        // eslint-disable-next-line no-param-reassign
-        instance.customFields || (instance.customFields = {});
-        fieldsWithDefaultValue.filter((def) => !(def.name in instance.customFields)).forEach(({ name, defaultValue }) => {
-            // eslint-disable-next-line no-param-reassign
-            instance.customFields[name] = defaultValue;
-        });
-    }
     const { customFields } = instance;
-    if (customFieldsIdx === -1 || !customFields) {
-        return;
+    if (customFieldsIdx > -1 && customFields) {
+        const fieldsNames = Object.keys(customFields);
+        const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
+        if (missingFields?.length > 0) {
+            throw new errors_1.MissingRequiredCustomFieldError(missingFields);
+        }
+        await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
+            transaction: options.transaction,
+            modelOptions,
+        }, true);
+        // eslint-disable-next-line no-param-reassign
+        fields.splice(customFieldsIdx, 1);
     }
-    const fieldsNames = Object.keys(customFields);
-    const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-    if (missingFields?.length > 0) {
-        throw new errors_1.MissingRequiredCustomFieldError(missingFields);
+    else if (requiredFieldsNames?.length > 0) {
+        throw new errors_1.MissingRequiredCustomFieldError(requiredFieldsNames);
     }
-    await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
-        transaction: options.transaction,
-        modelOptions,
-    });
-    // eslint-disable-next-line no-param-reassign
-    fields.splice(customFieldsIdx, 1);
 };
 exports.beforeCreate = beforeCreate;

package/dist/repository/value.d.ts

@@ -24,5 +24,5 @@ export declare const findValuesByModelIds: (modelIds: string[], options?: any) =
  */
 export declare const updateValues: (modelType: string, modelId: string, identifiers: string[], valuesToUpdate: ValuesToUpdate, options?: FindOptions & {
     modelOptions?: ModelOptions;
-}) => Promise<CustomFieldValue[]>;
+}, defineAllDefaults?: boolean) => Promise<CustomFieldValue[]>;
 export declare const deleteValue: (id: string, options?: any) => Promise<any>;

package/dist/repository/value.js

@@ -84,7 +84,7 @@ const formatFunctions = {
  * Create new value record if not exists, but fails if value's definition not exist.
  * Return the updated values
  */
-const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
+const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}, defineAllDefaults = false) => {
     const names = Object.keys(valuesToUpdate);
     logger_1.default.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
         names,
@@ -95,10 +95,12 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
     const { modelOptions, transaction } = options;
     const where = {
         modelType,
-        name: names,
+        ...(!defineAllDefaults && { name: names }),
         ...(!options.modelOptions?.useEntityIdFromInclude && { entityId: identifiers }),
     };
-    const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) ?? [];
+    const allFieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) || [];
+    const namesSet = new Set(defineAllDefaults ? names : undefined);
+    const fieldDefinitions = defineAllDefaults ? allFieldDefinitions.filter((cfd) => namesSet.has(cfd.name)) : allFieldDefinitions;
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
         logger_1.default.warn(`custom-fields: missing definitions for ${modelType} ${modelId}`, { names, fieldDefinitions });
@@ -110,17 +112,28 @@ 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 visitedFields = new Set();
     const values = names.map((name) => {
         const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
+        visitedFields.add(fieldDefinition);
         const formatFunction = formatFunctions[fieldDefinition.fieldType];
-        const value = formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name];
         return {
             modelId,
+            value: (formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name]) ?? fieldDefinition.defaultValue,
             updatedAt: new Date(),
             customFieldDefinitionId: fieldDefinition.id,
-            value: value !== undefined ? value : fieldDefinition.defaultValue,
         };
     });
+    if (defineAllDefaults) {
+        allFieldDefinitions.filter((def) => !visitedFields.has(def) && ![null, undefined].includes(def.defaultValue)).forEach(({ id, defaultValue }) => {
+            values.push({
+                modelId,
+                value: defaultValue,
+                updatedAt: new Date(),
+                customFieldDefinitionId: id,
+            });
+        });
+    }
     return Promise.all(values.map(async (value) => {
         const [cfv] = await models_1.CustomFieldValue.upsert(value, {
             transaction: options.transaction,

package/package.json

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

package/src/hooks/create.ts

@@ -1,4 +1,3 @@
-import type { WhereOptions } from 'sequelize';
 import logger from '../utils/logger';
 import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
@@ -24,54 +23,37 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
 ): Promise<void> => {
   logger.debug('sadot - before create hook');
   const { fields } = options;
-  const { include, useEntityIdFromInclude } = modelOptions;
   const modelType = instance.constructor.name;
 
   const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
-  const where: WhereOptions = {
-    modelType,
-    disabled: false,
-    ...(!useEntityIdFromInclude && { entityId: identifiers }),
-  };
-  const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: false, transaction: options.transaction, include: include?.(identifiers) });
-  const requiredFieldsNames = Array.from(new Set(fieldDefinitions.filter(({ required }) => required).map(({ name }) => name)));
+  // get all model's required definitions
+  const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, modelOptions);
 
   const customFieldsIdx = fields.indexOf('customFields');
-
-  if ((customFieldsIdx === -1 || !instance.customFields) && requiredFieldsNames?.length > 0) {
-    throw new MissingRequiredCustomFieldError(requiredFieldsNames);
-  }
-  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) => !(def.name in instance.customFields)).forEach(({ name, defaultValue }) => {
-      // eslint-disable-next-line no-param-reassign
-      instance.customFields[name] = defaultValue;
-    });
-  }
   const { customFields } = instance;
-  if (customFieldsIdx === -1 || !customFields) {
-    return;
-  }
-  const fieldsNames = Object.keys(customFields);
-  const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
-  if (missingFields?.length > 0) {
-    throw new MissingRequiredCustomFieldError(missingFields);
-  }
+  if (customFieldsIdx > -1 && customFields) {
+    const fieldsNames = Object.keys(customFields);
+    const missingFields = requiredFieldsNames.filter((name) => !fieldsNames.includes(name));
+    if (missingFields?.length > 0) {
+      throw new MissingRequiredCustomFieldError(missingFields);
+    }
 
-  await ValueRepo.updateValues(
-    modelType,
-    instance.id,
-    identifiers,
-    customFields,
-    {
-      transaction: options.transaction,
-      modelOptions,
-    },
-  );
+    await ValueRepo.updateValues(
+      modelType,
+      instance.id,
+      identifiers,
+      customFields,
+      {
+        transaction: options.transaction,
+        modelOptions,
+      },
+      true,
+    );
 
-  // eslint-disable-next-line no-param-reassign
-  fields.splice(customFieldsIdx, 1);
+    // eslint-disable-next-line no-param-reassign
+    fields.splice(customFieldsIdx, 1);
+  } else if (requiredFieldsNames?.length > 0) {
+    throw new MissingRequiredCustomFieldError(requiredFieldsNames);
+  }
 };

package/src/repository/value.ts

@@ -67,6 +67,7 @@ export const updateValues = async (
   identifiers: string[],
   valuesToUpdate: ValuesToUpdate,
   options: FindOptions & { modelOptions?: ModelOptions } = {},
+  defineAllDefaults = false,
 ): Promise<CustomFieldValue[]> => {
   const names = Object.keys(valuesToUpdate);
   logger.debug(`custom-fields: updating values for ${modelType} ${modelId}`, {
@@ -79,11 +80,13 @@ export const updateValues = async (
 
   const where: WhereOptions = {
     modelType,
-    name: names,
+    ...(!defineAllDefaults && { name: names }),
     ...(!options.modelOptions?.useEntityIdFromInclude && { entityId: identifiers }),
   };
 
-  const fieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) ?? [];
+  const allFieldDefinitions = await DefinitionRepo.findAll(where, { withDisabled: true, transaction, include: modelOptions.include?.(identifiers) }) || [];
+  const namesSet = new Set(defineAllDefaults ? names : undefined);
+  const fieldDefinitions = defineAllDefaults ? allFieldDefinitions.filter((cfd) => namesSet.has(cfd.name)) : allFieldDefinitions;
 
   const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
   if (fieldDefinitions.length !== names.length) {
@@ -98,18 +101,31 @@ export const updateValues = async (
     logger.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
   }
 
+  const visitedFields = new Set<CustomFieldDefinition>();
+
   const values: CreateCustomFieldValue[] = names.map((name) => {
     const fieldDefinition = fieldDefinitions.find((def) => def.name === name);
+    visitedFields.add(fieldDefinition);
     const formatFunction = formatFunctions[fieldDefinition.fieldType];
-    const value = formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name];
     return {
       modelId,
+      value: (formatFunction ? formatFunction(valuesToUpdate[name]) : valuesToUpdate[name]) ?? fieldDefinition.defaultValue,
       updatedAt: new Date(),
       customFieldDefinitionId: fieldDefinition.id,
-      value: value !== undefined ? value : fieldDefinition.defaultValue,
     };
   });
 
+  if (defineAllDefaults) {
+    allFieldDefinitions.filter((def) => !visitedFields.has(def) && ![null, undefined].includes(def.defaultValue)).forEach(({ id, defaultValue }) => {
+      values.push({
+        modelId,
+        value: defaultValue,
+        updatedAt: new Date(),
+        customFieldDefinitionId: id,
+      });
+    });
+  }
+
   return Promise.all(values.map(async (value) => {
     const [cfv] = await CustomFieldValue.upsert(value, {
       transaction: options.transaction,