#168781708-user can book an accommodation #32

sabin18 · 2019-10-24T00:26:31Z

What does this PR do?

It allow user to view all available accommodations and book an accommodation.

Description of Task to be completed?

add view all available accommodation function
add booking function
add view all booking made by the user function

How should this be manually tested?

clone the repository : git clone https://github.com/andela/caret-bn-backend.git
checkout to branch ft-book-accommodation-168781708
run sequelize db:migrate
run sequelize db:seed:all
Login
Take the token to your headers in authorization as Bearer Token to each routes of this feature
use this route to view all available accommodations GET: /api/v1/accommodations/available
use this route to view all your bookings GET: /api/v1/accommodations/bookings
use this route to book an accommodation PATCH:/api/v1/accommodations/book
on booking an accommodation you add the Id of accommodation in the body.

Any background context you want to provide?

N/A

What are the relevant pivotal tracker stories?

168781708

Screenshots (if appropriate)

Questions:

N/A

hound · 2019-10-24T00:26:38Z

src/controllers/accommodationController.js

+        }
+      }
+    }).then(accommodation => responseUtil(res, 200,
+      strings.accommodation.success.AVAILABLE, accommodation));


Expected a newline before ')' function-paren-newline

hound · 2019-10-24T00:26:38Z

src/controllers/accommodationController.js

+          [Op.gt]: 0,
+        }
+      }
+    }).then(accommodation => responseUtil(res, 200,


Expected a newline after '(' function-paren-newline

hound · 2019-10-24T09:55:25Z

src/controllers/accommodationController.js

+      }]
+    }).then(accommodation => responseUtil(
+      res, 200, strings.accommodation.success.AVAILABLE, accommodation
+    ));


Unexpected newline before ')' function-paren-newline

hound · 2019-10-24T09:55:25Z

src/controllers/accommodationController.js

+      include: [{
+        model: models.locations, as: 'accommodationLocation', attributes: ['id', 'name']
+      }]
+    }).then(accommodation => responseUtil(


Unexpected newline after '(' function-paren-newline

ngireric123 · 2019-10-24T12:22:39Z

src/controllers/accommodationController.js

+  }
+
+  // book an accomodation
+  static BookAccommdation(req, res) {


follow naming convention we use

alainmateso

Good job @sabin18 . However, please ensure that you make the necessary validations. For example, I can book an accommodation with dates that have already passed. Please look into that. Also, the error messages returned on the wrong date formats should be a date format not a date itself.

nakiwuge · 2019-10-25T13:48:43Z

src/controllers/accommodationController.js

+          [Op.gt]: 0,
+        }
+      },
+      attributes: { exclude: ['locationId', 'owner'] },


Add the owner object to the response

nakiwuge · 2019-10-25T13:50:27Z

src/controllers/accommodationController.js

+  static bookAccommdation(req, res) {
+    const { Op } = sequelize;
+    const { id } = req.params;
+    const { checkInDate, checkOutDate } = req.body;


Add accomodationId and numberRooms to the req.body

nakiwuge · 2019-10-25T13:54:30Z

src/controllers/accommodationController.js

+        }
+        if (moment(checkOutDate) < moment(checkInDate)) {
+          return responseUtil(res, 400, strings.accommodation.error.DATE_ERROR);
+        }


Make this a helper function to be reused

nakiwuge · 2019-10-25T13:54:34Z

src/controllers/accommodationController.js

