resolved conflicts

Author: ChidiChuks

package.json

@@ -5,18 +5,20 @@
     "main": "index.js",
     "scripts": {
         "build": "babel -d ./build ./src -s",
-        "prod": "set NODE_ENV=production&& node build/index.js",
-        "start": "set NODE_ENV=development&& babel-node src/index.js",
-        "dev": "set DEBUG=web-app && set NODE_ENV=development&& nodemon src/index.js --exec babel-node",
-        "test": "set NODE_ENV=test&& sequelize db:migrate:undo:all && sequelize db:migrate && sequelize db:seed:all && mocha --timeout 0 ./src/tests/*.js --require @babel/register --reporter spec --exec babel-node --exit",
-        "generate-lcov": "nyc report --reporter=text-lcov >lcov.info",
-        "coveralls-coverage": "coveralls < lcov.info",
         "coverage": "nyc npm test && npm run generate-lcov && npm run coveralls-coverage",
         "coveralls": "nyc --reporter=lcov --reporter=text-lcov npm test",
+        "coveralls-coverage": "coveralls < lcov.info",
         "create:db": "set NODE_ENV=development&& sequelize db:create",
+        "create:tables": "set NODE_ENV=development&& npm run migrate:db && npm run seed:db",
+        "dev": "set DEBUG=web-app && set NODE_ENV=development&& nodemon src/index.js --exec babel-node",
         "drop:db": "set NODE_ENV=development&& sequelize db:drop",
-        "undo:db": "sequelize db:migrate:undo:all",
-        "create:tables": "set NODE_ENV=development&& sequelize db:migrate && sequelize db:seed:all"
+        "generate-lcov": "nyc report --reporter=text-lcov >lcov.info",
+        "migrate:db": "sequelize db:migrate",
+        "prod": "set NODE_ENV=production&& node build/index.js",
+        "seed:db": "sequelize db:seed:all",
+        "start": "set NODE_ENV=development&& babel-node src/index.js",
+        "test": "set NODE_ENV=test&& npm run undo:db && npm run migrate:db && npm run seed:db && mocha --timeout 0 ./src/tests/*.js --require @babel/register --reporter spec --exec babel-node --exit",
+        "undo:db": "sequelize db:migrate:undo:all"
     },
     "author": "Andela Simulations Programme",
     "license": "MIT",
@@ -57,7 +59,6 @@
         "sequelize": "^5.15.2",
         "sequelize-cli": "^5.5.0",
         "socket.io": "^2.2.0",
