From a78a73486ac8b33b68090b46a59ab93ffa2896aa Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 23 Mar 2021 13:19:11 +0100 Subject: [PATCH] updated routes fixtures and fixed tests --- db/dump/fixtures.sql | 14 ++++++------- .../back/methods/route/getSuggestedTickets.js | 9 ++++++++- .../route/specs/getSuggestedTickets.spec.js | 2 +- .../methods/route/specs/insertTicket.spec.js | 20 ++++++------------- modules/route/front/tickets/index.html | 4 +--- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index bd9e59565..0492ee980 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -564,13 +564,13 @@ INSERT INTO `vn`.`zoneConfig` (`scope`) VALUES ('1'); INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`) VALUES - (1, '1899-12-30 12:15:00', 56, CURDATE(), 1, 1, 'first route', 1.8, 10, CURDATE(), CURDATE(), 1), - (2, '1899-12-30 13:20:00', 56, CURDATE(), 1, 2, 'second route', 0.2, 20, CURDATE(), CURDATE(), 9), - (3, '1899-12-30 14:30:00', 56, CURDATE(), 2, 3, 'third route', 0.5, 30, CURDATE(), CURDATE(), 10), - (4, '1899-12-30 15:45:00', 56, CURDATE(), 3, 4, 'fourth route', 0, 40, CURDATE(), CURDATE(), 12), - (5, '1899-12-30 16:00:00', 56, CURDATE(), 4, 5, 'fifth route', 0.1, 50, CURDATE(), CURDATE(), 13), - (6, NULL, 57, CURDATE(), 5, 7, 'sixth route', 1.7, 60, CURDATE(), CURDATE(), 3), - (7, NULL, 57, CURDATE(), 6, 8, 'seventh route', 0, 70, CURDATE(), CURDATE(), 5); + (1, '1899-12-30 12:15:00', 56, CURDATE(), 1, 1, 'first route', 1.8, 10, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 1), + (2, '1899-12-30 13:20:00', 56, CURDATE(), 1, 2, 'second route', 0.2, 20, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 9), + (3, '1899-12-30 14:30:00', 56, CURDATE(), 2, 3, 'third route', 0.5, 30, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 10), + (4, '1899-12-30 15:45:00', 56, CURDATE(), 3, 4, 'fourth route', 0, 40, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 12), + (5, '1899-12-30 16:00:00', 56, CURDATE(), 4, 5, 'fifth route', 0.1, 50, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 13), + (6, NULL, 57, CURDATE(), 5, 7, 'sixth route', 1.7, 60, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 3), + (7, NULL, 57, CURDATE(), 6, 8, 'seventh route', 0, 70, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 5); INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`) VALUES diff --git a/modules/route/back/methods/route/getSuggestedTickets.js b/modules/route/back/methods/route/getSuggestedTickets.js index 339c8d826..d988555f3 100644 --- a/modules/route/back/methods/route/getSuggestedTickets.js +++ b/modules/route/back/methods/route/getSuggestedTickets.js @@ -38,11 +38,18 @@ module.exports = Self => { for (let zoneAgencyMode of zoneAgencyModes) zoneIds.push(zoneAgencyMode.zoneFk); + const minDate = new Date(route.finished); + minDate.setHours(0, 0, 0, 0); + + const maxDate = new Date(route.finished); + maxDate.setHours(23, 59, 59, 59); + let tickets = await Self.app.models.Ticket.find({ where: { agencyModeFk: route.agencyModeFk, zoneFk: {inq: zoneIds}, - id: {nin: idsToExclude} + id: {nin: idsToExclude}, + landed: {between: [minDate, maxDate]} }, include: [ { diff --git a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js index e73cfebac..b74f3b710 100644 --- a/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js +++ b/modules/route/back/methods/route/specs/getSuggestedTickets.spec.js @@ -12,7 +12,7 @@ describe('route getSuggestedTickets()', () => { }); const routeID = 1; - const ticketInRoute = await app.models.Ticket.findOne({where: {routeFk: routeID}}); + const ticketInRoute = await app.models.Ticket.findById(12); await ticketInRoute.updateAttribute('routeFk', null); diff --git a/modules/route/back/methods/route/specs/insertTicket.spec.js b/modules/route/back/methods/route/specs/insertTicket.spec.js index 49bf04bd3..0f8c35ada 100644 --- a/modules/route/back/methods/route/specs/insertTicket.spec.js +++ b/modules/route/back/methods/route/specs/insertTicket.spec.js @@ -4,7 +4,7 @@ const LoopBackContext = require('loopback-context'); describe('route insertTicket()', () => { const deliveryId = 56; let originalTicket; - const routeId = 2; + const routeId = 1; const activeCtx = { accessToken: {userId: deliveryId}, }; @@ -17,26 +17,18 @@ describe('route insertTicket()', () => { done(); }); - afterAll(async done => { - try { - await originalTicket.updateAttribute('routeFk', null); - } catch (error) { - console.error(error); - } - done(); - }); - it('should add the ticket to a route', async() => { - originalTicket = await app.models.Ticket.findById(14); + const ticketId = 12; + originalTicket = await app.models.Ticket.findById(ticketId); + await originalTicket.updateAttribute('routeFk', null); - const ticketId = 14; const result = await app.models.Route.insertTicket(routeId, ticketId); - expect(result.routeFk).toEqual(2); + expect(result.routeFk).toEqual(routeId); }); it('should throw and error if the ticket is not suitable for the route', async() => { - const ticketId = 23; + const ticketId = 2; let error; try { diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html index 725acea25..784a0b78e 100644 --- a/modules/route/front/tickets/index.html +++ b/modules/route/front/tickets/index.html @@ -113,9 +113,7 @@ + data="$ctrl.possibleTickets">