Merge pull request '#2934 - HOTFIX: Route suggested tickets' (#635) from 2934-suggested_tickets into dev

Reviewed-on: #635
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

modules/route/back/methods/route/getSuggestedTickets.js

@@ -19,14 +19,17 @@ module.exports = Self => {
         }
     });
 
-    Self.getSuggestedTickets = async id => {
+    Self.getSuggestedTickets = async(id, options) => {
-        const route = await Self.app.models.Route.findById(id);
+        let myOptions = {};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
+        const route = await Self.app.models.Route.findById(id, null, myOptions);
         const zoneAgencyModes = await Self.app.models.ZoneAgencyMode.find({
             where: {
                 agencyModeFk: route.agencyModeFk
             }
-        });
+        }, myOptions);
 
         const zoneIds = [];
         for (let zoneAgencyMode of zoneAgencyModes)
@@ -38,10 +41,9 @@ module.exports = Self => {
         maxDate.setHours(23, 59, 59, 59);
         let tickets = await Self.app.models.Ticket.find({
             where: {
-                agencyModeFk: route.agencyModeFk,
                 zoneFk: {inq: zoneIds},
                 routeFk: null,
-                shipped: {between: [minDate, maxDate]}
+                landed: {between: [minDate, maxDate]}
             },
             include: [
                 {
@@ -57,7 +59,7 @@ module.exports = Self => {
                     }
                 },
             ]
-        });
+        }, myOptions);
 
         return tickets;
     };

modules/route/back/methods/route/insertTicket.js

@@ -26,26 +26,46 @@ module.exports = Self => {
         }
     });
 
