refs #5900 Remove duplicated logs

modules/client/back/methods/client/confirmTransaction.js

@@ -19,9 +19,6 @@ module.exports = Self => {
     });
 
     Self.confirmTransaction = async(ctx, id, options) => {
-        const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-
         let tx;
         const myOptions = {userId: ctx.req.accessToken.userId};
 
@@ -34,29 +31,8 @@ module.exports = Self => {
         }
 
         try {
-            const oldTpvTransaction = await models.TpvTransaction.findById(id, null, myOptions);
-
             const confirm = await Self.rawSql('CALL hedera.tpvTransaction_confirmById(?)', [id], myOptions);
-
-            const tpvTransaction = await models.TpvTransaction.findById(id, null, myOptions);
-
-            const oldInstance = {status: oldTpvTransaction.status};
-            const newInstance = {status: tpvTransaction.status};
-
-            const logRecord = {
-                originFk: tpvTransaction.clientFk,
-                userFk: userId,
-                action: 'update',
-                changedModel: 'TpvTransaction',
-                changedModelId: id,
-                oldInstance: oldInstance,
-                newInstance: newInstance
-            };
-
-            await models.ClientLog.create(logRecord, myOptions);
-
             if (tx) await tx.commit();
-
             return confirm;
         } catch (e) {
             if (tx) await tx.rollback();

modules/client/back/methods/client/sendSms.js

@@ -30,34 +30,9 @@ module.exports = Self => {
         }
     });
 
-    Self.sendSms = async(ctx, id, destination, message, options) => {
+    Self.sendSms = async(ctx, id, destination, message) => {
         const models = Self.app.models;
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const userId = ctx.req.accessToken.userId;
-
         const sms = await models.Sms.send(ctx, destination, message);
-        const logRecord = {
-            originFk: id,
-            userFk: userId,
-            action: 'insert',
-            changedModel: 'sms',
-            newInstance: {
-                destinationFk: id,
-                destination: destination,
-                message: message,
-                statusCode: sms.statusCode,
-                status: sms.status
-            }
-        };
-
-        const clientLog = await models.ClientLog.create(logRecord, myOptions);
-
-        sms.logId = clientLog.id;
-
         return sms;
     };
 };

modules/client/back/methods/client/specs/sendSms.spec.js

