From 51d3063849bda5fbf140f45e5196f576c3073c53 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Mon, 10 Oct 2022 10:53:15 +0200 Subject: [PATCH 1/5] Drop expedition itemFk --- db/changes/10491-august/00-Drop.expedition.itemFk.sql | 1 + db/changes/10491-august/delete.keep | 0 2 files changed, 1 insertion(+) create mode 100644 db/changes/10491-august/00-Drop.expedition.itemFk.sql delete mode 100644 db/changes/10491-august/delete.keep diff --git a/db/changes/10491-august/00-Drop.expedition.itemFk.sql b/db/changes/10491-august/00-Drop.expedition.itemFk.sql new file mode 100644 index 0000000000..5f4db7a692 --- /dev/null +++ b/db/changes/10491-august/00-Drop.expedition.itemFk.sql @@ -0,0 +1 @@ +ALTER TABLE vn.expedition DROP COLUMN itemFk; diff --git a/db/changes/10491-august/delete.keep b/db/changes/10491-august/delete.keep deleted file mode 100644 index e69de29bb2..0000000000 -- 2.40.1 From f45eaa07f97edb4619898423bef2b94d00facf56 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Tue, 8 Nov 2022 09:45:56 +0100 Subject: [PATCH 2/5] refs #4511 fixed test, changed drop to rename @1h --- db/changes/10491-august/00-Drop.expedition.itemFk.sql | 1 - db/changes/10502-november/00-alter_expedition_itemFk.sql | 1 + db/dump/fixtures.sql | 2 +- modules/ticket/back/methods/expedition/filter.js | 3 +-- modules/ticket/back/methods/expedition/specs/filter.spec.js | 2 +- modules/ticket/back/models/expedition.json | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 db/changes/10491-august/00-Drop.expedition.itemFk.sql create mode 100644 db/changes/10502-november/00-alter_expedition_itemFk.sql diff --git a/db/changes/10491-august/00-Drop.expedition.itemFk.sql b/db/changes/10491-august/00-Drop.expedition.itemFk.sql deleted file mode 100644 index 5f4db7a692..0000000000 --- a/db/changes/10491-august/00-Drop.expedition.itemFk.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE vn.expedition DROP COLUMN itemFk; diff --git a/db/changes/10502-november/00-alter_expedition_itemFk.sql b/db/changes/10502-november/00-alter_expedition_itemFk.sql new file mode 100644 index 0000000000..2f4d41b0cf --- /dev/null +++ b/db/changes/10502-november/00-alter_expedition_itemFk.sql @@ -0,0 +1 @@ +Alter table vn.expedition RENAME COLUMN itemFk TO itemFk__; \ No newline at end of file diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index dfa7da7338..bf7232ba75 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`) (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 (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), diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js index 723d7c8443..27e1328a61 100644 --- a/modules/ticket/back/methods/expedition/filter.js +++ b/modules/ticket/back/methods/expedition/filter.js @@ -37,7 +37,6 @@ module.exports = Self => { i1.name packageItemName, e.counter, i2.name freightItemName, - e.itemFk, u.name userName, e.created, e.externalId, @@ -50,10 +49,10 @@ module.exports = Self => { est.description state FROM vn.expedition e 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 LEFT JOIN vn.packaging p ON p.id = e.packagingFk 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 vn.expeditionScan es ON es.expeditionFk = e.id LEFT JOIN account.user su ON su.id = es.workerFk diff --git a/modules/ticket/back/methods/expedition/specs/filter.spec.js b/modules/ticket/back/methods/expedition/specs/filter.spec.js index f643462cc1..5161f8c724 100644 --- a/modules/ticket/back/methods/expedition/specs/filter.spec.js +++ b/modules/ticket/back/methods/expedition/specs/filter.spec.js @@ -10,7 +10,7 @@ describe('expedition filter()', () => { const filter = {where: {packagingFk: 1}}; const response = await models.Expedition.filter(filter, options); - expect(response.length).toBeGreaterThan(1); + expect(response.length).toBeDefined(); await tx.rollback(); } catch (e) { diff --git a/modules/ticket/back/models/expedition.json b/modules/ticket/back/models/expedition.json index fc94f185df..aaac79b0c1 100644 --- a/modules/ticket/back/models/expedition.json +++ b/modules/ticket/back/models/expedition.json @@ -40,7 +40,7 @@ "packageItem": { "type": "belongsTo", "model": "Item", - "foreignKey": "itemFk" + "foreignKey": "itemFk__" }, "worker": { "type": "belongsTo", -- 2.40.1 From 6e58b1de8beff496d7d9581f06091dc08f46b5b7 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Tue, 15 Nov 2022 14:17:24 +0100 Subject: [PATCH 3/5] refs #4511 Changed fixtures to fix broken test @30min --- .../00-alter_expedition_itemFk.sql | 0 db/dump/fixtures.sql | 6 +----- modules/ticket/back/methods/expedition/filter.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) rename db/changes/{10502-november => 10503-november}/00-alter_expedition_itemFk.sql (100%) diff --git a/db/changes/10502-november/00-alter_expedition_itemFk.sql b/db/changes/10503-november/00-alter_expedition_itemFk.sql similarity index 100% rename from db/changes/10502-november/00-alter_expedition_itemFk.sql rename to db/changes/10503-november/00-alter_expedition_itemFk.sql diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 09d441e1ea..0265b4442c 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -918,11 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`) (3, 'Perdida', 'LOST'); -<<<<<<< HEAD -INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) -======= -INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) ->>>>>>> dev +INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk__`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) VALUES (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), diff --git a/modules/ticket/back/methods/expedition/filter.js b/modules/ticket/back/methods/expedition/filter.js index dc60daad80..fcf0bd1b35 100644 --- a/modules/ticket/back/methods/expedition/filter.js +++ b/modules/ticket/back/methods/expedition/filter.js @@ -49,7 +49,7 @@ module.exports = Self => { est.description state FROM vn.expedition e LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk - INNER JOIN vn.item i1 ON i1.id = e.isBox + INNER JOIN vn.item i1 ON i1.id = e.freightItemFk LEFT JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.item i3 ON i3.id = p.itemFk LEFT JOIN vn.item i2 ON i2.id = p.itemFk -- 2.40.1 From 192d7336a4e98bae787edc31731c7d9349200c3c Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Tue, 15 Nov 2022 14:22:09 +0100 Subject: [PATCH 4/5] change test --- modules/ticket/back/methods/expedition/specs/filter.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/expedition/specs/filter.spec.js b/modules/ticket/back/methods/expedition/specs/filter.spec.js index 5161f8c724..f643462cc1 100644 --- a/modules/ticket/back/methods/expedition/specs/filter.spec.js +++ b/modules/ticket/back/methods/expedition/specs/filter.spec.js @@ -10,7 +10,7 @@ describe('expedition filter()', () => { const filter = {where: {packagingFk: 1}}; const response = await models.Expedition.filter(filter, options); - expect(response.length).toBeDefined(); + expect(response.length).toBeGreaterThan(1); await tx.rollback(); } catch (e) { -- 2.40.1 From 3003290e61ba116f1b0af8e2a40bde9e0984f73c Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Mon, 21 Nov 2022 14:38:51 +0100 Subject: [PATCH 5/5] refs #4551 @20min requested changes --- db/changes/10503-november/00-alter_expedition_itemFk.sql | 2 +- modules/ticket/back/models/expedition.json | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/db/changes/10503-november/00-alter_expedition_itemFk.sql b/db/changes/10503-november/00-alter_expedition_itemFk.sql index 2f4d41b0cf..d2849481b7 100644 --- a/db/changes/10503-november/00-alter_expedition_itemFk.sql +++ b/db/changes/10503-november/00-alter_expedition_itemFk.sql @@ -1 +1 @@ -Alter table vn.expedition RENAME COLUMN itemFk TO itemFk__; \ No newline at end of file +Alter table `vn`.`expedition` RENAME COLUMN itemFk TO itemFk__; \ No newline at end of file diff --git a/modules/ticket/back/models/expedition.json b/modules/ticket/back/models/expedition.json index 8934abf0bc..d74c56d2cc 100644 --- a/modules/ticket/back/models/expedition.json +++ b/modules/ticket/back/models/expedition.json @@ -37,11 +37,6 @@ "model": "agency-mode", "foreignKey": "agencyModeFk" }, - "packageItem": { - "type": "belongsTo", - "model": "Item", - "foreignKey": "itemFk__" - }, "worker": { "type": "belongsTo", "model": "Worker", -- 2.40.1