loopback/common/methods/vn-model/specs/crud.spec.js

@@ -1,6 +1,20 @@
 const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
 
 describe('Model crud()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     let insertId;
     const barcodeModel = app.models.ItemBarcode;
 

loopback/common/methods/vn-model/specs/rewriteDbError.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('Model rewriteDbError()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should extend rewriteDbError properties to any model passed', () => {
         const exampleModel = models.ItemTag;
 

loopback/server/connectors/vn-mysql.js

@@ -1,41 +1,9 @@
 const mysql = require('mysql');
 const MySQL = require('loopback-connector-mysql').MySQL;
 const EnumFactory = require('loopback-connector-mysql').EnumFactory;
-const { Transaction, SQLConnector, ParameterizedSQL } = require('loopback-connector');
+const {Transaction, SQLConnector, ParameterizedSQL} = require('loopback-connector');
 const fs = require('fs');
 
-const limitSet = new Set([
-    'save',
-    'updateOrCreate',
-    'replaceOrCreate',
-    'replaceById',
-    'update'
-]);
-
-const opOpts = {
-    update: [
-        'update',
-        'replaceById',
-        // |insert
-        'save',
-        'updateOrCreate',
-        'replaceOrCreate'
-    ],
-    delete: [
-        'destroy',
-        'destroyAll'
-    ],
-    insert: [
-        'create'
-    ]
-};
-
-const opMap = new Map();
-for (const op in opOpts) {
-    for (const met of opOpts[op])
-        opMap.set(met, op);
-}
-
 class VnMySQL extends MySQL {
     /**
      * Promisified version of execute().
@@ -253,49 +221,49 @@ class VnMySQL extends MySQL {
     }
 
     create(model, data, opts, cb) {
-        const ctx = { data };
+        const ctx = {data};
         this.invokeMethod('create',
             arguments, model, ctx, opts, cb);
     }
 
     createAll(model, data, opts, cb) {
-        const ctx = { data };
+        const ctx = {data};
         this.invokeMethod('createAll',
             arguments, model, ctx, opts, cb);
     }
 
     save(model, data, opts, cb) {
-        const ctx = { data };
+        const ctx = {data};
         this.invokeMethod('save',
             arguments, model, ctx, opts, cb);
     }
 
     updateOrCreate(model, data, opts, cb) {
-        const ctx = { data };
+        const ctx = {data};
         this.invokeMethod('updateOrCreate',
             arguments, model, ctx, opts, cb);
     }
 
     replaceOrCreate(model, data, opts, cb) {
-        const ctx = { data };
+        const ctx = {data};
         this.invokeMethod('replaceOrCreate',
             arguments, model, ctx, opts, cb);
     }
 
     destroyAll(model, where, opts, cb) {
-        const ctx = { where };
+        const ctx = {where};
         this.invokeMethod('destroyAll',
             arguments, model, ctx, opts, cb);
     }
 
     update(model, where, data, opts, cb) {
-        const ctx = { where, data };
+        const ctx = {where, data};
         this.invokeMethod('update',
             arguments, model, ctx, opts, cb);
     }
 
     replaceById(model, id, data, opts, cb) {
-        const ctx = { id, data };
+        const ctx = {id, data};
         this.invokeMethod('replaceById',
             arguments, model, ctx, opts, cb);
     }
@@ -316,47 +284,16 @@ class VnMySQL extends MySQL {
 
     async invokeMethodP(method, args, model, ctx, opts) {
         const Model = this.getModelDefinition(model).model;
-        const settings = Model.definition.settings;
         let tx;
         if (!opts.transaction) {
             tx = await Transaction.begin(this, {});
-            opts = Object.assign({ transaction: tx, httpCtx: opts.httpCtx }, opts);
+            opts = Object.assign({transaction: tx, httpCtx: opts.httpCtx}, opts);
         }
 
         try {
-            // Fetch old values (update|delete) or login
+            const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
-            let where, id, data, idName, limit, op, oldInstances, newInstances;
+            const user = await Model.app.models.Account.findById(userId, {fields: ['name']}, opts);
-            const hasGrabUser = settings.log && settings.log.grabUser;
+            await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts);
-            if (hasGrabUser) {
-                const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
-                const user = await Model.app.models.Account.findById(userId, { fields: ['name'] }, opts);
-                await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts);
-            }
-            else {
-                where = ctx.where;
-                id = ctx.id;
-                data = ctx.data;
-                idName = this.idName(model);
-
-                limit = limitSet.has(method);
-
-                op = opMap.get(method);
-
-                if (!where) {
-                    if (id) where = { [idName]: id };
-                    else where = { [idName]: data[idName] };
-                }
-
-                // Fetch old values
-                switch (op) {
-                    case 'update':
-                    case 'delete':
-                        // Single entity operation
-                        const stmt = this.buildSelectStmt(op, data, idName, model, where, limit);
-                        stmt.merge(`FOR UPDATE`);
-                        oldInstances = await this.executeStmt(stmt, opts);
-                }
-            }
 
             const res = await new Promise(resolve => {
                 const fnArgs = args.slice(0, -2);
@@ -364,38 +301,7 @@ class VnMySQL extends MySQL {
                 super[method].apply(this, fnArgs);
             });
 
-            if (hasGrabUser)
+            await this.executeP(`CALL account.myUser_logout()`, null, opts);
-                await this.executeP(`CALL account.myUser_logout()`, null, opts);
-            else {
-                // Fetch new values
-                const ids = [];
-
-                switch (op) {
-                    case 'insert':
-                    case 'update': {
-                        switch (method) {
-                            case 'createAll':
-                                for (const row of res[1])
-                                    ids.push(row[idName]);
-                                break;
-                            case 'create':
-                                ids.push(res[1]);
-                                break;
-                            case 'update':
-                                if (data[idName] != null)
-                                    ids.push(data[idName]);
-                                break;
-                        }
-
-                        const newWhere = ids.length ? { [idName]: ids } : where;
-
-                        const stmt = this.buildSelectStmt(op, data, idName, model, newWhere, limit);
-                        newInstances = await this.executeStmt(stmt, opts);
-                    }
-                }
-
-                await this.createLogRecord(oldInstances, newInstances, model, opts);
-            }
             if (tx) await tx.commit();
             return res;
         } catch (err) {
@@ -403,125 +309,6 @@ class VnMySQL extends MySQL {
             throw err;
         }
     }
-
-    buildSelectStmt(op, data, idName, model, where, limit) {
-        const Model = this.getModelDefinition(model).model;
-        const properties = Object.keys(Model.definition.properties);
-
-        const fields = data ? Object.keys(data) : [];
-        if (op == 'delete')
-            properties.forEach(property => fields.push(property));
-        else {
-            const log = Model.definition.settings.log;
-            fields.push(idName);
-            if (log.relation) fields.push(Model.relations[log.relation].keyFrom);
-            if (log.showField) fields.push(log.showField);
-            else {
-                const showFieldNames = ['name', 'description', 'code', 'nickname'];
-                for (const field of showFieldNames) {
-                    if (properties.includes(field)) {
-                        log.showField = field;
-                        fields.push(field);
-                        break;
-                    }
-                }
-            }
-        }
-
-        const stmt = new ParameterizedSQL(
-            'SELECT ' +
-            this.buildColumnNames(model, { fields }) +
-            ' FROM ' +
-            this.tableEscaped(model)
-        );
-        stmt.merge(this.buildWhere(model, where));
-        if (limit) stmt.merge(`LIMIT 1`);
-
-        return stmt;
-    }
-
-    async createLogRecord(oldInstances, newInstances, model, opts) {
-        function setActionType() {
-            if (oldInstances && newInstances)
-                return 'update';
-            else if (!oldInstances && newInstances)
-                return 'insert';
-            return 'delete';
-        }
-
-        const action = setActionType();
-        if (!newInstances && action != 'delete') return;
-
-        const Model = this.getModelDefinition(model).model;
-        const models = Model.app.models;
-        const definition = Model.definition;
-        const log = definition.settings.log;
-
-        const primaryKey = this.idName(model);
-        const originRelation = log.relation;
-        const originFkField = originRelation
-            ? Model.relations[originRelation].keyFrom
-            : primaryKey;
-
-        // Prevent adding logs when deleting a principal entity (Client, Zone...)
-        if (action == 'delete' && !originRelation) return;
-
-        function map(instances) {
-            const map = new Map();
-            if (!instances) return;
-            for (const instance of instances)
-                map.set(instance[primaryKey], instance);
-            return map;
-        }
-
-        const changedModel = definition.name;
-        const userFk = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
-        const oldMap = map(oldInstances);
-        const newMap = map(newInstances);
-        const ids = (oldMap || newMap).keys();
-
-        const logEntries = [];
-
-        function insertValuesLogEntry(logEntry, instance) {
-            logEntry.originFk = instance[originFkField];
-            logEntry.changedModelId = instance[primaryKey];
-            if (log.showField) logEntry.changedModelValue = instance[log.showField];
-        }
-
-        for (const id of ids) {
-            const oldI = oldMap && oldMap.get(id);
-            const newI = newMap && newMap.get(id);
-
-            const logEntry = {
-                action,
-                userFk,
-                changedModel,
-            };
-
-            if (newI) {
-                insertValuesLogEntry(logEntry, newI);
-                // Delete unchanged properties
-                if (oldI) {
-                    Object.keys(oldI).forEach(prop => {
-                        const hasChanges = oldI[prop] instanceof Date ?
-                            oldI[prop]?.getTime() != newI[prop]?.getTime() :
-                            oldI[prop] != newI[prop];
-
-                        if (!hasChanges) {
-                            delete oldI[prop];
-                            delete newI[prop];
-                        }
-                    });
-                }
-            } else
-                insertValuesLogEntry(logEntry, oldI);
-
-            logEntry.oldInstance = oldI;
-            logEntry.newInstance = newI;
-            logEntries.push(logEntry);
-        }
-        await models[log.model].create(logEntries, opts);
-    }
 }
 
 exports.VnMySQL = VnMySQL;
@@ -542,7 +329,7 @@ exports.initialize = function initialize(dataSource, callback) {
 
     if (callback) {
         if (dataSource.settings.lazyConnect) {
-            process.nextTick(function () {
+            process.nextTick(function() {
                 callback();
             });
         } else
@@ -550,13 +337,13 @@ exports.initialize = function initialize(dataSource, callback) {
     }
 };
 
-MySQL.prototype.connect = function (callback) {
+MySQL.prototype.connect = function(callback) {
     const self = this;
     const options = generateOptions(this.settings);
 
     if (this.client) {
         if (callback) {
-            process.nextTick(function () {
+            process.nextTick(function() {
                 callback(null, self.client);
             });
         }
@@ -565,7 +352,7 @@ MySQL.prototype.connect = function (callback) {
 
     function connectionHandler(options, callback) {
         const client = mysql.createPool(options);
-        client.getConnection(function (err, connection) {
+        client.getConnection(function(err, connection) {
             const conn = connection;
             if (!err) {
                 if (self.debug)
@@ -645,30 +432,27 @@ function generateOptions(settings) {
     return options;
 }
 
-
 SQLConnector.prototype.all = function find(model, filter, options, cb) {
     const self = this;
     // Order by id if no order is specified
     filter = filter || {};
     const stmt = this.buildSelect(model, filter, options);
-    this.execute(stmt.sql, stmt.params, options, function (err, data) {
+    this.execute(stmt.sql, stmt.params, options, function(err, data) {
-        if (err) {
+        if (err)
             return cb(err, []);
-        }
 
         try {
-            const objs = data.map(function (obj) {
+            const objs = data.map(function(obj) {
                 return self.fromRow(model, obj);
             });
             if (filter && filter.include) {
                 self.getModelDefinition(model).model.include(
                     objs, filter.include, options, cb,
                 );
-            } else {
+            } else
                 cb(null, objs);
-            }
         } catch (error) {
-            cb(error, [])
+            cb(error, []);
         }
     });
-};
+};

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -1,6 +1,20 @@
 const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
 
 describe('Update Claim', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     const newDate = Date.vnNew();
     const originalData = {
         ticketFk: 3,

modules/claim/back/methods/claim/specs/updateClaimAction.spec.js

@@ -1,6 +1,20 @@
 const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
 
 describe('Update Claim', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     const newDate = Date.vnNew();
     const original = {
         ticketFk: 3,

modules/claim/back/models/claim-beginning.json

@@ -1,11 +1,6 @@
 {
     "name": "ClaimBeginning",
     "base": "Loggable",
-    "log": {
-      "model": "ClaimLog",
-      "relation": "claim",
-      "showField": "quantity"
-    },
     "options": {
         "mysql": {
             "table": "claimBeginning"

modules/claim/back/models/claim-development.json

@@ -1,10 +1,6 @@
 {
     "name": "ClaimDevelopment",
     "base": "Loggable",
-    "log": {
-      "model": "ClaimLog",
-      "relation": "claim"
-    },
     "options": {
         "mysql": {
             "table": "claimDevelopment"

modules/claim/back/models/claim-dms.json

@@ -1,18 +1,14 @@
 {
     "name": "ClaimDms",
     "base": "Loggable",
-    "log": {
-        "model": "ClaimLog",
-        "relation": "claim"
-    },
     "options": {
         "mysql": {
             "table": "claimDms"
         }
     },
     "allowedContentTypes": [
-        "image/png", 
+        "image/png",
-        "image/jpeg", 
+        "image/jpeg",
         "image/jpg"
     ],
     "properties": {
@@ -34,4 +30,4 @@
             "foreignKey": "dmsFk"
         }
     }
-}
+}

modules/claim/back/models/claim-end.json

@@ -1,10 +1,6 @@
 {
     "name": "ClaimEnd",
     "base": "Loggable",
-    "log": {
-      "model": "ClaimLog",
-      "relation": "claim"
-    },
     "options": {
         "mysql": {
             "table": "claimEnd"

modules/claim/back/models/claim-observation.json

@@ -1,10 +1,6 @@
 {
     "name": "ClaimObservation",
     "base": "Loggable",
-    "log": {
-      "model": "ClaimLog",
-      "relation": "claim"
-    },
     "options": {
         "mysql": {
             "table": "claimObservation"
@@ -40,4 +36,4 @@
             "foreignKey": "claimFk"
         }
     }
-}
+}

modules/claim/back/models/claim-state.json

@@ -1,11 +1,6 @@
 {
     "name": "ClaimState",
     "base": "Loggable",
-    "log": {
-        "model": "ClaimLog",
-        "relation": "claim",
-        "showField": "description"
-    },
     "options": {
         "mysql": {
             "table": "claimState"

modules/claim/back/models/claim.json

@@ -1,10 +1,6 @@
 {
     "name": "Claim",
     "base": "Loggable",
-    "log": {
-      "model": "ClaimLog",
-      "showField": "id"
-    },
     "options": {
         "mysql": {
             "table": "claim"

modules/client/back/models/address.json

@@ -2,11 +2,6 @@
     "name": "Address",
     "description": "Client addresses",
     "base": "Loggable",
-    "log": {
-        "model": "ClientLog",
-        "relation": "client",
-        "showField": "nickname"
-    },
     "options": {
         "mysql": {
             "table": "address"
@@ -88,4 +83,4 @@
             "foreignKey": "customsAgentFk"
         }
     }
-}
+}

modules/client/back/models/client-contact.json

@@ -2,11 +2,6 @@
     "name": "ClientContact",
     "description": "Client phone contacts",
     "base": "Loggable",
-    "log": {
-        "model": "ClientLog",
-        "relation": "client",
-        "showField": "name"
-    },
     "options": {
         "mysql": {
             "table": "clientContact"
@@ -33,4 +28,4 @@
             "foreignKey": "clientFk"
         }
     }
-}
+}

modules/client/back/models/client-dms.json

@@ -1,11 +1,6 @@
 {
     "name": "ClientDms",
     "base": "Loggable",
-	"log": {
-        "model":"ClientLog",
-        "relation": "client",
-        "showField": "dmsFk"
-    },
     "options": {
         "mysql": {
             "table": "clientDms"

modules/client/back/models/client-observation.json

@@ -2,10 +2,6 @@
   	"name": "ClientObservation",
 	"description": "Client notes",
 	"base": "Loggable",
-	"log": {
-		"model": "ClientLog",
-		"relation": "client"
-	},
 	"options": {
 		"mysql": {
 			"table": "clientObservation"

modules/client/back/models/client-sample.json

@@ -1,11 +1,6 @@
 {
     "name": "ClientSample",
     "base": "Loggable",
-    "log": {
-      "model": "ClientLog",
-      "relation": "client",
-      "showField": "type"
-    },
     "options": {
         "mysql": {
         "table": "clientSample"

modules/client/back/models/client.json

@@ -1,10 +1,6 @@
 {
 	"name": "Client",
 	"base": "Loggable",
-	"log": {
-		"model":"ClientLog",
-		"showField": "id"
-	},
 	"options": {
 		"mysql": {
 			"table": "client"
@@ -260,4 +256,4 @@
             }
         }
     }
-}
+}

modules/client/back/models/greuge.json

@@ -1,11 +1,6 @@
 {
     "name": "Greuge",
     "base": "Loggable",
-    "log": {
-        "model": "ClientLog",
-        "relation": "client",
-        "showField": "description"
-    },
     "options": {
         "mysql": {
             "table": "greuge"
@@ -58,4 +53,4 @@
             "foreignKey": "userFk"
         }
     }
-}
+}

modules/client/back/models/recovery.json

@@ -1,10 +1,6 @@
 {
     "name": "Recovery",
     "base": "Loggable",
-    "log": {
-        "model": "ClientLog",
-        "relation": "client"
-    },
     "options": {
         "mysql": {
             "table": "recovery"
@@ -38,4 +34,4 @@
             "foreignKey": "clientFk"
         }
     }
-}
+}

modules/entry/back/models/buy.json

@@ -1,11 +1,6 @@
 {
     "name": "Buy",
     "base": "Loggable",
-    "log": {
-        "model": "EntryLog",
-        "relation": "entry",
-        "grabUser": true
-      },
     "options": {
         "mysql": {
         "table": "buy"

modules/entry/back/models/entry-observation.json

@@ -1,10 +1,6 @@
 {
     "name": "EntryObservation",
     "base": "Loggable",
-    "log": {
-      "model": "EntryLog",
-      "relation": "entry"
-    },
     "options": {
         "mysql": {
             "table": "entryObservation"

modules/entry/back/models/entry.json

@@ -1,10 +1,6 @@
 {
     "name": "Entry",
     "base": "Loggable",
-    "log": {
-        "model":"EntryLog",
-        "grabUser": true
-	},
     "options": {
         "mysql": {
             "table": "entry"

modules/invoiceIn/back/methods/invoice-in/specs/clone.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('invoiceIn clone()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should return the cloned invoiceIn and also clone invoiceInDueDays and invoiceInTaxes if there are any referencing the invoiceIn', async() => {
         const userId = 1;
         const ctx = {

modules/invoiceIn/back/models/invoice-in-tax.json

@@ -1,10 +1,6 @@
 {
     "name": "InvoiceInTax",
     "base": "Loggable",
-    "log": {
-        "model": "InvoiceInLog",
-        "relation": "invoiceIn"
-    },
     "options": {
         "mysql": {
             "table": "invoiceInTax"
@@ -55,4 +51,4 @@
             "foreignKey": "transactionTypeSageFk"
         }
     }
-}
+}

modules/invoiceIn/back/models/invoice-in.json

@@ -1,9 +1,6 @@
 {
     "name": "InvoiceIn",
     "base": "Loggable",
-    "log": {
-        "model": "InvoiceInLog"
-    },
     "options": {
         "mysql": {
             "table": "invoiceIn"

modules/item/back/methods/item/specs/updateTaxes.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('item updateTaxes()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should throw an error if the taxClassFk is blank', async() => {
         const tx = await models.Item.beginTransaction({});
         const options = {transaction: tx};

modules/item/back/methods/tag/specs/onSubmit.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('tag onSubmit()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should delete a tag', async() => {
         const tx = await models.Item.beginTransaction({});
         const options = {transaction: tx};

modules/item/back/models/item-barcode.json

@@ -1,11 +1,6 @@
 {
   "name": "ItemBarcode",
   "base": "Loggable",
-  "log": {
-    "model": "ItemLog",
-    "relation": "item",
-    "showField": "code"
-  },
   "options": {
       "mysql": {
         "table": "itemBarcode"
@@ -27,6 +22,6 @@
       "type": "belongsTo",
       "model": "Item",
       "foreignKey": "itemFk"
-    }     
+    }
   }
 }

modules/item/back/models/item-botanical.json

@@ -1,10 +1,6 @@
 {
     "name": "ItemBotanical",
     "base": "Loggable",
-    "log": {
-      "model": "ItemLog",
-      "relation": "item"
-    },
     "options": {
         "mysql": {
           "table": "itemBotanical"
@@ -34,4 +30,4 @@
             "foreignKey": "specieFk"
         }
     }
-}
+}

modules/item/back/models/item-tag.json

@@ -1,11 +1,6 @@
 {
     "name": "ItemTag",
     "base": "Loggable",
-    "log": {
-        "model": "ItemLog",
-        "relation": "item",
-        "showField": "value"
-    },
     "options": {
         "mysql": {
             "table": "itemTag"

modules/item/back/models/item-tax-country.json

@@ -1,11 +1,6 @@
 {
     "name": "ItemTaxCountry",
     "base": "Loggable",
-    "log": {
-        "model": "ItemLog",
-        "relation": "item",
-        "showField": "countryFk"
-    },
     "options": {
         "mysql": {
           "table": "itemTaxCountry"
@@ -47,4 +42,4 @@
             "foreignKey": "taxClassFk"
         }
     }
-}
+}

modules/item/back/models/item.json

@@ -1,11 +1,6 @@
 {
     "name": "Item",
     "base": "Loggable",
-    "log": {
-        "model": "ItemLog",
-        "showField": "id",
-        "grabUser": true
-    },
     "options": {
         "mysql": {
             "table": "item"

modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js

@@ -1,6 +1,20 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('AgencyTerm createInvoiceIn()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     const rows = [
         {
             routeFk: 2,

modules/route/back/models/route.json

@@ -1,10 +1,6 @@
 {
     "name": "Route",
 	"base": "Loggable",
-	"log": {
-		"model":"RouteLog",
-        "grabUser": true
-	},
     "options": {
         "mysql": {
             "table": "route"

modules/shelving/back/models/shelving.json

@@ -1,10 +1,6 @@
 {
     "name": "Shelving",
 	"base": "Loggable",
-    "log": {
-        "model": "ShelvingLog",
-        "showField": "id"
-    },
     "options": {
         "mysql": {
             "table": "shelving"

modules/supplier/back/models/supplier-account.json

@@ -1,10 +1,6 @@
 {
     "name": "SupplierAccount",
     "base": "Loggable",
-    "log": {
-        "model":"SupplierLog",
-        "relation": "supplier"
-	},
     "options": {
         "mysql": {
             "table": "supplierAccount"
@@ -35,4 +31,4 @@
 			"foreignKey": "bankEntityFk"
 		}
     }
-}
+}

modules/supplier/back/models/supplier-address.json

@@ -2,11 +2,6 @@
     "name": "SupplierAddress",
     "description": "Supplier addresses",
     "base": "Loggable",
-    "log": {
-        "model": "SupplierLog",
-        "relation": "supplier",
-        "showField": "name"
-    },
     "options": {
         "mysql": {
             "table": "supplierAddress"
@@ -52,4 +47,4 @@
             "foreignKey": "supplierFk"
         }
     }
-}
+}

modules/supplier/back/models/supplier-contact.json

@@ -1,10 +1,6 @@
 {
     "name": "SupplierContact",
     "base": "Loggable",
-    "log": {
-        "model":"SupplierLog",
-        "relation": "supplier"
-	},
     "options": {
         "mysql": {
             "table": "supplierContact"
@@ -50,4 +46,4 @@
         "permission": "ALLOW"
         }
     ]
-}
+}

modules/supplier/back/models/supplier.json

@@ -1,9 +1,6 @@
 {
     "name": "Supplier",
     "base": "Loggable",
-    "log": {
-        "model":"SupplierLog"
-	},
     "options": {
         "mysql": {
             "table": "supplier"

modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('ticket deleteExpeditions()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should delete the selected expeditions', async() => {
         const tx = await models.Expedition.beginTransaction({});
 

modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('ticket moveExpeditions()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should move the selected expeditions to new ticket', async() => {
         const tx = await models.Expedition.beginTransaction({});
         const ctx = {

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

@@ -1,6 +1,20 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('ticket-request confirm()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     let ctx = {
         req: {
             accessToken: {userId: 9},

modules/ticket/back/methods/ticket-request/specs/deny.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('ticket-request deny()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should return the denied ticket request', async() => {
         const tx = await models.TicketRequest.beginTransaction({});
 

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

@@ -17,6 +17,17 @@ describe('ticket componentUpdate()', () => {
     let componentValue;
 
     beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
         const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
         deliveryComponentId = deliveryComponenet.id;
         componentOfSaleSeven = `SELECT value
@@ -180,9 +191,6 @@ describe('ticket componentUpdate()', () => {
                 }
             };
 
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-                active: ctx.req
-            });
             const oldTicket = await models.Ticket.findById(ticketID, null, options);
 
             await models.Ticket.componentUpdate(ctx, options);

modules/ticket/back/models/expedition.json

@@ -1,10 +1,6 @@
 {
     "name": "Expedition",
     "base": "Loggable",
-    "log": {
-      "model": "TicketLog",
-      "relation": "ticket"
-    },
     "options": {
         "mysql": {
           "table": "expedition"
@@ -59,4 +55,3 @@
       }
     }
   }
-  

modules/ticket/back/models/sale.json

@@ -1,12 +1,6 @@
 {
     "name": "Sale",
     "base": "Loggable",
-    "log": {
-      "model": "TicketLog",
-      "relation": "ticket",
-      "showField": "concept",
-      "grabUser": true
-    },
     "options": {
         "mysql": {
         "table": "sale"

modules/ticket/back/models/specs/ticket-packaging.spec.js

@@ -1,6 +1,20 @@
 const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
 
 describe('ticket model TicketTracking', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     let ticketTrackingId;
 
     afterAll(async() => {

modules/ticket/back/models/ticket-dms.json

@@ -1,10 +1,6 @@
 {
     "name": "TicketDms",
     "base": "Loggable",
-    "log": {
-        "model": "TicketLog",
-        "relation": "ticket"
-    },
     "options": {
         "mysql": {
             "table": "ticketDms"
@@ -29,4 +25,4 @@
             "foreignKey": "dmsFk"
         }
     }
-}
+}

modules/ticket/back/models/ticket-observation.json

@@ -1,10 +1,6 @@
 {
     "name": "TicketObservation",
     "base": "Loggable",
-    "log": {
-      "model": "TicketLog",
-      "relation": "ticket"
-    },
     "options": {
         "mysql": {
             "table": "ticketObservation"

modules/ticket/back/models/ticket-packaging.json

@@ -1,10 +1,6 @@
 {
     "name": "TicketPackaging",
     "base": "Loggable",
-    "log": {
-        "model": "TicketLog",
-        "relation": "ticket"
-    },
     "options": {
         "mysql": {
             "table": "ticketPackaging"

modules/ticket/back/models/ticket-refund.json

@@ -6,10 +6,6 @@
             "table": "ticketRefund"
         }
     },
-    "log": {
-        "model": "TicketLog",
-        "relation": "originalTicket"
-    },
     "properties": {
         "id": {
             "id": true,

modules/ticket/back/models/ticket-request.json

@@ -1,10 +1,6 @@
 {
     "name": "TicketRequest",
     "base": "Loggable",
-    "log": {
-      "model": "TicketLog",
-      "relation": "ticket"
-    },
     "options": {
         "mysql": {
         "table": "ticketRequest"
@@ -64,4 +60,4 @@
             "foreignKey": "itemFk"
         }
     }
-}
+}

modules/ticket/back/models/ticket-service.json

@@ -1,11 +1,6 @@
 {
     "name": "TicketService",
     "base": "Loggable",
-    "log": {
-        "model": "TicketLog",
-        "relation": "ticket",
-        "showField": "description"
-    },
     "options": {
         "mysql": {
             "table": "ticketService"
@@ -59,4 +54,4 @@
             "foreignKey": "ticketServiceTypeFk"
         }
     }
-}
+}

modules/ticket/back/models/ticket-tracking.json

@@ -1,16 +1,11 @@
 {
     "name": "TicketTracking",
     "base": "Loggable",
-    "log": {
+    "options": {
-        "model": "TicketLog",
+        "mysql": {
-        "relation": "ticket",
+            "table": "ticketTracking"
-        "showField": "stateFk"
+        }
-        },
+    },
-        "options": {
-            "mysql": {
-                "table": "ticketTracking"
-            }
-        },
     "properties": {
         "id": {
                 "id": true,
@@ -48,4 +43,3 @@
         }
     }
 }
-  

modules/ticket/back/models/ticket-weekly.json

@@ -1,11 +1,6 @@
 {
     "name": "TicketWeekly",
     "base": "Loggable",
-    "log": {
-      "model": "TicketLog",
-      "relation": "ticket",
-      "showField": "ticketFk"
-    },
     "options": {
         "mysql": {
             "table": "ticketWeekly"
@@ -32,4 +27,4 @@
             "foreignKey": "agencyModeFk"
         }
     }
-}
+}

modules/ticket/back/models/ticket.json

@@ -1,11 +1,6 @@
 {
     "name": "Ticket",
 	"base": "Loggable",
-	"log": {
-		"model":"TicketLog",
-        "showField": "id",
-        "grabUser": true
-	},
     "options": {
         "mysql": {
         "table": "ticket"

modules/travel/back/methods/travel/specs/createThermograph.spec.js

@@ -1,6 +1,20 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('Travel createThermograph()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     const travelId = 3;
     const currentUserId = 1102;
     const thermographId = '138350-0';

modules/travel/back/models/travel-thermograph.json

@@ -1,14 +1,9 @@
 {
     "name": "TravelThermograph",
     "base": "Loggable",
-    "log": {
-        "model":"TravelLog",
-        "relation": "travel",
-        "showField": "ref"
-	},
     "options": {
         "mysql": {
-        "table": "travelThermograph"
+            "table": "travelThermograph"
         }
     },
     "properties": {

modules/travel/back/models/travel.json

@@ -1,11 +1,6 @@
 {
     "name": "Travel",
 	"base": "Loggable",
-	"log": {
-		"model":"TravelLog",
-        "showField": "ref",
-        "grabUser": true
-	},
     "options": {
         "mysql": {
             "table": "travel"

modules/worker/back/models/worker-dms.json

@@ -1,11 +1,6 @@
 {
     "name": "WorkerDms",
     "base": "Loggable",
-	"log": {
-        "model":"ClientLog",
-        "relation": "worker",
-        "showField": "dmsFk"
-    },
     "options": {
         "mysql": {
             "table": "workerDocument"

modules/worker/back/models/worker.json

@@ -2,10 +2,6 @@
     "name": "Worker",
     "description": "Company employees",
     "base": "Loggable",
-    "log": {
-        "model":"WorkerLog",
-        "showField": "firstName"
-	},
     "options": {
         "mysql": {
             "table": "worker"

modules/zone/back/methods/zone/specs/clone.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('agency clone()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should clone a zone', async() => {
         const tx = await models.Zone.beginTransaction({});
 

modules/zone/back/methods/zone/specs/exclusionGeo.spec.js

@@ -1,6 +1,20 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('zone exclusionGeo()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
     const zoneId = 1;
     const today = Date.vnNew();
 

modules/zone/back/methods/zone/specs/toggleIsIncluded.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('zone toggleIsIncluded()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should return the created location with isIncluded true', async() => {
         const tx = await models.Zone.beginTransaction({});
 

modules/zone/back/models/zone-event.json

@@ -1,10 +1,6 @@
 {
 	"name": "ZoneEvent",
 	"base": "Loggable",
-	"log": {
-		"model":"ZoneLog",
-        "relation": "zone"
-	},
 	"options": {
 		"mysql": {
 			"table": "zoneEvent"
@@ -57,4 +53,4 @@
             "foreignKey": "zoneFk"
         }
     }
-}
+}

modules/zone/back/models/zone-exclusion.json

@@ -1,10 +1,6 @@
 {
 	"name": "ZoneExclusion",
 	"base": "Loggable",
-	"log": {
-		"model":"ZoneLog",
-        "relation": "zone"
-	},
 	"options": {
 		"mysql": {
 			"table": "zoneExclusion"
@@ -27,4 +23,4 @@
             "foreignKey": "zoneFk"
         }
     }
-}
+}

modules/zone/back/models/zone-included.json

@@ -1,11 +1,6 @@
 {
 	"name": "ZoneIncluded",
 	"base": "Loggable",
-	"log": {
-        "model": "ZoneLog",
-		"relation": "zone",
-		"showField": "isIncluded"
-    },
 	"options": {
 		"mysql": {
 			"table": "zoneIncluded"
@@ -32,4 +27,4 @@
             "foreignKey": "geoFk"
         }
     }
-}
+}

modules/zone/back/models/zone-warehouse.json

@@ -1,10 +1,6 @@
 {
 	"name": "ZoneWarehouse",
 	"base": "Loggable",
-	"log": {
-		"model":"ZoneLog",
-        "relation": "zone"
-	},
 	"options": {
 		"mysql": {
 			"table": "zoneWarehouse"
@@ -32,4 +28,4 @@
             "foreignKey": "warehouseFk"
         }
     }
-}
+}

modules/zone/back/models/zone.json

@@ -1,10 +1,6 @@
 {
 	"name": "Zone",
 	"base": "Loggable",
-	"log": {
-		"model":"ZoneLog",
-        "showField": "name"
-	},
 	"options": {
 		"mysql": {
 			"table": "zone"
@@ -59,7 +55,7 @@
 		"exclusions": {
             "type": "hasMany",
             "model": "ZoneExclusion",
-			"foreignKey": "zoneFk" 
+			"foreignKey": "zoneFk"
 		},
 		"warehouses": {
 			"type": "hasMany",
@@ -72,4 +68,4 @@
 			"foreignKey": "zoneFk"
         }
     }
-}
+}