From 1d66a2e752c1e2b72e118f1fae3b2c949ef33d6a Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 15 Jul 2024 16:07:59 +0200 Subject: [PATCH] Revert "feat newState refs #7642" This reverts commit a821aa317a69ad607fd0a3e84468686b8733c580. --- .../11153-purpleMedeola/00-firstScript.sql | 3 --- .../11153-purpleMedeola/00-firstScript.vn.sql | 3 --- .../back/methods/ticket/specs/saveSign.spec.js | 16 ++++++++-------- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 db/versions/11153-purpleMedeola/00-firstScript.sql delete mode 100644 db/versions/11153-purpleMedeola/00-firstScript.vn.sql diff --git a/db/versions/11153-purpleMedeola/00-firstScript.sql b/db/versions/11153-purpleMedeola/00-firstScript.sql deleted file mode 100644 index f9399cb05..000000000 --- a/db/versions/11153-purpleMedeola/00-firstScript.sql +++ /dev/null @@ -1,3 +0,0 @@ - - -ALTER TABLE vn.ticketLastState MODIFY COLUMN name varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL; \ No newline at end of file diff --git a/db/versions/11153-purpleMedeola/00-firstScript.vn.sql b/db/versions/11153-purpleMedeola/00-firstScript.vn.sql deleted file mode 100644 index 95160a847..000000000 --- a/db/versions/11153-purpleMedeola/00-firstScript.vn.sql +++ /dev/null @@ -1,3 +0,0 @@ - - -INSERT INTO vn.state ( name, `order`, alertLevel, code, sectorProdPriority, nextStateFk, isPreviousPreparable, isPicked, isPreparable, semaphore, isPrintable, isOK, graphCategory, isNotValidated, classColor) VALUES('Entregado en parte', 13, 3, 'PARTIAL_DELIVERED', NULL, 16, 0, 1, 0, 0, 0, 0, 0, 0, NULL); \ No newline at end of file diff --git a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js index c46c9a53c..23c09c184 100644 --- a/modules/ticket/back/methods/ticket/specs/saveSign.spec.js +++ b/modules/ticket/back/methods/ticket/specs/saveSign.spec.js @@ -27,17 +27,17 @@ describe('Ticket saveSign()', () => { expect(error).toBeDefined(); }); - fit('should change state for ticket', async() => { - const tx = await models.Ticket.beginTransaction({}); - const ticketWithPackedState = 7; + it('should change state for ticket', async() => { + const tx = await models.State.beginTransaction({}); + const ticketWithOkState = 7; const ticketStateId = 16; const ticketCode = 'PARTIAL_DELIVERED'; spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]); - let ticketLastState; + let ticketTrackingAfter; try { const options = {transaction: tx}; - const tickets = [ticketWithPackedState]; + const tickets = [ticketWithOkState]; const state = await models.State.findById(ticketStateId, null, options); await state.updateAttributes({ @@ -46,8 +46,8 @@ describe('Ticket saveSign()', () => { }, options); await models.Ticket.saveSign(ctx, tickets, null, null, options); - ticketLastState = await models.TicketLastState.findOne({ - where: {ticketFk: ticketWithPackedState} + ticketTrackingAfter = await models.TicketLastState.findOne({ + where: {ticketFk: ticketWithOkState} }, options); await tx.rollback(); @@ -56,6 +56,6 @@ describe('Ticket saveSign()', () => { throw e; } - expect(ticketLastState.name).toBe('PARTIAL_DELIVERED'); + expect(ticketTrackingAfter.name).toBe('PARTIAL_DELIVERED'); }); });