Merge branch '2037_getWorkedHours_db_test' of verdnatura/salix into dev

db/dump/fixtures.sql

@@ -1679,12 +1679,12 @@ INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
 
 INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `dated`)
     VALUES
-        (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=2, 2, 9 ) - DAYOFWEEK(CURDATE())) DAY)),
+        (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=2, 2, 9)  - DAYOFWEEK(CURDATE())) DAY)),
         (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=3, 3, 10) - DAYOFWEEK(CURDATE())) DAY)),
         (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=4, 4, 11) - DAYOFWEEK(CURDATE())) DAY)),
         (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=5, 5, 12) - DAYOFWEEK(CURDATE())) DAY)),
         (1, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=6, 6, 13) - DAYOFWEEK(CURDATE())) DAY)),
-        (2, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=2, 2, 9 ) - DAYOFWEEK(CURDATE())) DAY)),
+        (2, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=2, 2, 9)  - DAYOFWEEK(CURDATE())) DAY)),
         (2, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=3, 3, 10) - DAYOFWEEK(CURDATE())) DAY)),
         (2, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=4, 4, 11) - DAYOFWEEK(CURDATE())) DAY)),
         (2, 'day', DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=5, 5, 12) - DAYOFWEEK(CURDATE())) DAY)),

db/tests/vn/ticketCreateWithUser.spec.js

@@ -43,7 +43,6 @@ describe('ticket ticketCreateWithUser()', () => {
 
         let ticketResult = result[ticketResultIndex][0];
 
-
         expect(ticketResult.id).toBeGreaterThan(21);
         expect(ticketResult.clientFk).toEqual(params.clientFk);
         expect(ticketResult.warehouseFk).toEqual(params.warehouseFk);

db/tests/vn/timeBusiness_calculateByUser.spec.js

@@ -0,0 +1,40 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('timeBusiness_calculateByUser()', () => {
+    it('should return the expected hours for today', async() => {
+        let start = new Date();
+        start.setHours(0, 0, 0, 0);
+        let end = new Date();
+        end.setHours(0, 0, 0, 0);
+
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        let params = {
+            workerID: 106,
+            start: start,
+            end: end
+        };
+
+        stmt = new ParameterizedSQL('CALL vn.timeBusiness_calculateByUser(?, ?, ?)', [
+            params.workerID,
+            params.start,
+            params.end
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT * FROM tmp.timeBusinessCalculate') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [timeBusinessCalculateTable] = result[tableIndex];
+
+        expect(timeBusinessCalculateTable.timeBusinessSeconds).toEqual(28800);
+    });
+});

db/tests/vn/timeControl_calculateByUser.spec.js

@@ -0,0 +1,107 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('timeControl_calculateByUser()', () => {
+    it(`should return today's worked hours`, async() => {
+        let start = new Date();
+        start.setHours(0, 0, 0, 0);
+        start.setDate(start.getDate() - 1);
+
+        let end = new Date();
+        end.setHours(0, 0, 0, 0);
+        end.setDate(end.getDate() + 1);
+
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        stmts.push(`
+            DROP TEMPORARY TABLE IF EXISTS 
+                tmp.timeControlCalculate,
+                tmp.timeBusinessCalculate
+        `);
+
+        let params = {
+            workerID: 106,
+            start: start,
+            end: end
+        };
+
+        stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+            params.workerID,
+            params.start,
+            params.end
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [timeControlCalculateTable] = result[tableIndex];
+
+        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(29400);
+    });
+
+    it(`should return the worked hours between last sunday and monday`, async() => {
+        let lastSunday = new Date();
+        let daysSinceSunday = lastSunday.getDay();
+        if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
+            daysSinceSunday = 7;
+        lastSunday.setHours(23, 0, 0, 0);
+        lastSunday.setDate(lastSunday.getDate() - daysSinceSunday);
+
+        let monday = new Date();
+        let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday)
+        monday.setHours(7, 0, 0, 0);
+        monday.setDate(monday.getDate() - daysSinceMonday);
+
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        stmts.push(`
+            DROP TEMPORARY TABLE IF EXISTS 
+                tmp.timeControlCalculate,
+                tmp.timeBusinessCalculate
+        `);
+
+        const workerID = 107;
+
+        stmt = new ParameterizedSQL(`
+            INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction)
+                VALUES
+                    (?, ?, 1, 'in'),
+                    (?, ?, 1, 'out')
+        `, [
+            workerID,
+            lastSunday,
+            workerID,
+            monday
+        ]);
+        stmts.push(stmt);
+
+        stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [
+            workerID,
+            lastSunday,
+            monday
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [timeControlCalculateTable] = result[tableIndex];
+
+        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(30000);
+    });
+});

modules/worker/back/methods/worker/mySubordinates.js

@@ -35,7 +35,6 @@ module.exports = Self => {
         let sql = ParameterizedSQL.join(stmts, ';');
         let result = await conn.executeStmt(sql);
 
-
         return result[1];
     };
 };

modules/worker/back/methods/worker/specs/getWorkedHours.spec.js

@@ -0,0 +1,17 @@
+const app = require('vn-loopback/server/server');
+
+describe('Worker getWorkedHours()', () => {
+    it(`should return the expected hours and the worked hours of a given date`, async() => {
+        const workerID = 106;
+        let started = new Date();
+        started.setHours(0, 0, 0, 0);
+
+        let ended = new Date();
+        ended.setHours(0, 0, 0, 0);
+
+        const [result] = await app.models.Worker.getWorkedHours(workerID, started, ended);
+
+        expect(result.expectedHours).toEqual(28800); // 8:00 hours seconds
+        expect(result.workedHours).toEqual(29400); // 8:10 hours in seconds
+    });
+});

modules/worker/back/methods/worker/timeControl.js

@@ -44,7 +44,6 @@ module.exports = Self => {
         let sql = ParameterizedSQL.join(stmts, ';');
         let result = await conn.executeStmt(sql);
 
-
         return result[0];
     };
 };