Chore(accommodation): update accommodation endpoints

- Add stars of accommodation
- Add comments of accommodation
- Add all related data to GET accommodation

[starts #171692438]

src/migrations/20200303174302-alter-request.js

@@ -26,11 +26,4 @@ export function up(queryInterface, Sequelize) {
  * @param {object} queryInterface
  * @param {object} Sequelize
  */
-export function down(queryInterface) {
-  return queryInterface.sequelize.transaction(t => Promise.all([
-    queryInterface.removeColumn('Requests', 'requesterFname', { transaction: t }),
-    queryInterface.removeColumn('Requests', 'frequesterLname', { transaction: t }),
-    queryInterface.removeColumn('Requests', 'requesterPicture', { transaction: t }),
-    queryInterface.removeColumn('Requests', 'tripType', { transaction: t })
-  ]));
-}
+export function down(queryInterface) { return queryInterface.dropTable('Requests'); }

src/migrations/20200309141524-Accommodation.js

@@ -0,0 +1,14 @@
+export const up = (queryInterface, Sequelize) => Promise.all([
+  queryInterface.addColumn('Accommodation', 'likes', Sequelize.INTEGER),
+  queryInterface.addColumn('Accommodation', 'disLikes', Sequelize.INTEGER),
+
+]);
+/**
+ * @exports
+ * @class
+ * @param {object} queryInterface
+ */
+export const down = (queryInterface) => {
+  queryInterface.removeColumn('Accommodation', 'likes');
+  return queryInterface.removeColumn('Accommodation', 'disLikes');
+};

src/models/accommodation.js

@@ -7,6 +7,8 @@ export default (sequelize, DataTypes) => {
     locationId: DataTypes.INTEGER,
     totalRooms: DataTypes.INTEGER,
     allAvailableRooms: DataTypes.INTEGER,
+    likes: DataTypes.INTEGER,
+    disLikes: DataTypes.INTEGER
 
   }, {});
   Accommodation.associate = (models) => {
@@ -16,6 +18,7 @@ export default (sequelize, DataTypes) => {
     Accommodation.hasMany(models.Image, { foreignKey: 'subjectId', as: 'accommodationPictures', onDelete: 'CASCADE', hooks: true });
     Accommodation.hasMany(models.Amenities, { foreignKey: 'accommodationId', as: 'amenities', onDelete: 'CASCADE', hooks: true });
     Accommodation.hasMany(models.Booking, { foreignKey: 'accommodationId', as: 'bookings', onDelete: 'cascade', hooks: true });
+    Accommodation.hasMany(models.Comments, { foreignKey: 'subjectId', as: 'accommodationComments', onDelete: 'CASCADE', hooks: true });
   };
   return Accommodation;
 };

src/models/comments.js

@@ -11,6 +11,7 @@ export default (sequelize, DataTypes) => {
     // associations can be defined here
     Comments.belongsTo(models.Users, { foreignKey: 'userId', targetKey: 'id' });
     Comments.belongsTo(models.Trip, { foreignKey: 'subjectId', targetKey: 'id' });
+    Comments.belongsTo(models.Accommodation, { foreignKey: 'subjectId', as: 'accommodation' });
   };
   return Comments;
 };

src/routes/accommodation.route.js

@@ -20,8 +20,8 @@ router.post(
 router.get('/', authMiddleware.checkUserLoggedIn, AccommodationController.getAccommodations);
 router.post(
   '/',
-  authMiddleware.checkUserLoggedIn, createAccommodationValidations,
-  authMiddleware.verifyPermissions,
+  authMiddleware.checkUserLoggedIn, authMiddleware.verifyPermissions,
+  createAccommodationValidations,
   avoidDuplicateAccommodation,
   checkIfAccommodationTypeExists, checkIfLocationExists,
   AccommodationController.createAccommodation

src/services/accommodation.service.js

@@ -1,7 +1,7 @@
 import models from '../models';
 
 
-const { Accommodation, Booking, AccommodationType, Rooms } = models;
+const { Accommodation, Booking, AccommodationType, Rooms, Users } = models;
 
 /**
  *
@@ -45,7 +45,13 @@ class AccommodationService {
    * @returns {object} data
    */
   static findAllAccommodations() {
-    return Accommodation.findAll();
+    return Accommodation.findAll({ include: ['addOnServices', 'accommodationPictures', 'amenities',
+      { association: 'accommodationComments', include: { model: Users, attributes: ['firstName', 'lastName', 'profilePicture'] } },
+      {
+        association: 'rooms',
+        include: ['roomPictures']
+      }
+    ] });
   }
 
   /**

src/tests/fixtures/accommodation.fixture.js

@@ -86,6 +86,7 @@ export const newAccomodation = {
   name: faker.commerce.productName(),
   typeId: faker.random.number({ min: 1, max: 5 }),
   locationId: faker.random.number({ min: 1, max: 9 }),
+  rating: faker.random.number({ min: 1, max: 5 }),
   description: faker.lorem.sentence(),
   accommodationPictures: [generateImage('Accommodation'), generateImage('Accommodation'), generateImage('Accommodation')],
   addOnServices: [generateAddOn(), generateAddOn()],

src/validations/accommodation.validation.js

@@ -52,6 +52,13 @@ export const createAccommodationValidations = async (req, res, next) => {
         'string.empty': 'Please enter your accomodation description',
         'any.required': 'description is required'
       }),
+    rating: Joi.number()
+      .max(5)
+      .required()
+      .messages({
+        'number.max': 'rating must be less than or equal to 5',
+        'any.required': 'rating is required'
+      }),
     typeId: Joi.number()
       .min(1)
       .required()