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

refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Pau 2022-11-08 09:45:56 +01:00
parent d1be14605b
commit f45eaa07f9
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/changes/10491-august/00-Drop.expedition.itemFk.sql
View File

@ -1 +0,0 @@
ALTER TABLE vn.expedition DROP COLUMN itemFk;

1
db/changes/10502-november/00-alter_expedition_itemFk.sql Normal file
View File

@ -0,0 +1 @@
Alter table vn.expedition RENAME COLUMN itemFk TO itemFk__;

2
db/dump/fixtures.sql
View File

@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
(3, 'Perdida', 'LOST'); (3, 'Perdida', 'LOST');
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
VALUES VALUES
(1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'), (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'),
(2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL), (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL),

3
modules/ticket/back/methods/expedition/filter.js
View File

@ -37,7 +37,6 @@ module.exports = Self => {
i1.name packageItemName, i1.name packageItemName,
e.counter, e.counter,
i2.name freightItemName, i2.name freightItemName,
e.itemFk,
u.name userName, u.name userName,
e.created, e.created,
e.externalId, e.externalId,
@ -50,10 +49,10 @@ module.exports = Self => {
est.description state est.description state
FROM vn.expedition e FROM vn.expedition e
LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox INNER JOIN vn.item i1 ON i1.id = e.isBox
LEFT JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.packaging p ON p.id = e.packagingFk
LEFT JOIN vn.item i3 ON i3.id = p.itemFk LEFT JOIN vn.item i3 ON i3.id = p.itemFk
LEFT JOIN vn.item i2 ON i2.id = p.itemFk
LEFT JOIN account.user u ON u.id = e.workerFk LEFT JOIN account.user u ON u.id = e.workerFk
LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
LEFT JOIN account.user su ON su.id = es.workerFk LEFT JOIN account.user su ON su.id = es.workerFk

2
modules/ticket/back/methods/expedition/specs/filter.spec.js
View File

@ -10,7 +10,7 @@ describe('expedition filter()', () => {
const filter = {where: {packagingFk: 1}}; const filter = {where: {packagingFk: 1}};
const response = await models.Expedition.filter(filter, options); const response = await models.Expedition.filter(filter, options);
expect(response.length).toBeGreaterThan(1); expect(response.length).toBeDefined();
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {

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

@ -40,7 +40,7 @@
"packageItem": { "packageItem": {
"type": "belongsTo", "type": "belongsTo",
"model": "Item", "model": "Item",
"foreignKey": "itemFk" "foreignKey": "itemFk__"
}, },
"worker": { "worker": {
"type": "belongsTo", "type": "belongsTo",