Merge branch 'ft-notify-new-travel-167730641' of https://github.com/andela/archangel-backend into ft-notify-new-travel-167730641

# Conflicts:
#	package.json
#	src/controllers/travelControllers.js
#	src/routes/travelRoute.js
#	src/services/travelServices.js
#	src/tests/travel.test.js
#	src/utils/messageUtils.js

Author: iakhator

src/routes/travelRoute.js

@@ -61,7 +61,5 @@ route.patch(
   verifyDeptManagerAndRequestStatus,
   approveTravelRequest,
 );
-// Most travelled to destinations
-route.get('/most', getToken, verifyToken, mostTravelledDest);
 
 export default route;

src/services/travelServices.js

@@ -86,17 +86,18 @@ export const approveTravel = async (id) => {
   }
 };
 
-export const mostTraveled = async () => {
+export const approveTravel = async (id) => {
   try {
-    return await travel_requests.findAll({
-      attributes: ['destination', [sequelize.fn('count', sequelize.col('destination')), 'count']],
-      group: ['destination'],
-      raw: true,
-      order: sequelize.literal('count DESC'),
-      limit: 3
+    return await travel_requests.update({
+      approval_status: 'accepted'
+    }, {
+      returning: true,
+      where: {
+        id
+      }
     });
-  } catch (error) {
-    throw error;
+  } catch (err) {
+    throw err;
   }
 };