From ec9c0610511096ec9a2c7d95b92dfd9e468b0a14 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 1 Sep 2021 12:37:46 +0200 Subject: [PATCH] fix(getUpcomingDeliveries) fixtures were broken due to db structure changes --- db/dump/fixtures.sql | 2 +- modules/zone/back/methods/zone/getUpcomingDeliveries.js | 2 ++ .../back/methods/zone/specs/getUpcomingDeliveries.spec.js | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 068fbbc247..ca11a5e49a 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -1934,7 +1934,7 @@ INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`) (8, 4, 0), (8, 5, 0), (8, 1, 1), - (10, 10, 1); + (10, 14, 1); INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`) VALUES diff --git a/modules/zone/back/methods/zone/getUpcomingDeliveries.js b/modules/zone/back/methods/zone/getUpcomingDeliveries.js index 8b092b47b9..6aceb694b4 100644 --- a/modules/zone/back/methods/zone/getUpcomingDeliveries.js +++ b/modules/zone/back/methods/zone/getUpcomingDeliveries.js @@ -21,6 +21,8 @@ module.exports = Self => { const [zones] = await Self.rawSql('CALL vn.zone_upcomingDeliveries()', null, myOptions); + if (!zones.length) return; + const details = []; for (let zone of zones) { diff --git a/modules/zone/back/methods/zone/specs/getUpcomingDeliveries.spec.js b/modules/zone/back/methods/zone/specs/getUpcomingDeliveries.spec.js index d0e8988379..acef079f60 100644 --- a/modules/zone/back/methods/zone/specs/getUpcomingDeliveries.spec.js +++ b/modules/zone/back/methods/zone/specs/getUpcomingDeliveries.spec.js @@ -1,12 +1,12 @@ -const app = require('vn-loopback/server/server'); +const models = require('vn-loopback/server/server').models; describe('zone getUpcomingDeliveries()', () => { it('should check returns data', async() => { - const tx = await app.models.Zone.beginTransaction({}); + const tx = await models.Zone.beginTransaction({}); try { const options = {transaction: tx}; - let result = await app.models.Zone.getUpcomingDeliveries(options); + let result = await models.Zone.getUpcomingDeliveries(options); const firstResultLines = result[0].lines; const secondResultLines = result[1].lines;