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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/orm-cache/adapter.d.ts +7 -4
  2. package/lib/orm-cache/sequelize-adapter.js +28 -14
  3. package/package.json +1 -1
package/lib/orm-cache/adapter.d.ts CHANGED
@@ -1,10 +1,13 @@
1
1
  import RedisCache from '../redis';
2
2
  export interface ModelOptions {
3
3
  name: string;
4
- associations: {
5
- name: string;
6
- alias: string;
7
- }[];
4
+ associations: AssociationOptions[];
5
+ }
6
+ export interface AssociationOptions {
7
+ name: string;
8
+ alias: string;
9
+ accessKey?: string;
10
+ associations?: AssociationOptions[];
8
11
  }
9
12
  export interface Adapter {
10
13
  ormInstance: any;
package/lib/orm-cache/sequelize-adapter.js CHANGED
@@ -19,6 +19,24 @@ const INVALIDATION_HOOKS = ['afterSave', 'afterUpdate', 'afterDestroy'];
19
19
  const BULK_HOOKS = ['beforeBulkUpdate', 'beforeBulkDestroy'];
20
20
  const generateInstanceKey = (modelOptions, id) => `${AF_SERVICE_NAME}:${modelOptions.name}_${id}_INCLUDING_${modelOptions.associations.map(a => a.name).join('_')}`;
21
21
  const generateDependencyKey = (modelName, associationName, associationId) => `${AF_SERVICE_NAME}:${modelName}_${associationName}_${associationId}_DEPENDENCIES`;
22
+ const getAssociation = (instance, associationOptions, associationId) => {
23
+ if (Array.isArray(instance[associationOptions.alias])) {
24
+ return instance[associationOptions.alias].find(association => association[associationOptions.accessKey || 'id'] === associationId);
25
+ }
26
+ return instance[associationOptions.alias];
27
+ };
28
+ const getInstanceDependencyKeys = (modelOptions, instance) => {
29
+ const keys = modelOptions.associations
30
+ .filter((association) => instance[association.alias])
31
+ .map((association) => {
32
+ if (Array.isArray(instance[association.alias])) {
33
+ return instance[association.alias]
34
+ .map(a => generateDependencyKey(modelOptions.name, a.name, instance[a.alias].id));
35
+ }
36
+ return [generateDependencyKey(modelOptions.name, association.name, instance[association.alias].id)];
37
+ });
38
+ return keys.reduce((flattenArray, array) => flattenArray.concat(array), []);
39
+ };
22
40
  const handleTransactionHook = (instance, options, func) => {
23
41
  const { transaction } = options;
24
42
  if (transaction) {
@@ -42,10 +60,8 @@ class SequelizeAdapter {
42
60
  }
43
61
  }
44
62
  injectGetWithCacheFunction(cache, modelOptions) {
45
- const addDependencies = (modelName, instance) => __awaiter(this, void 0, void 0, function* () {
46
- const dependencyKeys = modelOptions.associations
47
- .filter(association => instance[association.alias])
48
- .map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
63
+ const addDependencies = (instance) => __awaiter(this, void 0, void 0, function* () {
64
+ const dependencyKeys = getInstanceDependencyKeys(modelOptions, instance);
49
65
  const instanceKey = generateInstanceKey(modelOptions, instance.id);
50
66
  this.debug('Adding dependencies', { instanceKey, dependencyKeys });
51
67
  const addDependenciesMulti = cache.getClient().multi();
@@ -63,7 +79,7 @@ class SequelizeAdapter {
63
79
  this.debug('Value from DB', { value: value || 'not found', cacheKey });
64
80
  const [setRes] = yield Promise.all([
65
81
  cache.getClient().setAsync(cacheKey, JSON.stringify(value)),
66
- value && addDependencies(modelOptions.name, value),
82
+ value && addDependencies(value),
67
83
  ]);
68
84
  }
69
85
  else {
@@ -73,10 +89,8 @@ class SequelizeAdapter {
73
89
  });
74
90
  }
75
91
  addInvalidationHooks(cache, modelOptions) {
76
- const invalidateModelInstance = (modelName, instance) => __awaiter(this, void 0, void 0, function* () {
77
- const dependencyKeys = modelOptions.associations
78
- .filter(association => instance[association.alias])
79
- .map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
92
+ const invalidateModelInstance = (instance) => __awaiter(this, void 0, void 0, function* () {
93
+ const dependencyKeys = getInstanceDependencyKeys(modelOptions, instance);
80
94
  const instanceKey = generateInstanceKey(modelOptions, instance.id);
81
95
  this.debug('Removing dependencies', { instance, instanceKey, dependencyKeys });
82
96
  const removeMulti = cache.getClient().multi();
@@ -85,8 +99,8 @@ class SequelizeAdapter {
85
99
  removeMulti.del(instanceKey);
86
100
  return removeMultiAsync();
87
101
  });
88
- const invalidateModelInstanceByAssociation = (modelName, association, associationId) => __awaiter(this, void 0, void 0, function* () {
89
- const dependentInstancesKeys = yield cache.getClient().smembersAsync(generateDependencyKey(modelName, association, associationId));
102
+ const invalidateModelInstanceByAssociation = (association, associationId) => __awaiter(this, void 0, void 0, function* () {
103
+ const dependentInstancesKeys = yield cache.getClient().smembersAsync(generateDependencyKey(modelOptions.name, association, associationId));
90
104
  this.debug('Invalidating dependent instances', { dependentInstancesKeys });
91
105
  const removeMulti = cache.getClient().multi();
92
106
  const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
@@ -97,7 +111,7 @@ class SequelizeAdapter {
97
111
  }
98
112
  const dependencyKeys = modelOptions.associations
99
113
  .filter(association => instance[association.alias])
100
- .map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
114
+ .map(association => generateDependencyKey(modelOptions.name, association.name, instance[association.alias].id));
101
115
  dependencyKeys.reduce((multi, key) => multi.srem(key, instanceKey), removeMulti);
102
116
  removeMulti.del(instanceKey);
103
117
  return dependencyKeys;
@@ -106,11 +120,11 @@ class SequelizeAdapter {
106
120
  return removeMultiAsync();
107
121
  });
108
122
  const model = this.getModel(modelOptions.name);
109
- INVALIDATION_HOOKS.map(hook => model.addHook(hook, (instance, options) => handleTransactionHook(instance, options, instance => invalidateModelInstance(modelOptions.name, instance))));
123
+ INVALIDATION_HOOKS.map(hook => model.addHook(hook, (instance, options) => handleTransactionHook(instance, options, instance => invalidateModelInstance(instance))));
110
124
  BULK_HOOKS.map(hook => model.addHook(hook, options => options.individualHook = true));
111
125
  modelOptions.associations.map(association => {
112
126
  const associationModel = this.getModel(association.name);
113
- INVALIDATION_HOOKS.map(hook => associationModel.addHook(hook, (instance, options) => handleTransactionHook(instance, options, ({ id }) => invalidateModelInstanceByAssociation(modelOptions.name, association.name, id))));
127
+ INVALIDATION_HOOKS.map(hook => associationModel.addHook(hook, (instance, options) => handleTransactionHook(instance, options, ({ id }) => invalidateModelInstanceByAssociation(association.name, id))));
114
128
  BULK_HOOKS.map(hook => associationModel.addHook(hook, options => options.individualHook = true));
115
129
  });
116
130
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/matmon",
3
- "version": "2.0.0-beta-43",
3
+ "version": "2.0.0-beta-45",
4
4
  "description": "manage cache",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",