From 723eaed19b60466fa01c0e12a388b592ac1d78f4 Mon Sep 17 00:00:00 2001 From: ivanm Date: Thu, 20 Feb 2025 18:33:14 +0100 Subject: [PATCH 01/10] refactor: refs #8613 add fk to claimEnd.claimDestinationFk --- db/routines/vn/triggers/claimEnd_beforeInsert.sql | 1 + db/versions/11444-orangeMastic/00-firstScript.sql | 8 ++++++++ db/versions/11444-orangeMastic/01-firstScript.sql | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 db/versions/11444-orangeMastic/00-firstScript.sql create mode 100644 db/versions/11444-orangeMastic/01-firstScript.sql diff --git a/db/routines/vn/triggers/claimEnd_beforeInsert.sql b/db/routines/vn/triggers/claimEnd_beforeInsert.sql index 113fb8179f..2e458eb3bb 100644 --- a/db/routines/vn/triggers/claimEnd_beforeInsert.sql +++ b/db/routines/vn/triggers/claimEnd_beforeInsert.sql @@ -4,5 +4,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claimEnd_beforeInsert` FOR EACH ROW BEGIN SET NEW.editorFk = account.myUser_getId(); + SET NEW.claimDestinationFk = 1; END$$ DELIMITER ; diff --git a/db/versions/11444-orangeMastic/00-firstScript.sql b/db/versions/11444-orangeMastic/00-firstScript.sql new file mode 100644 index 0000000000..2476ea6f2c --- /dev/null +++ b/db/versions/11444-orangeMastic/00-firstScript.sql @@ -0,0 +1,8 @@ +UPDATE vn.claimEnd ce + JOIN( + SELECT id + FROM vn.claimEnd + WHERE claimDestinationFk NOT IN + (SELECT id FROM vn.claimDestination WHERE id IS NOT NULL) + ) s ON ce.id = s.id + SET ce.claimDestinationFk = 1; \ No newline at end of file diff --git a/db/versions/11444-orangeMastic/01-firstScript.sql b/db/versions/11444-orangeMastic/01-firstScript.sql new file mode 100644 index 0000000000..74882d710b --- /dev/null +++ b/db/versions/11444-orangeMastic/01-firstScript.sql @@ -0,0 +1,7 @@ +ALTER TABLE vn.claimEnd + MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL, + ADD CONSTRAINT fk_claimEnd_claimDestination + FOREIGN KEY (claimDestinationFk) + REFERENCES claimDestination(id) + ON UPDATE CASCADE + ON DELETE CASCADE; \ No newline at end of file From 581a7393d426155e42e4e515e71253ff77837944 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 21 Feb 2025 11:41:37 +0100 Subject: [PATCH 02/10] fix: add param shipped --- modules/ticket/back/methods/ticket/filter.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index f125ac586f..75e37d40a4 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -33,6 +33,11 @@ module.exports = Self => { type: 'date', description: `The to date filter` }, + { + arg: 'shipped', + type: 'date', + description: `The shipped date filter` + }, { arg: 'nickname', type: 'string', @@ -201,6 +206,7 @@ module.exports = Self => { case 'clientFk': case 'agencyModeFk': case 'warehouseFk': + case 'shipped': param = `t.${param}`; return {[param]: value}; } From 726825164d9f209a4763c4d01a512db332004a02 Mon Sep 17 00:00:00 2001 From: ivanm Date: Fri, 21 Feb 2025 12:21:13 +0100 Subject: [PATCH 03/10] refactor: refs #8613 alter table default 1 --- db/routines/vn/triggers/claimEnd_beforeInsert.sql | 1 - db/versions/11444-orangeMastic/01-firstScript.sql | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/db/routines/vn/triggers/claimEnd_beforeInsert.sql b/db/routines/vn/triggers/claimEnd_beforeInsert.sql index 2e458eb3bb..113fb8179f 100644 --- a/db/routines/vn/triggers/claimEnd_beforeInsert.sql +++ b/db/routines/vn/triggers/claimEnd_beforeInsert.sql @@ -4,6 +4,5 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claimEnd_beforeInsert` FOR EACH ROW BEGIN SET NEW.editorFk = account.myUser_getId(); - SET NEW.claimDestinationFk = 1; END$$ DELIMITER ; diff --git a/db/versions/11444-orangeMastic/01-firstScript.sql b/db/versions/11444-orangeMastic/01-firstScript.sql index 74882d710b..31d7bb4bbc 100644 --- a/db/versions/11444-orangeMastic/01-firstScript.sql +++ b/db/versions/11444-orangeMastic/01-firstScript.sql @@ -1,5 +1,5 @@ ALTER TABLE vn.claimEnd - MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL, + MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL DEFAULT 1, ADD CONSTRAINT fk_claimEnd_claimDestination FOREIGN KEY (claimDestinationFk) REFERENCES claimDestination(id) From 119ae0819b66e898c6da0d0cee3ccad36468e7f7 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 24 Feb 2025 11:07:31 +0100 Subject: [PATCH 04/10] feat: refs#8624 addWorkerActions --- back/methods/workerActivity/add.js | 15 ++++++++++----- db/versions/11455-orangeTulip/00-firstScript.sql | 9 +++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 db/versions/11455-orangeTulip/00-firstScript.sql diff --git a/back/methods/workerActivity/add.js b/back/methods/workerActivity/add.js index 89131491d1..b5b1bd65de 100644 --- a/back/methods/workerActivity/add.js +++ b/back/methods/workerActivity/add.js @@ -13,6 +13,11 @@ module.exports = Self => { type: 'string', description: 'Origin model from insert' }, + { + arg: 'description', + type: 'string', + description: 'Action description' + }, ], http: { @@ -21,7 +26,7 @@ module.exports = Self => { } }); - Self.add = async(ctx, code, model, options) => { + Self.add = async(ctx, code, model, description, options) => { const userId = ctx.req.accessToken.userId; const myOptions = {}; @@ -29,8 +34,8 @@ module.exports = Self => { Object.assign(myOptions, options); return await Self.rawSql(` - INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model) - SELECT ?, ?, ? + INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description) + SELECT ?, ?, ?, ? FROM workerTimeControlConfig wtcc LEFT JOIN ( SELECT wa.workerFk, @@ -43,8 +48,8 @@ module.exports = Self => { LIMIT 1 ) sub ON TRUE WHERE sub.workerFk IS NULL - OR sub.code <> ? + OR sub.code <> ? OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;` - , [userId, code, model, userId, code], myOptions); + , [userId, code, model, description, userId, code], myOptions); }; }; diff --git a/db/versions/11455-orangeTulip/00-firstScript.sql b/db/versions/11455-orangeTulip/00-firstScript.sql new file mode 100644 index 0000000000..d64c8e324e --- /dev/null +++ b/db/versions/11455-orangeTulip/00-firstScript.sql @@ -0,0 +1,9 @@ + + +USE vn; + +INSERT INTO vn.workerActivityType (code, description) +VALUES('SHELVING_CLEAN_START', 'SE INICIA LIMPIEZA CARRO'), + ('SHELVING_CLEAN_STOP', 'SE FINALIZA LIMPIEZA CARRO'); + + From 8e6eeca5e8e5d182798b2f1181ddd51fa8a0aade Mon Sep 17 00:00:00 2001 From: ivanm Date: Mon, 24 Feb 2025 12:17:59 +0100 Subject: [PATCH 05/10] refactor: refs #8613 change on delete to restrict --- db/versions/11444-orangeMastic/01-firstScript.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/versions/11444-orangeMastic/01-firstScript.sql b/db/versions/11444-orangeMastic/01-firstScript.sql index 31d7bb4bbc..4b7bfb2863 100644 --- a/db/versions/11444-orangeMastic/01-firstScript.sql +++ b/db/versions/11444-orangeMastic/01-firstScript.sql @@ -4,4 +4,4 @@ ALTER TABLE vn.claimEnd FOREIGN KEY (claimDestinationFk) REFERENCES claimDestination(id) ON UPDATE CASCADE - ON DELETE CASCADE; \ No newline at end of file + ON DELETE RESTRICT; \ No newline at end of file From a021383df038861dedfddd6d79b75725fa18a235 Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 24 Feb 2025 13:09:53 +0100 Subject: [PATCH 06/10] fix: update shipped property assignment in refund ticket creation --- .../back/methods/claim-beginning/importToNewRefundTicket.js | 2 +- .../claim-beginning/specs/importToNewRefundTicket.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js index 5a08140e7f..74ae102d0c 100644 --- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js +++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js @@ -109,7 +109,7 @@ module.exports = Self => { ); const newRefundTicket = await models.Ticket.create({ clientFk: claim.ticket().clientFk, - shipped: nextShipped, + shipped: nextShipped.shipped, landed: null, nickname, warehouseFk, diff --git a/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js index 7771310674..d305ca1f56 100644 --- a/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js +++ b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js @@ -19,7 +19,7 @@ describe('importToNewRefundTicket()', () => { }); tx = await models.Entry.beginTransaction({}); options = {transaction: tx}; - spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve(expectedDate)); + spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve({shipped: expectedDate})); }); afterEach(async() => { From b2159383276d342817ed075b862f684d9cdd047b Mon Sep 17 00:00:00 2001 From: jtubau Date: Mon, 24 Feb 2025 14:38:52 +0100 Subject: [PATCH 07/10] fix: update foreign key model reference in agency-workCenter.json --- back/models/agency-workCenter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/models/agency-workCenter.json b/back/models/agency-workCenter.json index adf1e5bcb0..71de17cb25 100644 --- a/back/models/agency-workCenter.json +++ b/back/models/agency-workCenter.json @@ -24,7 +24,7 @@ "relations": { "agency": { "type": "belongsTo", - "model": "WorkCenter", + "model": "Agency", "foreignKey": "agencyFk" }, "workCenter": { From 2941e5f80aa0f38870c9c8c777b82e68262cebb4 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 24 Feb 2025 16:48:41 +0100 Subject: [PATCH 08/10] feat: refs #8624 refs#8624 addWorkerActions --- back/methods/workerActivity/specs/add.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/methods/workerActivity/specs/add.spec.js b/back/methods/workerActivity/specs/add.spec.js index 751cce009e..50d50eb4cb 100644 --- a/back/methods/workerActivity/specs/add.spec.js +++ b/back/methods/workerActivity/specs/add.spec.js @@ -3,7 +3,7 @@ const {models} = require('vn-loopback'); describe('workerActivity insert()', () => { const ctx = beforeAll.getCtx(1106); - it('should insert in workerActivity', async() => { + fit('should insert in workerActivity', async() => { const tx = await models.WorkerActivity.beginTransaction({}); let count = 0; const options = {transaction: tx}; @@ -13,7 +13,7 @@ describe('workerActivity insert()', () => { {'code': 'TEST', 'description': 'TEST'}, options ); - await models.WorkerActivity.add(ctx, 'TEST', 'APP', options); + await models.WorkerActivity.add(ctx, 'TEST', 'APP', 'description', options); count = await models.WorkerActivity.count( {'workerFK': 1106}, options From 08cd2d222181c0dbfe51c54bf77d078065c9adf1 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 24 Feb 2025 16:50:35 +0100 Subject: [PATCH 09/10] feat: refs #8624 refs#8624 addWorkerActions --- back/methods/workerActivity/specs/add.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/methods/workerActivity/specs/add.spec.js b/back/methods/workerActivity/specs/add.spec.js index 50d50eb4cb..ad6cc7fa70 100644 --- a/back/methods/workerActivity/specs/add.spec.js +++ b/back/methods/workerActivity/specs/add.spec.js @@ -3,7 +3,7 @@ const {models} = require('vn-loopback'); describe('workerActivity insert()', () => { const ctx = beforeAll.getCtx(1106); - fit('should insert in workerActivity', async() => { + it('should insert in workerActivity', async() => { const tx = await models.WorkerActivity.beginTransaction({}); let count = 0; const options = {transaction: tx}; From 04b6be23a1969213e73d333e0d0f9a4f7a846d57 Mon Sep 17 00:00:00 2001 From: ivanm Date: Mon, 24 Feb 2025 18:13:56 +0100 Subject: [PATCH 10/10] fix: refs #8613 fk claimEnd --- db/versions/11444-orangeMastic/01-firstScript.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/versions/11444-orangeMastic/01-firstScript.sql b/db/versions/11444-orangeMastic/01-firstScript.sql index 4b7bfb2863..38cd7c0914 100644 --- a/db/versions/11444-orangeMastic/01-firstScript.sql +++ b/db/versions/11444-orangeMastic/01-firstScript.sql @@ -1,5 +1,7 @@ ALTER TABLE vn.claimEnd - MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL DEFAULT 1, + MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL DEFAULT 1; + +ALTER TABLE vn.claimEnd ADD CONSTRAINT fk_claimEnd_claimDestination FOREIGN KEY (claimDestinationFk) REFERENCES claimDestination(id)