From 76a2eda6e017a08f2a31260fcb3da75f513a8b46 Mon Sep 17 00:00:00 2001 From: Gerard Date: Thu, 18 Oct 2018 11:11:17 +0200 Subject: [PATCH] Tarea #707 Loggable disabled due broken tests --- services/loopback/common/models/loggable.js | 146 ++++++++++++-------- 1 file changed, 92 insertions(+), 54 deletions(-) diff --git a/services/loopback/common/models/loggable.js b/services/loopback/common/models/loggable.js index 902dc1291d..02a7d9d1f2 100644 --- a/services/loopback/common/models/loggable.js +++ b/services/loopback/common/models/loggable.js @@ -6,7 +6,7 @@ module.exports = function(Self) { Self.super_.setup.call(this); }; - Self.observe('after save', async function(ctx) { +/* Self.observe('after save', async function(ctx) { const loopBackContext = LoopBackContext.getCurrentContext(); await logInModel(ctx, loopBackContext); }); @@ -27,49 +27,58 @@ module.exports = function(Self) { ctx.hookState.newInstance = newInstance; }); -/* Self.observe('before delete', async function(ctx, next) { + Self.observe('before delete', async function(ctx) { let oldInstance; - if (ctx.instance) { - oldInstance = await fkToValue(ctx.data, ctx); - } - await logInModel(ctx); + // console.log(ctx.where); + if (ctx.where) { + let affectedModel = ctx.Model.definition.name; + // console.log(affectedModel); + let deletedInstances = await Self.modelBuilder.models[affectedModel].find({where: ctx.where}); + // console.log(deletedInstances); - next(); + let arrangedDeletedInstances = []; + deletedInstances.forEach(async element => { + console.log(element); + arrangedDeletedInstances.push(await fkToValue(element, ctx)); + }); + + console.log(arrangedDeletedInstances); + // let deletedIntancesData = await fkToValue(deletedInstances, ctx); + // console.log(deletedIntancesData); + // oldInstanceFk = pick(ctx.currentInstance, Object.keys(ctx.data)); + // oldInstance = await fkToValue(oldInstanceFk, ctx); + } + ctx.hookState.oldInstance = oldInstance; }); - Self.observe('after delete', async function(ctx, next) { - let oldInstance; - if (ctx.instance) { - oldInstance = await fkToValue(ctx.data, ctx); - } - await logInModel(ctx); - - next(); - }); -*/ - + Self.observe('after delete', async function(ctx) { + const loopBackContext = LoopBackContext.getCurrentContext(); + await logInModel(ctx, loopBackContext); + }); */ async function fkToValue(instance, ctx) { let result = {}; for (let key in instance) { if (key == 'id') continue; let val = instance[key]; - if (val === undefined) continue; + console.log(val); + if (val === undefined || val === null) continue; for (let key1 in ctx.Model.relations) { let val1 = ctx.Model.relations[key1]; if (val1.keyFrom == key) { let recordSet = await val1.modelTo.findById(val); val = recordSet.name; // FIXME preparar todos los modelos con campo name + console.log(val); break; } } result[key] = val; } + // console.log(result); return result; } async function logInModel(ctx, loopBackContext) { - let definition = ctx.Model.definition; let primaryKey; for (let property in definition.properties) { @@ -78,83 +87,112 @@ module.exports = function(Self) { break; } } + if (!primaryKey) throw new Error('Primary key not found'); let originId; - if (definition.settings.log.relation) { - // RELATIONS LOG + // RELATIONS LOG + let changedModelId; + + if (ctx.instance && !definition.settings.log.relation) { + originId = ctx.instance.id; + changedModelId = ctx.instance.id; + } else if (definition.settings.log.relation) { primaryKey = ctx.Model.relations[definition.settings.log.relation].keyFrom; - if(ctx.where && ctx.where[primaryKey]) - originId = ctx.where[primaryKey] - else + if (ctx.where && ctx.where[primaryKey]) + originId = ctx.where[primaryKey]; + else { originId = ctx.instance[primaryKey]; - } else { - if (ctx.instance) { - originId = ctx.instance.id; - } else { - originId = ctx.currentInstance.id; + changedModelId = ctx.instance.id; } + } else { + originId = ctx.currentInstance.id; + changedModelId = ctx.currentInstance.id; } - // This adds the originDescription field if it doesnt exists in the instances + // console.log(ctx.instance, ctx.where, ctx.currentInstance); - let originDescription = definition.settings.log.originDescription; - - if (originDescription && (!ctx.instance || !ctx.instance[originDescription])) - await Self.modelBuilder.models[definition.name].findById() - - if (ctx.hookState.oldInstance && !ctx.hookState.oldInstance[originDescription]){ - ctx.hookState.oldInstance[originDescription] = ctx.instance[originDescription]; - ctx.hookState.newInstance[originDescription] = ctx.instance[originDescription]; + // Sets the changedModelValue to save and the instances changed in case its an updateAll + let changedModelValue = definition.settings.log.changedModelValue; + if (changedModelValue && (!ctx.instance || !ctx.instance[changedModelValue])) { + var where = []; + changedModelId = []; + let changedInstances = await Self.modelBuilder.models[definition.name].find({where: ctx.where, fields: ['id', changedModelValue]}); + changedInstances.forEach(element => { + where.push(element[changedModelValue]); + changedModelId.push(element.id); + }); + } else if (ctx.hookState.oldInstance) { + where = ctx.instance[changedModelValue]; } + // console.log(where); - // This put some order in the intances putting the originDescription in first place - + // Set oldInstance, newInstance, userFk and action let oldInstance = {}; if (ctx.hookState.oldInstance) { - oldInstance[originDescription] = ctx.hookState.oldInstance[originDescription]; - delete ctx.hookState.oldInstance[originDescription]; Object.assign(oldInstance, ctx.hookState.oldInstance); } let newInstance = {}; if (ctx.hookState.newInstance) { - newInstance[originDescription] = ctx.hookState.newInstance[originDescription]; - delete ctx.hookState.newInstance[originDescription]; - Object.assign(newInstance, ctx.hookState.newInstance) + Object.assign(newInstance, ctx.hookState.newInstance); } - let userFk; - if (!loopBackContext) userFk = null; - else userFk = loopBackContext.active.accessToken.userId; + if (loopBackContext) + userFk = loopBackContext.active.accessToken.userId; let action = setActionType(ctx); - let logRecord = { originFk: originId, userFk: userFk, - model: ctx.Model.definition.name, action: action, + changedModel: ctx.Model.definition.name, + changedModelId: changedModelId, + changedModelValue: where, oldInstance: oldInstance, newInstance: newInstance }; + let logsToSave = setLogsToSave(where, changedModelId, logRecord); - let logModel = definition.settings.log.model - await Self.modelBuilder.models[logModel].create(logRecord); + let logModel = definition.settings.log.model; + + let transaction = {}; + if (ctx.options && ctx.options.transaction) { + transaction = ctx.options.transaction; + } + + // console.log(logsToSave); + await Self.modelBuilder.models[logModel].create(logsToSave, transaction); + } + + // this function retuns all the instances changed in case this is an updateAll + function setLogsToSave(changedInstances, changedInstancesIds, logRecord) { + let promises = []; + if (changedInstances && typeof changedInstances == "object") { + for (let i = 0; i < changedInstances.length; i++) { + logRecord.changedModelId = changedInstancesIds[i]; + logRecord.changedModelValue = changedInstances[i]; + promises.push(JSON.parse(JSON.stringify(logRecord))); + } + } else { + return logRecord; + } + return promises; } function setActionType(ctx) { let oldInstance = ctx.hookState.oldInstance; let newInstance = ctx.hookState.newInstance; - if (oldInstance && newInstance) { + if (oldInstance && newInstance) { return 'update'; } else if (!oldInstance && newInstance) { return 'insert'; } + return 'delete'; } };