@autofleet/sadot 0.7.3-beta-4c642ed9.2 → 0.7.3

package/dist/hooks/create.js

@@ -63,7 +63,7 @@ const beforeCreate = (scopeAttributes, modelOptions = {}) => async (instance, op
         await ValueRepo.updateValues(modelType, instance.id, identifiers, customFields, {
             transaction: options.transaction,
             modelOptions,
-        });
+        }, true);
         // eslint-disable-next-line no-param-reassign
         fields.splice(customFieldsIdx, 1);
     }

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,
@@ -112,8 +112,10 @@ 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];
         return {
             modelId,
@@ -122,6 +124,16 @@ const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, opt
             customFieldDefinitionId: fieldDefinition.id,
         };
     });
+    if (defineAllDefaults) {
+        fieldDefinitions.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.3-beta-4c642ed9.2",
+  "version": "0.7.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/hooks/create.ts

@@ -49,6 +49,7 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
         transaction: options.transaction,
         modelOptions,
       },
+      true,
     );
 
     // eslint-disable-next-line no-param-reassign

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}`, {
@@ -100,8 +101,11 @@ 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];
     return {
       modelId,
@@ -111,6 +115,17 @@ export const updateValues = async (
     };
   });
 
+  if (defineAllDefaults) {
+    fieldDefinitions.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,