andela · Pomile · Sep 11, 2019
diff --git a/src/controllers/Trip.js b/src/controllers/Trip.js
@@ -1,7 +1,9 @@
-import { Op } from 'sequelize';
+import Sequelize from 'sequelize';
 import db from '../database/models';
 import Response from '../helpers/Response';
+import date from '../utils/date';
 
+const { Op } = Sequelize;
 const {
   Trip, Branch, User, Stop, Accomodation, Location
 } = db;
@@ -424,6 +426,30 @@ class TripController {
       );
     }
   }
+  static async countTripsByTimeframe(req, res) {
+    const { start, end } = req.query;
+    const { payload } = req.payload;
+    const formatStartDate = date.format(start);
+    const formatEnDate = date.format(end);
+    const tripCount = await Trip.count({
+      where: {
+        userId: payload.id,
+        createdAt: {
+          [Op.between]: [start, end]
+        }
+      }
+    });
+    const message = formatStartDate !== formatEnDate ?
+      `Number of trip requests between ${formatStartDate} and ${formatEnDate}` :
+      `Number trip requests for ${formatEnDate}`;
+    const response = new Response(
+      true,
+      200,
+      message,
+      { tripCount }
+    );
+    return res.status(response.code).json(response);
+  }
 }
 
 export default TripController;
diff --git a/src/database/seeders/20190821112340-companies.js b/src/database/seeders/20190821112340-companies.js
@@ -21,6 +21,13 @@ module.exports = {
       address: '12 Ikorodu Road, Lagos',
       code: 'BAREFOOT',
       owner: 'Barefoot Admin'
+    },
+    {
+      id: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      name: 'Soft Blues Limited',
+      address: '234 Muriokunola street, Lagos Island',
+      code: 'SB0002',
+      owner: 'Brightside'
     }
   ]),
   down: queryInterface => queryInterface.bulkDelete('Companies', null, {})

diff --git a/src/database/seeders/20190821112700-users.js b/src/database/seeders/20190821112700-users.js
@@ -132,6 +132,42 @@ module.exports = {
       gender: 'male',
       dob: '2012-09-10',
       status: 'active',
+      role: 'manager'
+    },
+    {
+      id: '8c2b1bb8-c3f2-410a-bd07-4743cfc65758',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      firstName: 'Dolapo',
+      lastName: 'Junior',
+      email: 'dolapo.junior@gmail.com',
+      password: hashHelper.hashPassword('password2019'),
+      gender: 'male',
+      dob: '2012-09-10',
+      status: 'active',
+      role: 'travel admin'
+    },
+    {
+      id: '54cef27e-a449-4f00-8a5c-d103be93ebb0',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      firstName: 'Bright',
+      lastName: 'John',
+      email: 'bright.john@gmail.com',
+      password: hashHelper.hashPassword('password2019'),
+      gender: 'male',
+      dob: '2012-09-10',
+      status: 'active',
+      role: 'manager'
+    },
+    {
+      id: 'f30f431e-0d60-47cd-ae8a-5864c5246d98',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      firstName: 'Mary',
+      lastName: 'Jane',
+      email: 'mary.jane@gmail.com',
+      password: hashHelper.hashPassword('password2019'),
+      gender: 'female',
+      dob: '2012-09-10',
+      status: 'active',
       role: 'travel admin'
     },
     {
@@ -148,4 +184,4 @@ module.exports = {
     },
   ]),
   down: queryInterface => queryInterface.bulkDelete('Users', null, {})
-};
+};
diff --git a/src/database/seeders/20190829125544-create-locations.js b/src/database/seeders/20190829125544-create-locations.js
@@ -9,10 +9,52 @@ module.exports = {
     },
     {
       id: '3dd3b24a-7554-425e-a688-36afda195614',
+      companyId: 'a6e35eb9-8c59-4c7d-b8d4-ae724aa7fb61',
+      country: 'Nigeria',
+      city: 'Lagos'
+    },
+    {
+      id: 'bf308b41-56fe-47fb-ba50-36fb998a4d21',
+      companyId: 'a6e35eb9-8c59-4c7d-b8d4-ae724aa7fb61',
+      country: 'Nigeria',
+      city: 'Portharcourt'
+    },
+    {
+      id: '07eea927-ae7e-4f3d-a9f8-31651c0e66c6',
+      companyId: 'a6e35eb9-8c59-4c7d-b8d4-ae724aa7fb62',
+      country: 'Nigeria',
+      city: 'Abuja'
+    },
+    {
+      id: '48d67cc4-8056-4585-802b-905d940e27eb',
+      companyId: 'a6e35eb9-8c59-4c7d-b8d4-ae724aa7fb62',
+      country: 'Nigeria',
+      city: 'Lagos'
+    },
+    {
+      id: 'bc6afe1c-70a2-4418-a88b-2a5e79eea008',
       companyId: 'a6e35eb9-8c59-4c7d-b8d4-ae724aa7fb62',
       country: 'Nigeria',
+      city: 'Portharcourt'
+    },
+    {
+      id: 'd6935e25-a979-4e0c-88f1-255bb44e22b9',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      country: 'Nigeria',
+      city: 'Abuja'
+    },
+    {
+      id: '33891516-0002-472d-9b2e-d9eca01f1db2',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      country: 'Nigeria',
       city: 'Lagos'
-    }
+    },
+    {
+      id: 'a8ac5089-a87f-4c06-9556-c611835ab5ba',
+      companyId: 'e819fb11-d55f-4cbf-ad04-894d53cee722',
+      country: 'Nigeria',
+      city: 'Portharcourt'
+    },
   ]),
   down: queryInterface => queryInterface.bulkDelete('Locations', null, {})
 };
