verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 +314 -502
70 changed files with 314 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0666163ca0 - Show all commits

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

@ -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;

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

@ -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;

264
loopback/server/connectors/vn-mysql.js
View File

@ -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
let where, id, data, idName, limit, op, oldInstances, newInstances;
const hasGrabUser = settings.log && settings.log.grabUser;
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 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);
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);
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);
}
await this.executeP(`CALL account.myUser_logout()`, null, 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) {
if (err) {
this.execute(stmt.sql, stmt.params, options, function(err, data) {
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, []);
}
});
};
};

14
modules/claim/back/methods/claim/specs/updateClaim.spec.js
View File

@ -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,

14
modules/claim/back/methods/claim/specs/updateClaimAction.spec.js
View File

@ -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,

5
modules/claim/back/models/claim-beginning.json
View File

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

4
modules/claim/back/models/claim-development.json
View File

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

10
modules/claim/back/models/claim-dms.json
View File

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

4
modules/claim/back/models/claim-end.json
View File

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

6
modules/claim/back/models/claim-observation.json
View File

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

5
modules/claim/back/models/claim-state.json
View File

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

4
modules/claim/back/models/claim.json
View File

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

7
modules/client/back/models/address.json
View File

@ -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"
}
}
}
}

7
modules/client/back/models/client-contact.json
View File

@ -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"
}
}
}
}

5
modules/client/back/models/client-dms.json
View File

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

4
modules/client/back/models/client-observation.json
View File

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

5
modules/client/back/models/client-sample.json
View File

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

6
modules/client/back/models/client.json
View File

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

7
modules/client/back/models/greuge.json
View File

@ -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"
}
}
}
}

6
modules/client/back/models/recovery.json
View File

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

5
modules/entry/back/models/buy.json
View File

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

4
modules/entry/back/models/entry-observation.json
View File

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

4
modules/entry/back/models/entry.json
View File

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

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

@ -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 = {

6
modules/invoiceIn/back/models/invoice-in-tax.json
View File

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

3
modules/invoiceIn/back/models/invoice-in.json
View File

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

15
modules/item/back/methods/item/specs/updateTaxes.spec.js
View File

@ -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};

15
modules/item/back/methods/tag/specs/onSubmit.spec.js
View File

@ -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};

7
modules/item/back/models/item-barcode.json
View File

@ -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"
}
}
}
}

6
modules/item/back/models/item-botanical.json
View File

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

5
modules/item/back/models/item-tag.json
View File

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

7
modules/item/back/models/item-tax-country.json
View File

@ -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"
}
}
}
}

5
modules/item/back/models/item.json
View File

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

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

@ -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,

4
modules/route/back/models/route.json
View File

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

4
modules/shelving/back/models/shelving.json
View File

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

6
modules/supplier/back/models/supplier-account.json
View File

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

7
modules/supplier/back/models/supplier-address.json
View File

@ -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"
}
}
}
}

6
modules/supplier/back/models/supplier-contact.json
View File

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

3
modules/supplier/back/models/supplier.json
View File

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

15
modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
View File

@ -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({});

15
modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
View File

@ -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 = {

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

@ -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},

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

@ -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({});

14
modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
View File

@ -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);

5
modules/ticket/back/models/expedition.json
View File

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

6
modules/ticket/back/models/sale.json
View File

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

14
modules/ticket/back/models/specs/ticket-packaging.spec.js
View File

@ -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() => {

6
modules/ticket/back/models/ticket-dms.json
View File

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

4
modules/ticket/back/models/ticket-observation.json
View File

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

4
modules/ticket/back/models/ticket-packaging.json
View File

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

4
modules/ticket/back/models/ticket-refund.json
View File

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

6
modules/ticket/back/models/ticket-request.json
View File

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

7
modules/ticket/back/models/ticket-service.json
View File

@ -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"
}
}
}
}

16
modules/ticket/back/models/ticket-tracking.json
View File

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

7
modules/ticket/back/models/ticket-weekly.json
View File

@ -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"
}
}
}
}

5
modules/ticket/back/models/ticket.json
View File

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

14
modules/travel/back/methods/travel/specs/createThermograph.spec.js
View File

@ -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';

7
modules/travel/back/models/travel-thermograph.json
View File

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

5
modules/travel/back/models/travel.json
View File

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

5
modules/worker/back/models/worker-dms.json
View File

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

4
modules/worker/back/models/worker.json
View File

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

15
modules/zone/back/methods/zone/specs/clone.spec.js
View File

@ -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({});

14
modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
View File

@ -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();

15
modules/zone/back/methods/zone/specs/toggleIsIncluded.spec.js
View File

@ -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({});

6
modules/zone/back/models/zone-event.json
View File

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

6
modules/zone/back/models/zone-exclusion.json
View File

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

7
modules/zone/back/models/zone-included.json
View File

@ -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"
}
}
}
}

6
modules/zone/back/models/zone-warehouse.json
View File

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

8
modules/zone/back/models/zone.json
View File

@ -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"
}
}
}
}