Merge 60b0e7a into 013aa6a

andela · Sep 11, 2019 · 489d647 · 489d647
2 parents 013aa6a + 60b0e7a
commit 489d647
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/controllers/Trip.js b/src/controllers/Trip.js
@@ -20,12 +20,15 @@ class TripController {
     try {
       const userTrips = await Trip.findAll({
         where: { userId: id },
+        attributes: {
+          exclude: ['startBranchId', 'userId']
+        },
         include: [
           {
             model: Stop,
             as: 'stop',
-            attributes: ['destinationBranchId', 'accomodationId'],
-            include: [{ model: Branch, as: 'branch', attributes: ['id', 'name', 'locationId'] },
+            attributes: ['id'],
+            include: [{ model: Branch, as: 'branch', attributes: ['id', 'name'] },
               { model: Accomodation, as: 'accomodation', attributes: ['id', 'name', 'capacity', 'status'] }]
           },
           { model: User, as: 'user', attributes: ['firstName', 'lastName'] },

diff --git a/test/trip.test.js b/test/trip.test.js
@@ -44,8 +44,7 @@ describe('Travel Request', () => {
       chai.request(app).get(`${baseURL}/user`).send({ token }).end((err, res) => {
         expect(res.status).to.eq(200);
         expect(res.body.message).to.eq('User requests successfully retrieved');
-        expect(res.body.data[0].userId).to.eq(completeLoginWithCode.id);
-        expect(res.body.data[0].stop).to.be.an('Array');
+        expect(res.body.data).to.be.an('Array');
         done();
       });
     });