@@ -13,10 +13,7 @@ describe('client sendSms()', () => {
 
             const sms = await models.Client.sendSms(ctx, id, destination, message, options);
 
-            const createdLog = await models.ClientLog.findById(sms.logId, null, options);
+            expect(sms).toBeDefined();
-            const json = JSON.parse(JSON.stringify(createdLog.newInstance));
-
-            expect(json.message).toEqual(message);
 
             await tx.rollback();
         } catch (e) {

modules/route/back/methods/route/specs/updateVolume.spec.js

@@ -31,18 +31,6 @@ describe('route updateVolume()', () => {
             const updatedRoute = await app.models.Route.findById(routeId, null, options);
 
             expect(updatedRoute.m3).not.toEqual(route.m3);
-
-            const logs = await app.models.RouteLog.find({
-                fields: ['id', 'newInstance']
-            }, options);
-
-            const m3Log = logs.filter(log => {
-                if (log.newInstance)
-                    return log.newInstance.m3 === updatedRoute.m3;
-            });
-
-            expect(m3Log.length).toEqual(1);
-
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

modules/route/back/methods/route/updateVolume.js

@@ -35,24 +35,9 @@ module.exports = Self => {
         }
 
         try {
-            const originalRoute = await models.Route.findById(id, null, myOptions);
-
             await Self.rawSql(`CALL vn.routeUpdateM3(?)`, [id], myOptions);
-
             const updatedRoute = await models.Route.findById(id, null, myOptions);
-
-            await models.RouteLog.create({
-                originFk: id,
-                userFk: userId,
-                action: 'update',
-                changedModel: 'Route',
-                changedModelId: id,
-                oldInstance: {m3: originalRoute.m3},
-                newInstance: {m3: updatedRoute.m3}
-            }, myOptions);
-
             if (tx) await tx.commit();
-
             return updatedRoute;
         } catch (e) {
             if (tx) await tx.rollback();

modules/ticket/back/methods/ticket-request/confirm.js

@@ -97,22 +97,6 @@ module.exports = Self => {
             });
             await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
 
-            const logRecord = {
-                originFk: sale.ticketFk,
-                userFk: userId,
-                action: 'update',
-                changedModel: 'ticketRequest',
-                newInstance: {
-                    destinationFk: sale.ticketFk,
-                    quantity: sale.quantity,
-                    concept: sale.concept,
-                    itemId: sale.itemFk,
-                    ticketId: sale.ticketFk,
-                }
-            };
-
-            await Self.app.models.TicketLog.create(logRecord, myOptions);
-
             if (tx) await tx.commit();
 
             return sale;

modules/ticket/back/methods/ticket/componentUpdate.js

@@ -242,16 +242,6 @@ module.exports = Self => {
                 const oldProperties = await loggable.translateValues(Self, changes.old);
                 const newProperties = await loggable.translateValues(Self, changes.new);
 
-                await models.TicketLog.create({
-                    originFk: args.id,
-                    userFk: userId,
-                    action: 'update',
-                    changedModel: 'Ticket',
-                    changedModelId: args.id,
-                    oldInstance: oldProperties,
-                    newInstance: newProperties
-                }, myOptions);
-
                 const salesPersonId = originalTicket.client().salesPersonFk;
                 if (salesPersonId) {
                     const origin = ctx.req.headers.origin;

modules/ticket/back/methods/ticket/merge.js

@@ -52,23 +52,10 @@ module.exports = Self => {
                 });
                 if (!ticket.originId || !ticket.destinationId) continue;
 
-                const ticketDestinationLogRecord = {
-                    originFk: ticket.destinationId,
-                    userFk: ctx.req.accessToken.userId,
-                    action: 'update',
-                    changedModel: 'Ticket',
-                    changedModelId: ticket.destinationId,
-                    changedModelValue: ticket.destinationId,
-                    oldInstance: {},
-                    newInstance: {mergedTicket: ticket.originId}
-                };
-
                 await models.Sale.updateAll({ticketFk: ticket.originId}, {ticketFk: ticket.destinationId}, myOptions);
-                if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions)) {
+                if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions))
-                    await models.TicketLog.create(ticketDestinationLogRecord, myOptions);
                     await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
             }
-            }
             if (tx)
                 await tx.commit();
         } catch (e) {

modules/ticket/back/methods/ticket/sendSms.js

@@ -30,54 +30,12 @@ module.exports = Self => {
         }
     });
 
