@autofleet/matmon 2.0.0-beta-40 → 2.0.0-beta-42
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.
|
@@ -17,7 +17,7 @@ const util_1 = require("util");
|
|
|
17
17
|
const { AF_SERVICE_NAME } = process.env;
|
|
18
18
|
const INVALIDATION_HOOKS = ['afterSave', 'afterUpdate', 'afterDestroy'];
|
|
19
19
|
const BULK_HOOKS = ['beforeBulkUpdate', 'beforeBulkDestroy'];
|
|
20
|
-
const generateInstanceKey = (modelOptions,
|
|
20
|
+
const generateInstanceKey = (modelOptions, instance) => `${AF_SERVICE_NAME}:${modelOptions.name}_${instance.id}_INCLUDING_${modelOptions.associations.map(a => a.name).join('_')}`;
|
|
21
21
|
const generateDependencyKey = (modelName, associationName, associationId) => `${AF_SERVICE_NAME}:${modelName}_${associationName}_${associationId}_DEPENDENCIES`;
|
|
22
22
|
const handleTransactionHook = (instance, options, func) => {
|
|
23
23
|
const { transaction } = options;
|
|
@@ -43,7 +43,9 @@ class SequelizeAdapter {
|
|
|
43
43
|
}
|
|
44
44
|
injectGetWithCacheFunction(cache, modelOptions) {
|
|
45
45
|
const addDependencies = (modelName, instance) => __awaiter(this, void 0, void 0, function* () {
|
|
46
|
-
const dependencyKeys = modelOptions.associations
|
|
46
|
+
const dependencyKeys = modelOptions.associations
|
|
47
|
+
.filter(association => instance[association.alias])
|
|
48
|
+
.map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
|
|
47
49
|
const instanceKey = generateInstanceKey(modelOptions, instance.id);
|
|
48
50
|
this.debug('Adding dependencies', { instanceKey, dependencyKeys });
|
|
49
51
|
const addDependenciesMulti = cache.getClient().multi();
|
|
@@ -90,6 +92,9 @@ class SequelizeAdapter {
|
|
|
90
92
|
const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
|
|
91
93
|
const dependenciesToRemove = yield Promise.all(dependentInstancesKeys.map((instanceKey) => __awaiter(this, void 0, void 0, function* () {
|
|
92
94
|
const instance = JSON.parse(yield cache.getClient().getAsync(instanceKey));
|
|
95
|
+
if (!instance) {
|
|
96
|
+
return [];
|
|
97
|
+
}
|
|
93
98
|
const dependencyKeys = modelOptions.associations
|
|
94
99
|
.filter(association => instance[association.alias])
|
|
95
100
|
.map(association => generateDependencyKey(modelName, association.name, instance[association.alias].id));
|