@autofleet/sadot 0.2.7 → 0.2.9-beta.0

package/src/hooks/enrich.ts

@@ -3,7 +3,6 @@ import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
 import CustomFieldValue from '../models/CustomFieldValue';
 import { SerializedCustomFields } from '../types/definition';
-import logger from '../utils/logger';
 
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
@@ -18,11 +17,10 @@ const serializeCustomFields = (customFieldValues: CustomFieldValue[]): Serialize
 /**
  * A hook to attach the custom fields when fetching a model instances.
  */
-const enrichResults = (scopeAttributes: string[]) => async (
+const enrichResults = (modelType: string, scopeAttributes: string[]) => async (
   instancesOrInstance: any | any[],
   options,
 ): Promise<void> => {
-  logger.debug('sadot - enrich hook');
   if (
     options.originalAttributes?.length > 0
       && !options.originalAttributes?.includes?.('customFields')
@@ -35,22 +33,22 @@ const enrichResults = (scopeAttributes: string[]) => async (
     ? instancesOrInstance
     : [instancesOrInstance];
 
-  instances = instances.filter((instance) => !!instance);
+  instances = instances.filter(Boolean);
 
   const identifiers = instances.map((instance) =>
     scopeAttributes
       .map((attr) => instance[attr])).flat();
 
-  const uniqueIdentifiers = [...new Set(identifiers)].filter((identifier) => !!identifier);
+  const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
   const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
     ...map,
     [identifier]: [],
   }), {});
   const customFieldDefinitions = await DefinitionRepo.findByEntityIds(
+    modelType,
     uniqueIdentifiers,
     { transaction: options.transaction },
   );
-  logger.debug('sadot - enrich hook - got customFieldDefinitions');
 
   customFieldDefinitions.forEach((cfd) => {
     identifierCustomFieldDefinitionsMapping[cfd.entityId].push(cfd);

package/src/index.ts

@@ -38,9 +38,9 @@ const addHooks = (models: ModelOptions[], getModel: ModelFetcher) => {
       model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', beforeBulkUpdate);
       model.addHook('beforeCreate', 'sadot-beforeCreate', beforeCreate(scopeAttributes));
       model.addHook('beforeUpdate', 'sadot-beforeUpdate', beforeUpdate(scopeAttributes));
-      model.addHook('afterFind', 'sadot-afterFind', enrichResults(scopeAttributes));
-      model.addHook('afterUpdate', 'sadot-afterUpdate', enrichResults(scopeAttributes));
-      model.addHook('afterCreate', 'sadot-afterCreate', enrichResults(scopeAttributes));
+      model.addHook('afterFind', 'sadot-afterFind', enrichResults(name, scopeAttributes));
+      model.addHook('afterUpdate', 'sadot-afterUpdate', enrichResults(name, scopeAttributes));
+      model.addHook('afterCreate', 'sadot-afterCreate', enrichResults(name, scopeAttributes));
     } catch (e) {
       logger.error(`Could not add custom fields hook to model ${name}. `, e);
     }

package/src/repository/definition.ts

@@ -44,10 +44,14 @@ export const findByEntityId = async (
 });
 
 export const findByEntityIds = async (
+  modelType: string,
   entityIds: string[],
   options: any = {},
 ): Promise<CustomFieldDefinition[]> => CustomFieldDefinition.findAll({
-  where: { entityId: entityIds },
+  where: {
+    modelType,
+    entityId: entityIds,
+  },
   transaction: options.transaction,
   raw: true,
 });

package/src/utils/logger/index.ts

@@ -3,8 +3,4 @@ const Logger = require('@autofleet/logger');
 
 const logger = Logger();
 
-if (process.env.SADOT_DEBUG === 'true') {
-  logger.debug = logger.info;
-}
-
 export default logger;