-    Self.sendSms = async(ctx, id, destination, message, options) => {
+    Self.sendSms = async(ctx, id, destination, message) => {
         const models = Self.app.models;
-        const myOptions = {};
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        const userId = ctx.req.accessToken.userId;
-
-        try {
         const sms = await models.Sms.send(ctx, destination, message);
-
+        await models.TicketSms.create({
-            const newTicketSms = {
             ticketFk: id,
             smsFk: sms.id
-            };
+        });
-            await models.TicketSms.create(newTicketSms);
-
-            const logRecord = {
-                originFk: id,
-                userFk: userId,
-                action: 'insert',
-                changedModel: 'sms',
-                newInstance: {
-                    destinationFk: id,
-                    destination: destination,
-                    message: message,
-                    statusCode: sms.statusCode,
-                    status: sms.status
-                }
-            };
-
-            const ticketLog = await models.TicketLog.create(logRecord, myOptions);
-
-            sms.logId = ticketLog.id;
-
-            if (tx) await tx.commit();
-
-            return sms;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
     };
 };

modules/ticket/back/methods/ticket/specs/merge.spec.js

@@ -43,12 +43,10 @@ describe('ticket merge()', () => {
 
             await models.Ticket.merge(ctx, [tickets], options);
 
-            const createdTicketLog = await models.TicketLog.find({where: {originFk: tickets.destinationId}}, options);
             const deletedTicket = await models.Ticket.findOne({where: {id: tickets.originId}}, options);
             const salesTicketFuture = await models.Sale.find({where: {ticketFk: tickets.destinationId}}, options);
             const chatNotificationAfterMerge = await models.Chat.find(null, options);
 
-            expect(createdTicketLog.length).toEqual(1);
             expect(deletedTicket.isDeleted).toEqual(true);
             expect(salesTicketFuture.length).toEqual(2);
             expect(chatNotificationBeforeMerge.length).toEqual(chatNotificationAfterMerge.length - 2);

modules/ticket/back/methods/ticket/specs/sendSms.spec.js

@@ -12,19 +12,14 @@ describe('ticket sendSms()', () => {
             const destination = 222222222;
             const message = 'this is the message created in a test';
 
-            const sms = await models.Ticket.sendSms(ctx, id, destination, message, options);
+            await models.Ticket.sendSms(ctx, id, destination, message, options);
-
-            const createdLog = await models.TicketLog.findById(sms.logId, null, options);
 
             const filter = {
-                ticketFk: createdLog.originFk
+                ticketFk: id
             };
             const ticketSms = await models.TicketSms.findOne(filter, options);
 
-            const json = JSON.parse(JSON.stringify(createdLog.newInstance));
+            expect(ticketSms.ticketFk).toEqual(id);
-
-            expect(json.message).toEqual(message);
-            expect(ticketSms.ticketFk).toEqual(createdLog.originFk);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/methods/ticket/transferSales.js

@@ -84,13 +84,6 @@ module.exports = Self => {
 
             for (const sale of sales) {
                 const originalSale = map.get(sale.id);
-                const originalSaleData = { // <-- Loopback modifies original instance on save
-                    itemFk: originalSale.itemFk,
-                    quantity: originalSale.quantity,
-                    concept: originalSale.concept,
-                    ticketFk: originalSale.ticketFk
-                };
-
                 if (sale.quantity == originalSale.quantity) {
                     query = `UPDATE sale
                                 SET ticketFk = ?
@@ -100,48 +93,6 @@ module.exports = Self => {
                     await transferPartialSale(
                         ticketId, originalSale, sale, myOptions);
                 }
-
-                // Log to original ticket
-                await models.TicketLog.create({
-                    originFk: id,
-                    userFk: userId,
-                    action: 'update',
-                    changedModel: 'Sale',
-                    changedModelId: sale.id,
-                    oldInstance: {
-                        item: originalSaleData.itemFk,
-                        quantity: originalSaleData.quantity,
-                        concept: originalSaleData.concept,
-                        ticket: originalSaleData.ticketFk
-                    },
-                    newInstance: {
-                        item: sale.itemFk,
-                        quantity: sale.quantity,
-                        concept: sale.concept,
-                        ticket: ticketId
-                    }
-                }, myOptions);
-
-                // Log to destination ticket
-                await models.TicketLog.create({
-                    originFk: ticketId,
-                    userFk: userId,
-                    action: 'update',
-                    changedModel: 'Sale',
-                    changedModelId: sale.id,
-                    oldInstance: {
-                        item: originalSaleData.itemFk,
-                        quantity: originalSaleData.quantity,
-                        concept: originalSaleData.concept,
-                        ticket: originalSaleData.ticketFk
-                    },
-                    newInstance: {
-                        item: sale.itemFk,
-                        quantity: sale.quantity,
-                        concept: sale.concept,
-                        ticket: ticketId
-                    }
-                }, myOptions);
             }
 
             const isTicketEmpty = await models.Ticket.isEmpty(id, myOptions);

modules/ticket/back/models/ticket.js

@@ -1,30 +1,4 @@
-
-const LoopBackContext = require('loopback-context');
-
 module.exports = Self => {
     // Methods
     require('./ticket-methods')(Self);
-
-    Self.observe('before save', async function(ctx) {
-        const loopBackContext = LoopBackContext.getCurrentContext();
-        const httpCtx = loopBackContext.active;
-
-        if (ctx.isNewInstance) return;
-
-        let changes = ctx.data || ctx.instance;
-
-        if (changes.routeFk === null && ctx.currentInstance.routeFk != null) {
-            let instance = JSON.parse(JSON.stringify(ctx.currentInstance));
-            let userId = httpCtx.accessToken.userId;
-            let logRecord = {
-                originFk: ctx.currentInstance.routeFk,
-                userFk: userId,
-                action: 'delete',
-                changedModel: 'Route',
-                oldInstance: {ticket: instance.id},
-                newInstance: null
-            };
-            await Self.app.models.RouteLog.create(logRecord);
-        }
-    });
 };

modules/travel/back/methods/travel/cloneWithEntries.js

@@ -25,9 +25,7 @@ module.exports = Self => {
     });
 
     Self.cloneWithEntries = async(ctx, id) => {
-        const userId = ctx.req.accessToken.userId;
         const conn = Self.dataSource.connector;
-        const models = Self.app.models;
         const travel = await Self.findById(id, {
             fields: [
                 'id',
@@ -81,18 +79,6 @@ module.exports = Self => {
             ]
         });
 
-        const oldProperties = await loggable.translateValues(Self, travel);
-        const newProperties = await loggable.translateValues(Self, newTravel);
-        await models.TravelLog.create({
-            originFk: newTravel.id,
-            userFk: userId,
-            action: 'insert',
-            changedModel: 'Travel',
-            changedModelId: newTravel.id,
-            oldInstance: oldProperties,
-            newInstance: newProperties
-        });
-
         return newTravel.id;
     };
 };

modules/travel/back/methods/travel/deleteThermograph.js

@@ -30,24 +30,8 @@ module.exports = Self => {
                 SET travelFk = NULL, dmsFk = NULL
             WHERE id = ?`, [id], {userId});
 
-        const oldInstance = {
-            travelFk: travelThermograph.travelFk,
-            dmsFk: travelThermograph.dmsFk
-        };
-
-        await models.TravelLog.create({
-            originFk: travelThermograph.travelFk,
-            userFk: userId,
-            action: 'delete',
-            changedModel: 'TravelThermograph',
-            changedModelId: id,
-            oldInstance: oldInstance,
-            newInstance: {}
-        });
-
         travelThermograph.travelFk = null;
         travelThermograph.dmsFk = null;
-
         return travelThermograph;
     };
 };

modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js

@@ -40,7 +40,6 @@ module.exports = Self => {
     Self.updateWorkerTimeControlMail = async(ctx, options) => {
         const models = Self.app.models;
         const args = ctx.args;
-        const userId = ctx.req.accessToken.userId;
 
         const myOptions = {};
 
@@ -57,9 +56,6 @@ module.exports = Self => {
 
         if (!workerTimeControlMail) throw new UserError(`There aren't records for this week`);
 
-        const oldState = workerTimeControlMail.state;
-        const oldReason = workerTimeControlMail.reason;
-
         await workerTimeControlMail.updateAttributes({
             state: args.state,
             reason: args.reason || null
@@ -70,22 +66,5 @@ module.exports = Self => {
                 sendedCounter: workerTimeControlMail.sendedCounter + 1
             }, myOptions);
         }
-
-        const logRecord = {
-            originFk: args.workerId,
-            userFk: userId,
-            action: 'update',
-            changedModel: 'WorkerTimeControlMail',
-            oldInstance: {
-                state: oldState,
-                reason: oldReason
-            },
-            newInstance: {
-                state: args.state,
-                reason: args.reason
-            }
-        };
-
-        return models.WorkerLog.create(logRecord, myOptions);
     };
 };