@autofleet/matmon 2.0.0-beta-45 → 2.0.0-beta-46

package/lib/orm-cache/sequelize-adapter.js

@@ -20,20 +20,22 @@ const BULK_HOOKS = ['beforeBulkUpdate', 'beforeBulkDestroy'];
 const generateInstanceKey = (modelOptions, id) => `${AF_SERVICE_NAME}:${modelOptions.name}_${id}_INCLUDING_${modelOptions.associations.map(a => a.name).join('_')}`;
 const generateDependencyKey = (modelName, associationName, associationId) => `${AF_SERVICE_NAME}:${modelName}_${associationName}_${associationId}_DEPENDENCIES`;
 const getAssociation = (instance, associationOptions, associationId) => {
+    const accessKey = associationOptions.accessKey || 'id';
     if (Array.isArray(instance[associationOptions.alias])) {
-        return instance[associationOptions.alias].find(association => association[associationOptions.accessKey || 'id'] === associationId);
+        return instance[associationOptions.alias].find(association => association[accessKey] === associationId);
     }
     return instance[associationOptions.alias];
 };
 const getInstanceDependencyKeys = (modelOptions, instance) => {
     const keys = modelOptions.associations
         .filter((association) => instance[association.alias])
-        .map((association) => {
-        if (Array.isArray(instance[association.alias])) {
-            return instance[association.alias]
-                .map(a => generateDependencyKey(modelOptions.name, a.name, instance[a.alias].id));
+        .map((associationOptions) => {
+        const accessKey = associationOptions.accessKey || 'id';
+        if (Array.isArray(instance[associationOptions.alias])) {
+            return instance[associationOptions.alias]
+                .map(associationInstance => generateDependencyKey(modelOptions.name, associationOptions.name, associationInstance[accessKey]));
         }
-        return [generateDependencyKey(modelOptions.name, association.name, instance[association.alias].id)];
+        return [generateDependencyKey(modelOptions.name, associationOptions.name, instance[associationOptions.alias][accessKey])];
     });
     return keys.reduce((flattenArray, array) => flattenArray.concat(array), []);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/matmon",
-  "version": "2.0.0-beta-45",
+  "version": "2.0.0-beta-46",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",