Merge pull request #68 from andela/ch-Add-trip-status-171355993

#171355993 Add view trip request with its status
andela · Feb 19, 2020 · c42c5ba · c42c5ba
2 parents e6b30cd + 9b29e54
commit c42c5ba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/controllers/trip.controller.js b/src/controllers/trip.controller.js
@@ -58,7 +58,6 @@ class TripController {
     const offset = (page - 1) * limit;
 
     const results = await TripService.findByPropertyAndCountAll({ userId }, { offset, limit });
-
     ResponseService.setSuccess(200, 'List of requested trips', {
       pageMeta: paginationHelper({
         count: results.count, rows: results.rows, offset, limit

diff --git a/src/models/trip.js b/src/models/trip.js
@@ -16,7 +16,7 @@ export default (sequelize, DataTypes) => {
     Trip.belongsTo(models.Users, { foreignKey: 'userId', targetKey: 'id' });
     Trip.belongsTo(models.Location, { foreignKey: 'originId', targetKey: 'id' });
     Trip.belongsTo(models.Location, { foreignKey: 'destinationId', targetKey: 'id' });
-    Trip.belongsTo(models.Request, { foreignKey: 'requestId', targetKey: 'id' });
+    Trip.belongsTo(models.Request, { foreignKey: 'requestId', targetKey: 'id', as: 'request' });
   };
   Trip.afterCreate(({ dataValues }) => {
     emitter.emit('request-created', dataValues);

diff --git a/src/routes/trip.route.js b/src/routes/trip.route.js
@@ -15,7 +15,7 @@ const router = express.Router();
 router.post('/one-way', authMiddleware.checkUserLoggedIn, authMiddleware.checkIfUserHaveManager, oneWayTripValidation, TripController.requestOneWayTrip); // One way trip route
 router.post('/return', authMiddleware.checkUserLoggedIn, authMiddleware.checkIfUserHaveManager, returnTripValidation, TripController.requestReturnTrip); // Return trip route
 router.post('/multi-city', authMiddleware.checkUserLoggedIn, authMiddleware.checkIfUserHaveManager, multiCityTripValidation, TripController.requestMultiCityTrip);
-router.get('/requests', authMiddleware.checkUserLoggedIn, requestValidation, TripController.userTripRequestList); // user request list route
+router.get('/requests', authMiddleware.checkUserLoggedIn, requestValidation, TripController.userTripRequestList); // manager's request list route
 router.get('/locations', authMiddleware.checkUserLoggedIn, TripController.viewAvailableLocations);
 router.post('/requests/:tripId/comments', authMiddleware.checkUserLoggedIn, UserValidation.validateUserComment, CommentController.addCommentOnTripRequest); // user comment on request trip route
 router.delete('/:tripId/comments/:commentId', authMiddleware.checkUserLoggedIn, UserValidation.validateDeleteTripComment, TripMiddleware.checkTripExist, CommentMiddleware.checkCommentExist, CommentController.deleteComment); // user deletes comment route

diff --git a/src/services/trip.service.js b/src/services/trip.service.js
@@ -1,6 +1,6 @@
 import models from '../models';
 
-const { Trip, Location } = models;
+const { Trip, Location, Request } = models;
 
 /**
  *
@@ -63,6 +63,7 @@ class TripService {
       attributes: [
         'userId',
         'tripType',
+        'requestId',
         'originId',
         'destinationId',
         'departureDate',
@@ -71,6 +72,10 @@ class TripService {
         'createdAt',
         'updatedAt'
       ],
+      include: [{
+        model: Request,
+        as: 'request',
+      }],
       offset,
       limit
     });