ft(update trip request): user should be able update trip request

- squash commit [finishes #168781705]
andela · Oct 29, 2019 · ee4873f · ee4873f
1 parent 5cf5bc1
commit ee4873f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 46 deletions.
diff --git a/src/database/seeders/20191016143026-requestTableSeeder.js b/src/database/seeders/20191016143026-requestTableSeeder.js
@@ -17,7 +17,7 @@ module.exports = {
       typeId: 3,
       userId: 3,
       locationId: 2,
-      statusId: 2,
+      statusId: 1,
       departureDate: '10-25-2019',
       returnDate: '11-25-2019',
       createdAt: new Date(),

diff --git a/src/routes/api/requests.js b/src/routes/api/requests.js
@@ -10,31 +10,17 @@ import catchSearchQueries from '../../middlewares/catchSearchQueries';
 import pendingRequest from '../../middlewares/request';
 
 const router = new Router();
-// const {
-//   viewMyRequests, approveRequest, rejectRequest, viewManagerRequests, searchRequests
-
-// import pendingRequest from '../../middlewares/request';
-// import checkUserIdField from '../../middlewares/checkUserIdField';
-// import managerUserIdField from '../../middlewares/managerUserIdField';
-// import catchSearchQueries from '../../middlewares/catchSearchQueries';
-// import InputValidation from '../../middlewares/inputValidation';
-
-// const { validateRequest } = InputValidation;
-
-// const router = new Router();
 const {
   viewMyRequests, approveRequest, rejectRequest, viewManagerRequests, searchRequests, updateRequest
 } = requestController;
 
-const { validateSearchRequestUser, validateSearchRequestManager, validateRequest } = InputValidation;
+const {
+  validateSearchRequestUser,
+  validateSearchRequestManager,
+  validateRequest,
+} = InputValidation;
 const { checkManagerRole, supplierNotAllowed } = checkRole;
 
-
-// router.get('/', validateToken, viewMyRequests);
-// router.get('/manager', validateToken, checkManagerRole, viewManagerRequests);
-// router.patch('/manager/approve/:id', validateToken, checkManagerRole, checkId, approveRequest);
-// router.patch('/manager/reject/:id', validateToken, checkManagerRole, checkId, rejectRequest);
-
 /**
  * @swagger
  * /requests/search:
@@ -153,26 +139,13 @@ const { checkManagerRole, supplierNotAllowed } = checkRole;
  *         description: No Requests Registered!
 */
 
-
-// router.get('/', validateToken, (req, res) => requestController.viewRequests(req, res));
-// router.get('/search', validateToken, catchSearchQueries, supplierNotAllowed, validateSearchRequestUser, checkUserIdField, searchRequests);
-
-// eslint-disable-next-line max-len
-
-// router.get('/manager/search', validateToken, catchSearchQueries, supplierNotAllowed, checkManagerRole, validateSearchRequestManager, managerUserIdField, searchRequests);
-
 router.get('/search', validateToken, catchSearchQueries, supplierNotAllowed, validateSearchRequestUser, checkUserIdField, searchRequests);
 // eslint-disable-next-line max-len
 router.get('/manager/search', validateToken, catchSearchQueries, supplierNotAllowed, checkManagerRole, validateSearchRequestManager, managerUserIdField, searchRequests);
 router.get('/', validateToken, viewMyRequests);
 router.get('/manager', validateToken, checkManagerRole, viewManagerRequests);
 router.patch('/manager/approve/:id', validateToken, checkManagerRole, checkId, approveRequest);
 router.patch('/manager/reject/:id', validateToken, checkManagerRole, checkId, rejectRequest);
-router.patch('/:id',
-  validateToken,
-  pendingRequest.requestOwner,
-  pendingRequest.selectPending,
-  validateRequest,
-  updateRequest);
+router.patch('/:id', validateToken, pendingRequest.requestOwner, pendingRequest.selectPending, validateRequest, updateRequest);
 
 export default router;
diff --git a/src/tests/accommodationTest.spec.js b/src/tests/accommodationTest.spec.js
@@ -14,7 +14,7 @@ let adminToken;
 let supplierToken;
 
 let invalidToken = 'wdsfwsadwsadsadsqa';
-
+// it should not book an accommodation with supplier Token:
 describe('Accommodation Test', () => {
     before((done) => {
         chai.request(app)
@@ -307,17 +307,7 @@ describe('Accommodation Test', () => {
                     done();
                   });
                 });
-                it('it should not book an accommodation with supplier Token', done => {
-                  chai.request(app)
-                    .patch('/api/v1/accommodations/book')
-                    .set('Authorization', `Bearer ${supplierToken}`)
-                    .send(mockData.bookingdata)
-                    .end((err, res) => {
-                      res.should.have.status(403);
-                      res.body.should.have.property('message').eql('Access denied! a supplier can not access this part of the system!')
-                      done();
-                    });
-                  });
+
                   it('it should get all bookings', done => {
                     chai.request(app)
                       .get('/api/v1/accommodations/bookings')