Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item

modules/travel/back/methods/travel/getAverageDays.js

@@ -1,3 +1,4 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 module.exports = Self => {
     Self.remoteMethod('getAverageDays', {
         description: 'Returns the average days duration and the two warehouses of the travel.',
@@ -8,7 +9,7 @@ module.exports = Self => {
             required: true
         }],
         returns: {
-            type: 'number',
+            type: 'object',
             root: true
         },
         http: {
@@ -18,15 +19,48 @@ module.exports = Self => {
     });
 
     Self.getAverageDays = async agencyModeFk => {
-        const query = `
-        SELECT t.id, t.warehouseInFk, t.warehouseOutFk, 
-                (SELECT ROUND(AVG(DATEDIFF(t.landed, t.shipped )))
-                    FROM travel t 
-                    WHERE t.agencyFk = ? LIMIT 50) AS dayDuration
-	        FROM travel t
-	        WHERE t.agencyFk = ? ORDER BY t.id DESC LIMIT 1;`;
+        const conn = Self.dataSource.connector;
+        let stmts = [];
+
+        stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.travel');
+
+        stmt = new ParameterizedSQL(`
+            CREATE TEMPORARY TABLE tmp.travel (
+                SELECT 
+                    t.id, 
+                    t.warehouseInFk, 
+                    t.warehouseOutFk, 
+                    t.landed, 
+                    t.shipped,
+                    t.agencyFk
+                FROM travel t
+                    WHERE t.agencyFk = ? LIMIT 50)`, [agencyModeFk]);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL(`
+            SELECT 
+                t.id, 
+                t.warehouseInFk, 
+                t.warehouseOutFk, 
+                    (SELECT ROUND(AVG(DATEDIFF(t.landed, t.shipped )))
+                    FROM tmp.travel t 
+                    WHERE t.agencyFk 
+                        ORDER BY id DESC LIMIT 50) AS dayDuration
+            FROM tmp.travel t
+            WHERE t.agencyFk 
+                ORDER BY t.id DESC LIMIT 1`);
+
+        const avgDaysIndex = stmts.push(stmt) - 1;
+
+        stmts.push(
+            `DROP TEMPORARY TABLE 
+                tmp.travel`);
+
+        const sql = ParameterizedSQL.join(stmts, ';');
+        const result = await conn.executeStmt(sql);
+
+        const [avgDays] = result[avgDaysIndex];
 
-        const [avgDays] = await Self.rawSql(query, [agencyModeFk, agencyModeFk]);
         return avgDays;
     };
 };

modules/travel/front/create/index.js

@@ -22,6 +22,9 @@ class Controller extends Section {
             agencyModeFk: this.travel.agencyModeFk
         };
         this.$http.get(query, {params}).then(res => {
+            if (!res.data)
+                return;
+
             const landed = new Date(value);
             const futureDate = landed.getDate() + res.data.dayDuration;
             landed.setDate(futureDate);

modules/travel/front/create/index.spec.js

@@ -51,14 +51,29 @@ describe('Travel Component vnTravelCreate', () => {
             expect(controller.travel.warehouseOutFk).toBeUndefined();
         });
 
+        it(`should do nothing if there's no response data.`, () => {
+            controller.travel = {agencyModeFk: 4};
+            const tomorrow = new Date();
+
+            const query = `travels/getAverageDays?agencyModeFk=${controller.travel.agencyModeFk}`;
+            $httpBackend.expectGET(query).respond(undefined);
+            controller.onShippedChange(tomorrow);
+            $httpBackend.flush();
+
+            expect(controller.travel.warehouseInFk).toBeUndefined();
+            expect(controller.travel.warehouseOutFk).toBeUndefined();
+            expect(controller.travel.dayDuration).toBeUndefined();
+        });
+
         it(`should fill the fields when it's selected a date and agency.`, () => {
             controller.travel = {agencyModeFk: 1};
             const tomorrow = new Date();
-            tomorrow.setDate(tomorrow.getDate() + 1);
+            tomorrow.setDate(tomorrow.getDate() + 9);
             const expectedResponse = {
-                dayDuration: 2,
-                warehouseInFk: 1,
-                warehouseOutFk: 2
+                id: 8,
+                dayDuration: 9,
+                warehouseInFk: 5,
+                warehouseOutFk: 1
             };
 
             const query = `travels/getAverageDays?agencyModeFk=${controller.travel.agencyModeFk}`;