@autofleet/sadot 0.5.4-beta.19 → 0.5.4-beta.20

package/dist/hooks/create.js

@@ -22,11 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeCreate = exports.beforeBulkCreate = void 0;
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
 const errors_1 = require("../errors");
+const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
  */
@@ -44,10 +48,7 @@ const beforeCreate = (scopeAttributes, modelOptions) => async (instance, options
     const { fields } = options;
     const modelType = instance.constructor.name;
     const { scopeAttributeReplacer } = modelOptions;
-    let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
-    if (scopeAttributeReplacer) {
-        identifiers = await scopeAttributeReplacer(identifiers);
-    }
+    const identifiers = await (0, scopeAttributes_1.default)(instance, scopeAttributes, scopeAttributeReplacer);
     // get all model's required definitions
     const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers);
     const customFieldsIdx = fields.indexOf('customFields');

package/dist/hooks/enrich.js

@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
 const logger_1 = __importDefault(require("../utils/logger"));
+const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
  */
@@ -55,11 +56,7 @@ const enrichResults = (modelType, scopeAttributes, getScope, hookType, modelOpti
         ? instancesOrInstance
         : [instancesOrInstance];
     instances = instances.filter(Boolean);
-    let identifiers = instances.map((instance) => scopeAttributes
-        .map((attr) => instance[attr])).flat();
-    if (scopeAttributeReplacer) {
-        identifiers = await scopeAttributeReplacer(identifiers);
-    }
+    const identifiers = await (0, scopeAttributes_1.default)(instances, scopeAttributes, scopeAttributeReplacer);
     logger_1.default.info('enrichResults - sadot - indentifiers: ', identifiers);
     const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
     const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({

package/dist/hooks/update.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.beforeUpdate = exports.beforeBulkUpdate = void 0;
 const logger_1 = __importDefault(require("../utils/logger"));
 const ValueRepo = __importStar(require("../repository/value"));
+const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
  */
@@ -47,10 +48,7 @@ const beforeUpdate = (scopeAttributes, modelOptions) => async (instance, options
     const { fields } = options;
     const { scopeAttributeReplacer } = modelOptions;
     const modelType = instance.constructor.name;
-    let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
-    if (scopeAttributeReplacer) {
-        identifiers = await scopeAttributeReplacer(identifiers);
-    }
+    const identifiers = await (0, scopeAttributes_1.default)(instance, scopeAttributes, scopeAttributeReplacer);
     const customFieldsIdx = fields.indexOf('customFields');
     if (customFieldsIdx > -1) {
         const { customFields } = instance;

package/dist/utils/scopeAttributes.d.ts

@@ -0,0 +1,3 @@
+import { ModelOptions } from '../types';
+declare const getScopeAttributes: (instance: any, scopeAttributes: string[], scopeAttributeReplacer?: ModelOptions['scopeAttributeReplacer']) => Promise<any[]>;
+export default getScopeAttributes;

package/dist/utils/scopeAttributes.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const getIdentifiers = (instance, scopeAttributes) => {
+    if (Array.isArray(instance)) {
+        return instance.map((ins) => scopeAttributes.map((attr) => ins[attr])).flat();
+    }
+    return scopeAttributes.map((attribute) => instance[attribute]);
+};
+const getScopeAttributes = async (instance, scopeAttributes, scopeAttributeReplacer) => {
+    let identifiers = getIdentifiers(instance, scopeAttributes);
+    if (scopeAttributeReplacer) {
+        identifiers = await scopeAttributeReplacer(identifiers);
+    }
+    return identifiers;
+};
+exports.default = getScopeAttributes;

package/package.json

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

package/src/hooks/create.ts

@@ -2,6 +2,7 @@ import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
 import { MissingRequiredCustomFieldError } from '../errors';
 import { ModelOptions } from '../types';
+import getScopeAttributes from '../utils/scopeAttributes';
 
 /**
  * A hook to create the custom fields when updating a model (more then one instance).
@@ -23,10 +24,7 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
   const modelType = instance.constructor.name;
   const { scopeAttributeReplacer } = modelOptions;
 
-  let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
-  if (scopeAttributeReplacer) {
-    identifiers = await scopeAttributeReplacer(identifiers);
-  }
+  const identifiers = await getScopeAttributes(instance, scopeAttributes, scopeAttributeReplacer);
   // get all model's required definitions
   const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType,
     instance.id,

package/src/hooks/enrich.ts

@@ -6,6 +6,7 @@ import CustomFieldDefinition from '../models/CustomFieldDefinition';
 import { SerializedCustomFields } from '../types/definition';
 import logger from '../utils/logger';
 import { ModelOptions } from '../types';
+import getScopeAttributes from '../utils/scopeAttributes';
 
 type SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';
 
@@ -53,13 +54,7 @@ const enrichResults = (
 
   instances = instances.filter(Boolean);
 
-  let identifiers = instances.map((instance) =>
-    scopeAttributes
-      .map((attr) => instance[attr])).flat();
-
-  if (scopeAttributeReplacer) {
-    identifiers = await scopeAttributeReplacer(identifiers);
-  }
+  const identifiers = await getScopeAttributes(instances, scopeAttributes, scopeAttributeReplacer);
   logger.info('enrichResults - sadot - indentifiers: ', identifiers);
 
   const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);

package/src/hooks/update.ts

@@ -1,6 +1,7 @@
 import logger from '../utils/logger';
 import * as ValueRepo from '../repository/value';
 import { ModelOptions } from '../types';
+import getScopeAttributes from '../utils/scopeAttributes';
 
 /**
  * A hook to update the custom fields when updating a model (more then one instance).
@@ -23,10 +24,8 @@ export const beforeUpdate = (scopeAttributes: string[], modelOptions: ModelOptio
   const { fields } = options;
   const { scopeAttributeReplacer } = modelOptions;
   const modelType = instance.constructor.name;
-  let identifiers = scopeAttributes.map((attribute) => instance[attribute]);
-  if (scopeAttributeReplacer) {
-    identifiers = await scopeAttributeReplacer(identifiers);
-  }
+  const identifiers = await getScopeAttributes(instance, scopeAttributes, scopeAttributeReplacer);
+
   const customFieldsIdx = fields.indexOf('customFields');
   if (customFieldsIdx > -1) {
     const { customFields } = instance;

package/src/utils/scopeAttributes.ts

@@ -0,0 +1,18 @@
+import { ModelOptions } from '../types';
+
+const getIdentifiers = (instance: any, scopeAttributes: string[]) => {
+  if (Array.isArray(instance)) {
+    return instance.map((ins) =>
+      scopeAttributes.map((attr) => ins[attr])).flat();
+  }
+  return scopeAttributes.map((attribute) => instance[attribute]);
+};
+const getScopeAttributes = async (instance: any, scopeAttributes: string[], scopeAttributeReplacer?: ModelOptions['scopeAttributeReplacer']) => {
+  let identifiers = getIdentifiers(instance, scopeAttributes);
+  if (scopeAttributeReplacer) {
+    identifiers = await scopeAttributeReplacer(identifiers);
+  }
+  return identifiers;
+};
+
+export default getScopeAttributes;