diff --git a/src/database/seeders/20190829125545-create-branches.js b/src/database/seeders/20190829125545-create-branches.js
@@ -29,7 +29,22 @@ module.exports = {
       id: '3dd3b34a-7554-455e-a688-36afda199159',
       name: 'Ibadan',
       locationId: '0190ae78-d184-4258-add5-0b2c6982efef'
-    }
+    },
+   {
+      id: '1404d644-fa2e-49a9-982f-eec3afeb5c0d',
+      name: 'Rumuokoro',
+      locationId: 'a8ac5089-a87f-4c06-9556-c611835ab5ba'
+    },
+    {
+      id: '7b717bff-9202-4c44-9848-80ec876b6fdc',
+      name: 'Ikeja',
+      locationId: '33891516-0002-472d-9b2e-d9eca01f1db2'
+    },
+    {
+      id: 'dbbe4992-4091-4914-a266-38ecdcf42083',
+      name: 'Gwagwalada',
+      locationId: 'd6935e25-a979-4e0c-88f1-255bb44e22b9'
+    },
   ]),
   down: (queryInterface) => queryInterface.bulkDelete('Branches', null, {})
 };
diff --git a/src/database/seeders/20190829125546-create-trips.js b/src/database/seeders/20190829125546-create-trips.js
@@ -1,34 +1,39 @@
+import timeframe from '../../../test/mockData/mockDate';
+import moment from 'moment';
 module.exports = {
   up: queryInterface => queryInterface.bulkInsert('Trips', [
     {
       id: 'ffe25dbe-29ea-4759-8461-ed116f6739df',
       type: 'oneway',
       startBranchId: 'ffe35dbe-29ea-4759-8461-ed116f6739dd',
       userId: 'ffe25dbe-29ea-4759-8461-ed116f6739dd',
-      tripDate: '2019-02-17',
+      tripDate: timeframe.lastXDays(10).startDate,
       returnDate: '2019-02-23',
       reason: 'for holiday',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(12).startDate
     },
     {
       id: 'ffe25dbe-29ea-4759-8468-ed116f6739df',
-      type: 'multiple',
+      type: 'oneway',
       startBranchId: 'ffe35dbe-29ea-4759-8461-ed116f6739dd',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f23',
-      tripDate: '2019-02-17',
+      tripDate: timeframe.lastXDays(0).startDate,
       returnDate: '2019-02-23',
       reason: 'for holiday',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(1).startDate
     },
     {
       id: 'ffe25dbe-29ea-4759-8462-ed116f6739df',
       type: 'return',
       startBranchId: 'ffe35dbe-29ea-4759-8461-ed116f6739dd',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f23',
-      tripDate: '2019-08-30',
+      tripDate: timeframe.lastXDays(10).startDate,
       returnDate: '2019-09-23',
       reason: 'for work',
-      status: 'approved'
+      status: 'approved',
+      createdAt: timeframe.lastXDays(12).startDate
     },
     {
       id: 'ffe25dbe-29ea-4759-8462-ed116f6749df',
@@ -38,54 +43,91 @@ module.exports = {
       tripDate: '2019-09-01',
       returnDate: '2019-09-21',
       reason: 'to meet with clients',
-      status: 'rejected'
+      status: 'rejected',
+      createdAt: timeframe.lastXDays(12).startDate
     },
     {
       id: 'ffe25dbe-49ea-4759-8462-ed116f6749df',
       type: 'oneway',
       startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f25',
-      tripDate: '2019-10-01',
+      tripDate: timeframe.lastXDays(23).startDate,
       returnDate: null,
       reason: 'to meet with clients',
-      status: 'approved'
+      status: 'approved',
+      createdAt: timeframe.lastXDays(20).startDate
     },
     {
       id: '72a5c8f5-27eb-4623-b6f4-09f77cc871f3',
       type: 'oneway',
       startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f24',
-      tripDate: '2019-02-17',
+      tripDate: timeframe.lastXDays(14).startDate,
+      returnDate: null,
       reason: 'for holiday',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(16).startDate
     },
     {
       id: 'ba3f6b93-f09e-49a4-bb28-c65555250bc1',
       type: 'return',
       startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f24',
-      tripDate: '2019-02-17',
-      returnDate: '2019-02-23',
+      tripDate: timeframe.lastXDays(7).startDate,
+      returnDate: '2019-12-23',
       reason: 'for holiday',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(9).startDate
     },
     {
       id: 'db17ddb2-a6ba-49f5-9715-e0e81eb7720a',
       type: 'multiple',
       startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f24',
-      tripDate: '2019-02-17',
+      tripDate: timeframe.lastXDays(2).startDate,
       reason: 'for holiday',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(3).startDate
     },
     {
       id: '4ae4fef9-8e5e-4d2a-879a-a0425cd3d5aa',
       type: 'oneway',
       startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
       userId: '91542e6f-94bc-4e80-a667-586fb0752f24',
-      tripDate: '2019-02-17',
+      tripDate: timeframe.lastXDays(2).startDate,
+      reason: 'for holiday',
+      status: 'approved',
+      createdAt: timeframe.lastXDays(5).startDate
+    },
+    {
+      id: '1b91c1b4-3dbf-4412-ac59-252eb8d0b689',
+      type: 'oneway',
+      startBranchId: '3dd3b34a-7554-425e-a688-36afda199614',
+      userId: '91542e6f-94bc-4e80-a667-586fb0752f24',
+      tripDate: timeframe.nextXDay(27),
+      reason: 'for holiday',
+      status: 'approved',
+      createdAt: timeframe.lastXDays(2).startDate
+    },
+    {
+      id: '0467cec6-44cb-456a-8b08-d53f925f3239',
+      type: 'oneway',
+      startBranchId: '1404d644-fa2e-49a9-982f-eec3afeb5c0d',
+      userId: 'f30f431e-0d60-47cd-ae8a-5864c5246d98',
+      tripDate: timeframe.nextXDay(2),
+      reason: 'for holiday',
+      status: 'approved',
+      createdAt: timeframe.lastXDays(30).startDate
+    },
+    {
+      id: 'c1313777-d50d-4fa6-bd9d-807c25ceef41',
+      type: 'return',
+      startBranchId: '1404d644-fa2e-49a9-982f-eec3afeb5c0d',
+      userId: '54cef27e-a449-4f00-8a5c-d103be93ebb0',
+      tripDate: timeframe.nextXDay(0),
       reason: 'for holiday',
-      status: 'approved'
+      status: 'approved',
+      createdAt: timeframe.lastXDays(14).startDate
     },
     {
       id: 'ff10015c-1624-4490-9b1f-1a2cf0ee4493',
@@ -95,7 +137,8 @@ module.exports = {
       tripDate: '2019-09-11',
       returnDate: null,
       reason: 'for meeting',
-      status: 'approved'
+      status: 'approved',
+      createdAt: timeframe.lastXDays(14).startDate
     },
     {
       id: 'ff10015c-1624-4490-9b1f-1a2cf0ee4492',
@@ -105,7 +148,8 @@ module.exports = {
       tripDate: '2019-09-15',
       returnDate: null,
       reason: 'meeting with company owner',
-      status: 'pending'
+      status: 'pending',
+      createdAt: timeframe.lastXDays(14).startDate
     }
   ]),
   down: queryInterface => queryInterface.bulkDelete('Trips', null, {})

diff --git a/src/database/seeders/20190829130100-create-accomodations.js b/src/database/seeders/20190829130100-create-accomodations.js
@@ -35,7 +35,28 @@ module.exports = {
       status: 'filled',
       imgurl: null,
       address: '31, Ocean drive, Lekki'
-    }
+    },
+    {
+      id: 'b4e9ba65-cb81-4b8a-8aec-1ffe24a9ed33',
+      name: 'Oriental',
+      branchId: '7b717bff-9202-4c44-9848-80ec876b6fdc',
+      capacity: 100,
+      status: 'filled'
+    },
+    {
+      id: 'b1a81334-fbf4-4160-83bf-e58f9063f7cf',
+      name: 'Crown Berry',
+      branchId: '1404d644-fa2e-49a9-982f-eec3afeb5c0d',
+      capacity: 100,
+      status: 'filled'
+    },
+    {
+      id: 'a16d39cd-3499-493a-8dd9-6141ed33df73',
+      name: 'Eko Hotel',
+      branchId: 'dbbe4992-4091-4914-a266-38ecdcf42083',
+      capacity: 100,
+      status: 'filled'
+    },
   ]),
   down: queryInterface => queryInterface.bulkDelete('Accomodations', null, {})
 };