+        if (accommodation.length === 0) {
+          return responseUtil(res, 400, strings.accommodation.error.NOT_AVAILABLE);
+        }
+        if (moment(checkOutDate) < moment.now() || moment(checkOutDate) < moment.now()) {


Make this a helper function to be reused

nakiwuge · 2019-10-25T13:59:44Z

src/routes/api/accommodations.js

+  deleteAccommodation,
+  availableAccommdation,
+  bookAccommdation
+


remove this line

nakiwuge · 2019-10-25T14:00:40Z

src/routes/api/accommodations.js

@@ -190,5 +193,7 @@ router.post('/', validateToken, checkSupplierRole, catchEmptyForm, multipartMidd
 router.get('/', validateToken, getAllAccommodations);
 router.patch('/:id/edit', validateToken, checkId, catchEmptyForm, multipartMiddleware, isAccommodationFound, isOwner, validateAccommodationEdit, editAccommodation);
 router.delete('/:id/delete', validateToken, checkId, isAccommodationFound, isOwner, deleteAccommodation);
+router.get('/available', validateToken, availableAccommdation);
+router.patch('/booking/:id', validateToken, checkId, validateDate, bookAccommdation);


Change this route to /book and remove the param

nakiwuge

Good job @sabin18, I have left comments on this pr. Also kindly add a route /bookings that will allow users to view their bookings

hound · 2019-10-27T19:18:57Z

src/controllers/accommodationController.js

+            models.booking.create(bookingData);
+            const remainingSpace = parseInt(accommodation[0].availableSpace) - roomsNumber;
+            models.accommodations.update({ availableSpace: remainingSpace, },
+              { where: { id: accomodationId, }, });


Expected a newline before ')' function-paren-newline

hound · 2019-10-27T19:18:57Z

src/controllers/accommodationController.js

+            }
+            models.booking.create(bookingData);
+            const remainingSpace = parseInt(accommodation[0].availableSpace) - roomsNumber;
+            models.accommodations.update({ availableSpace: remainingSpace, },


Expected a newline after '(' function-paren-newline

hound · 2019-10-27T19:47:19Z

src/controllers/accommodationController.js

+            const remainingSpace = parseInt(accommodation[0].availableSpace) - roomsNumber;
+            models.accommodations.update(
+              { availableSpace: remainingSpace, }, { where: { id: accomodationId, }, }
+            );


Unexpected newline before ')' function-paren-newline

hound · 2019-10-27T19:47:19Z

src/controllers/accommodationController.js

+            }
+            models.booking.create(bookingData);
+            const remainingSpace = parseInt(accommodation[0].availableSpace) - roomsNumber;
+            models.accommodations.update(


Unexpected newline after '(' function-paren-newline

add view all available accommodation add booking function [finishes #168781708]

hound bot reviewed Oct 24, 2019

View reviewed changes

sabin18 added the WIP Work In Progress label Oct 24, 2019

sabin18 changed the title ~~#168781708-user can book accommodation~~ #168781708-user can book an accommodation Oct 24, 2019

sabin18 force-pushed the ft-book-accommodation-168781708 branch 2 times, most recently from 9bf244c to 8a1197c Compare October 24, 2019 09:55

hound bot reviewed Oct 24, 2019

View reviewed changes

sabin18 force-pushed the ft-book-accommodation-168781708 branch 3 times, most recently from 1b598f1 to 30dd8a0 Compare October 24, 2019 11:06

sabin18 requested review from nignanthomas, alainmateso, ngireric123, Cheza-Dzabala and nakiwuge October 24, 2019 11:27

sabin18 added Ready For Review and removed WIP Work In Progress labels Oct 24, 2019

ngireric123 approved these changes Oct 24, 2019

View reviewed changes

ngireric123 reviewed Oct 24, 2019

View reviewed changes

sabin18 force-pushed the ft-book-accommodation-168781708 branch from 30dd8a0 to 91c0523 Compare October 24, 2019 12:42

alainmateso suggested changes Oct 24, 2019

View reviewed changes

sabin18 force-pushed the ft-book-accommodation-168781708 branch from 91c0523 to 9ccf250 Compare October 24, 2019 17:37

alainmateso self-requested a review October 25, 2019 06:54

alainmateso approved these changes Oct 25, 2019

View reviewed changes

nakiwuge reviewed Oct 25, 2019

View reviewed changes

src/routes/api/accommodations.js Outdated

deleteAccommodation,

availableAccommdation,

bookAccommdation

Copy link

Contributor

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this line

nakiwuge reviewed Oct 25, 2019

View reviewed changes

nakiwuge suggested changes Oct 25, 2019

View reviewed changes

sabin18 added WIP Work In Progress and removed Ready For Review labels Oct 26, 2019

sabin18 force-pushed the ft-book-accommodation-168781708 branch from 9ccf250 to 2fd3534 Compare October 27, 2019 19:18

hound bot reviewed Oct 27, 2019

View reviewed changes

sabin18 force-pushed the ft-book-accommodation-168781708 branch from 2fd3534 to 2670161 Compare October 27, 2019 19:47

hound bot reviewed Oct 27, 2019

View reviewed changes

sabin18 force-pushed the ft-book-accommodation-168781708 branch 3 times, most recently from 51e1c59 to 851321a Compare October 28, 2019 08:18

sabin18 added Ready For Review and removed WIP Work In Progress labels Oct 28, 2019

sabin18 force-pushed the ft-book-accommodation-168781708 branch 3 times, most recently from 7cc0d3e to d0dcf51 Compare October 28, 2019 15:24

nakiwuge approved these changes Oct 28, 2019

View reviewed changes

ft(book accommodation ): user can book accommodation

5b7cb57

add view all available accommodation add booking function [finishes #168781708]

sabin18 force-pushed the ft-book-accommodation-168781708 branch from d0dcf51 to 5b7cb57 Compare October 28, 2019 15:56

nakiwuge merged commit 9b88d11 into develop Oct 28, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#168781708-user can book an accommodation #32

#168781708-user can book an accommodation #32

sabin18 commented Oct 24, 2019 •

edited

Loading

hound bot Oct 24, 2019

hound bot Oct 24, 2019

hound bot Oct 24, 2019

hound bot Oct 24, 2019

ngireric123 Oct 24, 2019

alainmateso left a comment

nakiwuge Oct 25, 2019

nakiwuge Oct 25, 2019

nakiwuge Oct 25, 2019

nakiwuge Oct 25, 2019

nakiwuge Oct 25, 2019

nakiwuge Oct 25, 2019

nakiwuge left a comment

hound bot Oct 27, 2019

hound bot Oct 27, 2019

hound bot Oct 27, 2019

hound bot Oct 27, 2019

#168781708-user can book an accommodation #32

#168781708-user can book an accommodation #32

Conversation

sabin18 commented Oct 24, 2019 • edited Loading

What does this PR do?

Description of Task to be completed?

How should this be manually tested?

Any background context you want to provide?

What are the relevant pivotal tracker stories?

Screenshots (if appropriate)

Questions:

hound bot Oct 24, 2019

Choose a reason for hiding this comment

hound bot Oct 24, 2019

Choose a reason for hiding this comment

hound bot Oct 24, 2019

Choose a reason for hiding this comment

hound bot Oct 24, 2019

Choose a reason for hiding this comment

ngireric123 Oct 24, 2019

Choose a reason for hiding this comment

alainmateso left a comment

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge Oct 25, 2019

Choose a reason for hiding this comment

nakiwuge left a comment

Choose a reason for hiding this comment

hound bot Oct 27, 2019

Choose a reason for hiding this comment

hound bot Oct 27, 2019

Choose a reason for hiding this comment

hound bot Oct 27, 2019

Choose a reason for hiding this comment

hound bot Oct 27, 2019

Choose a reason for hiding this comment

sabin18 commented Oct 24, 2019 •

edited

Loading