-        "socket.io-client": "^2.2.0",
         "underscore": "^1.9.1"
     },
     "devDependencies": {

src/controllers/travelControllers.js

@@ -1,10 +1,16 @@
 import socketEmission from '../services/websocket';
+/* eslint-disable no-else-return */
 import {
     onewayTripService,
+    createTripService,
     showManagerPendingAppr,
     showUsertravelsStatus,
     approveTravel,
+    mostTraveled,
+    editOpenRequests,
+    checkApprovalStatus
 } from '../services/travelServices';
+
 import { findUserByEmail } from '../services/authServices';
 import { successResponseWithData, errorResponse } from '../utils/response';
 import sendVerificationEmail from '../utils/email';
@@ -14,7 +20,7 @@ import statusCode from '../utils/statusCode';
 
 const { emission } = socketEmission;
 
-export const createOneWayTrip = async(req, res) => {
+const createOneWayTrip = async(req, res) => {
     try {
         const user = await findUserByEmail(req.userData.email);
         const { id, email, dept_id } = user.dataValues;
@@ -46,7 +52,31 @@ export const createOneWayTrip = async(req, res) => {
     }
 };
 
-export const pendingManagerApproval = async(req, res) => {
+const createReturnTrip = async(req, res) => {
+    try {
+        const user = await findUserByEmail(req.userData.email);
+        const { id, dept_id } = user.dataValues;
+
+        const travelRequestData = {
+            user_id: id,
+            dept_id,
+            ...req.body
+        };
+
+        const createdReturnTripData = await createTripService(travelRequestData);
+
+        successResponseWithData(
+            res,
+            statusCode.created,
+            message.returnTripCreated,
+            createdReturnTripData
+        );
+    } catch (err) {
+        errorResponse(res, err.statusCode || statusCode.serverError, err);
+    }
+};
+
+const pendingManagerApproval = async(req, res) => {
     const { role } = req.userData;
 
     const { manager } = req.params;
@@ -73,7 +103,7 @@ export const pendingManagerApproval = async(req, res) => {
     }
 };
 
-export const getUserTravelStatus = async(req, res) => {
+const getUserTravelStatus = async(req, res) => {
     const { role, id } = req.userData;
 
     if (role === 'manager') {
@@ -92,7 +122,9 @@ export const getUserTravelStatus = async(req, res) => {
     }
 };
 
-export const approveTravelRequest = async(req, res) => {
+const approveTravelRequest = async(req, res) => {
+    const { role, id } = req.userData;
+
     try {
         const updatedTravel = await approveTravel(req.params.travel_id);
 
@@ -104,5 +136,54 @@ export const approveTravelRequest = async(req, res) => {
         );
     } catch (err) {
         errorResponse(res, statusCode.serverError, err);
+        if (role === 'admin') {
+            return errorResponse(res, statusCode.unauthorized, message.unauthorized);
+        } else {
+            try {
+                const data = await showUsertravelsStatus(id);
+                return successResponseWithData(res, statusCode.success, message.userApproval, data);
+            } catch (error) {
+                errorResponse(res, statusCode.serverError, error);
+            }
+        }
     }
 };
+
+const userCanEditOpenRequest = async(req, res) => {
+    const { travel_id } = req.params;
+
+    const userId = req.userData.id;
+
+    try {
+        const result = await checkApprovalStatus(travel_id, userId);
+
+        if (result[0].approval_status !== 'pending') {
+            errorResponse(res, statusCode.badRequest, message.requestNotOpen);
+        }
+
+        const updatedRequest = await editOpenRequests(req.body, userId, travel_id);
+
+        successResponseWithData(res, statusCode.success, message.requestUpdated, updatedRequest[1][0]);
+    } catch (err) {
+        errorResponse(res, statusCode.serverError, err);
+    }
+};
+
+const mostTravelledDest = async(req, res) => {
+    try {
+        const travelled = await mostTraveled();
+        successResponseWithData(res, statusCode.success, message.oneWayTripCreated, travelled);
+    } catch (error) {
+        errorResponse(res, statusCode.serverError, error);
+    }
+};
+
+export {
+    createOneWayTrip,
+    createReturnTrip,
+    pendingManagerApproval,
+    getUserTravelStatus,
+    approveTravelRequest,
+    userCanEditOpenRequest,
+    mostTravelledDest
+};

src/database/migrations/20190823140019-create-travel.js

@@ -0,0 +1,8 @@
+module.exports = {
+  up: function(queryInterface, Sequelize) {
+    return Promise.resolve();
+  },
+  down: function(queryInterface) {
+    return Promise.resolve();
+  }
+};

src/database/migrations/20190902110720-create-comments.js

@@ -0,0 +1,8 @@
+module.exports = {
+  up: function(queryInterface, Sequelize) {
+    return Promise.resolve();
+  },
+  down: function(queryInterface) {
+    return Promise.resolve();
+  }
+};

src/index.js

@@ -10,7 +10,7 @@ import http from 'http';
 import socketIo from 'socket.io';
 import { fbStrategy, googleStrategy } from './config/passport';
 import message from './utils/messageUtils';
-import response from './utils/response';
+import { successResponse } from './utils/response';
 import statusCode from './utils/statusCode';
 import routes from './routes';
 import socketEmission from './services/websocket';
@@ -54,14 +54,14 @@ passport.deserializeUser((user, cb) => {
 // serve the api endpoints built in routes folder
 routes(prefix, app, io);
 // handles the api home route...
-app.all('/', (req, res) => response.successResponse(res, statusCode.success, message.defaultWelcome));
+app.all('/', (req, res) => successResponse(res, statusCode.success, message.defaultWelcome));
 // serve the api endpoints built in routes folder
 // app.use(routes);
 // app.use('/', router);
 
 
 app.get(`${prefix}/`, (req, res) => {
-  response.successResponse(res, statusCode.success, message.welcome);
+  successResponse(res, statusCode.success, message.welcome);
 });
 
 const isProduction = process.env.NODE_ENV === 'production';

src/models/travel_request.js

@@ -1,6 +1,12 @@
 /* eslint-disable import/no-dynamic-require */
 module.exports = (sequelize, DataTypes) => {
   const travel_request = sequelize.define('travel_requests', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: DataTypes.INTEGER
+    },
     user_id: DataTypes.INTEGER,
     travel_type: {
       type: DataTypes.ENUM,

src/routes/travelRoute.js

@@ -2,14 +2,25 @@ import { Router } from 'express';
 
 import {
     createOneWayTrip,
-    pendingManagerApproval,
     getUserTravelStatus,
     approveTravelRequest,
+    createReturnTrip,
+    mostTravelledDest,
+    userCanEditOpenRequest,
+    pendingManagerApproval
 } from '../controllers/travelControllers';
+
 import {
     validateTravelRequest,
+    validateReturnTrip,
     validateResult,
 } from '../validation/travelValidation';
+
+import {
+    departureDateValidator,
+    futureDateValidator
+} from '../validation/dateValidator';
+
 import { verifyDeptManagerAndRequestStatus } from '../middlewares/travelsMiddleware';
 import { verifyRole } from '../middlewares/userMiddlewares';
 import { getToken, verifyToken } from '../middlewares/tokenMiddleware';
@@ -20,8 +31,20 @@ const route = Router();
 // handles the api home route...
 route.post('/travel/one_way_trip', getToken, verifyToken, validateTravelRequest, validateResult, createOneWayTrip);
 
+// This is the route that will handle the request to create a valid return trip for a user....
+route.post(
+    '/travel/return_trip',
+    getToken,
+    verifyToken,
+    validateReturnTrip,
+    validateResult,
+    departureDateValidator,
+    futureDateValidator,
+    createReturnTrip
+);
+
 // handles manager pending req approvals route
-route.get('/requests/pending/:manager', getToken, verifyToken, pendingManagerApproval);
+route.get('/travel/pending_request/:manager', getToken, verifyToken, pendingManagerApproval);
 
 // user request status
 route.get('/user/status', getToken, verifyToken, getUserTravelStatus);
@@ -35,4 +58,14 @@ route.patch(
     approveTravelRequest,
 );
 
+// handles editing of user's pending request
+route.put(
+    '/travel/update_request/:travel_id',
+    getToken,
+    verifyToken,
+    validateTravelRequest,
+    validateResult,
+    userCanEditOpenRequest
+);
+
 export default route;