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

package/lib/orm-cache/adapter.d.ts

@@ -1,10 +1,13 @@
 import RedisCache from '../redis';
 export interface ModelOptions {
     name: string;
-    associations: {
-        name: string;
-        alias: string;
-    }[];
+    associations: AssociationOptions[];
+}
+export interface AssociationOptions {
+    name: string;
+    alias: string;
+    accessKey?: string;
+    associations?: AssociationOptions[];
 }
 export interface Adapter {
     ormInstance: any;

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

@@ -19,21 +19,23 @@ const INVALIDATION_HOOKS = ['afterSave', 'afterUpdate', 'afterDestroy'];
 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, associationAlias, associationId) => {
-    if (Array.isArray(instance[associationAlias])) {
-        return instance[associationAlias].find(association => association.id === associationId);
+const getAssociation = (instance, associationOptions, associationId) => {
+    const accessKey = associationOptions.accessKey || 'id';
+    if (Array.isArray(instance[associationOptions.alias])) {
+        return instance[associationOptions.alias].find(association => association[accessKey] === associationId);
     }
-    return instance[associationAlias];
+    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));
+        .filter((association) => instance[association.alias])
+        .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), []);
 };
@@ -99,8 +101,8 @@ class SequelizeAdapter {
             removeMulti.del(instanceKey);
             return removeMultiAsync();
         });
-        const invalidateModelInstanceByAssociation = (modelName, association, associationId) => __awaiter(this, void 0, void 0, function* () {
-            const dependentInstancesKeys = yield cache.getClient().smembersAsync(generateDependencyKey(modelName, association, associationId));
+        const invalidateModelInstanceByAssociation = (association, associationId) => __awaiter(this, void 0, void 0, function* () {
+            const dependentInstancesKeys = yield cache.getClient().smembersAsync(generateDependencyKey(modelOptions.name, association, associationId));
             this.debug('Invalidating dependent instances', { dependentInstancesKeys });
             const removeMulti = cache.getClient().multi();
             const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
@@ -111,7 +113,7 @@ class SequelizeAdapter {
                 }
                 const dependencyKeys = modelOptions.associations
                     .filter(association => instance[association.alias])
-                    .map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
+                    .map(association => generateDependencyKey(modelOptions.name, association.name, instance[association.alias].id));
                 dependencyKeys.reduce((multi, key) => multi.srem(key, instanceKey), removeMulti);
                 removeMulti.del(instanceKey);
                 return dependencyKeys;
@@ -124,7 +126,7 @@ class SequelizeAdapter {
         BULK_HOOKS.map(hook => model.addHook(hook, options => options.individualHook = true));
         modelOptions.associations.map(association => {
             const associationModel = this.getModel(association.name);
-            INVALIDATION_HOOKS.map(hook => associationModel.addHook(hook, (instance, options) => handleTransactionHook(instance, options, ({ id }) => invalidateModelInstanceByAssociation(modelOptions.name, association.name, id))));
+            INVALIDATION_HOOKS.map(hook => associationModel.addHook(hook, (instance, options) => handleTransactionHook(instance, options, ({ id }) => invalidateModelInstanceByAssociation(association.name, id))));
             BULK_HOOKS.map(hook => associationModel.addHook(hook, options => options.individualHook = true));
         });
     }

package/package.json

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