-    Self.insertTicket = async(routeId, ticketId) => {
+    Self.insertTicket = async(routeId, ticketId, options) => {
         const models = Self.app.models;
 
-        const route = await models.Route.findById(routeId);
+        let tx;
-        const minDate = new Date(route.finished);
+        let myOptions = {};
-        minDate.setHours(0, 0, 0, 0);
 
-        const maxDate = new Date(route.finished);
+        if (typeof options == 'object')
-        maxDate.setHours(23, 59, 59, 59);
+            Object.assign(myOptions, options);
-        const ticket = await models.Ticket.findOne({
-            where: {
-                id: ticketId,
-                routeFk: null,
-                landed: {between: [minDate, maxDate]},
-            }
-        });
 
-        if (!ticket)
+        if (!myOptions.transaction) {
-            throw new UserError('The selected ticket is not suitable for this route');
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
-        return ticket.updateAttribute('routeFk', route.id);
+        try {
+            const route = await models.Route.findById(routeId, null, myOptions);
+            const minDate = new Date(route.created);
+            minDate.setHours(0, 0, 0, 0);
+
+            const maxDate = new Date(route.created);
+            maxDate.setHours(23, 59, 59, 59);
+            const ticket = await models.Ticket.findOne({
+                where: {
+                    id: ticketId,
+                    routeFk: null,
+                    landed: {between: [minDate, maxDate]},
+                }
+            }, myOptions);
+
+            if (!ticket)
+                throw new UserError('The selected ticket is not suitable for this route');
+
+            const result = await ticket.updateAttribute('routeFk', route.id, myOptions);
+
+            if (tx) await tx.commit();
+
+            return result;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
     };
 };

modules/route/back/methods/route/specs/getSuggestedTickets.spec.js

@@ -2,6 +2,8 @@ const app = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 
 describe('route getSuggestedTickets()', () => {
+    const routeID = 1;
+    const ticketId = 12;
     it('should return an array of suggested tickets', async() => {
         const activeCtx = {
             accessToken: {userId: 19},
@@ -11,20 +13,30 @@ describe('route getSuggestedTickets()', () => {
             active: activeCtx
         });
 
-        const routeID = 1;
+        const tx = await app.models.Ticket.beginTransaction({});
-        const ticketInRoute = await app.models.Ticket.findById(12);
 
-        await ticketInRoute.updateAttribute('routeFk', null);
+        try {
+            const options = {transaction: tx};
+            const ticketInRoute = await app.models.Ticket.findById(ticketId, null, options);
 
-        const result = await app.models.Route.getSuggestedTickets(routeID);
+            await ticketInRoute.updateAttributes({
+                routeFk: null,
+                landed: new Date()
+            }, options);
 
-        const length = result.length;
+            const result = await app.models.Route.getSuggestedTickets(routeID, options);
-        const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
 
-        expect(result.length).toEqual(1);
+            const length = result.length;
-        expect(anyResult.zoneFk).toEqual(1);
+            const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
-        expect(anyResult.agencyModeFk).toEqual(1);
 
-        await ticketInRoute.updateAttribute('routeFk', routeID);
+            expect(result.length).toEqual(1);
+            expect(anyResult.zoneFk).toEqual(1);
+            expect(anyResult.agencyModeFk).toEqual(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

modules/route/back/methods/route/specs/insertTicket.spec.js

@@ -3,7 +3,6 @@ const LoopBackContext = require('loopback-context');
 
 describe('route insertTicket()', () => {
     const deliveryId = 56;
-    let originalTicket;
     const routeId = 1;
     const activeCtx = {
         accessToken: {userId: deliveryId},
@@ -19,12 +18,24 @@ describe('route insertTicket()', () => {
 
     it('should add the ticket to a route', async() => {
         const ticketId = 12;
-        originalTicket = await app.models.Ticket.findById(ticketId);
+        const tx = await app.models.Ticket.beginTransaction({});
-        await originalTicket.updateAttribute('routeFk', null);
 
-        const result = await app.models.Route.insertTicket(routeId, ticketId);
+        try {
+            const options = {transaction: tx};
+            const ticketInRoute = await app.models.Ticket.findById(ticketId, null, options);
+            await ticketInRoute.updateAttributes({
+                routeFk: null,
+                landed: new Date()
+            }, options);
 
-        expect(result.routeFk).toEqual(routeId);
+            const result = await app.models.Route.insertTicket(routeId, ticketId, options);
+
+            expect(result.routeFk).toEqual(routeId);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 
     it('should throw and error if the ticket is not suitable for the route', async() => {

modules/route/front/tickets/index.html

@@ -63,14 +63,14 @@
                                 display-controls=true>
                             </vn-input-number>
                         </vn-td>
-                        <vn-td expand title="{{ticket.street}}">{{::ticket.street}}</vn-td>
+                        <vn-td expand title="{{::ticket.street}}">{{::ticket.street}}</vn-td>
                         <vn-td expand>{{::ticket.city}}</vn-td>
                         <vn-td shrink>{{::ticket.postalCode}}</vn-td>
                         <vn-td expand>
                             <span
                                 ng-click="clientDescriptor.show($event, ticket.clientFk)"
                                 class="link">
-                                {{ticket.nickname}}
+                                {{::ticket.nickname}}
                             </span>
                         </vn-td>
                         <vn-td shrink>{{::ticket.packages}}</vn-td>
@@ -84,8 +84,8 @@
                         </vn-td>
                         <vn-td shrink>
                             <vn-icon
-                                ng-if="ticket.notes.length"
+                                ng-if="::ticket.notes.length"
-                                title="{{ticket.notes[0].description}}"
+                                title="{{::ticket.notes[0].description}}"
                                 icon="insert_drive_file"
                                 class="bright">
                             </vn-icon>
@@ -149,18 +149,18 @@
                                 ng-model="ticket.checked">
                             </vn-check>
                         </vn-td>
-                        <vn-td number>{{ticket.id}}</vn-td>
+                        <vn-td number>{{::ticket.id}}</vn-td>
                         <vn-td number>
                             <span
-                                ng-click="$ctrl.showClientDescriptor($event, ticket.clientFk)"
+                                ng-click="::$ctrl.showClientDescriptor($event, ticket.clientFk)"
                                 class="link">
-                                {{ticket.nickname}}
+                                {{::ticket.nickname}}
                             </span>
                         </vn-td>
-                        <vn-td number shrink>{{ticket.packages}}</vn-td>
+                        <vn-td number shrink>{{::ticket.packages}}</vn-td>
-                        <vn-td expand>{{ticket.warehouse.name}}</vn-td>
+                        <vn-td expand>{{::ticket.warehouse.name}}</vn-td>
-                        <vn-td number shrink>{{ticket.address.postalCode}}</vn-td>
+                        <vn-td number shrink>{{::ticket.address.postalCode}}</vn-td>
-                        <vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td>
+                        <vn-td expand title="{{::ticket.address.street}}">{{::ticket.address.street}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>