Skip to content

Commit

Permalink
Merge pull request #75 from andela/ch-user-like-dislike-171177795
Browse files Browse the repository at this point in the history
#171177795 Return fully info about who liked or disliked
  • Loading branch information
kipropbrian committed Feb 20, 2020
2 parents 272a84d + 6cc6daf commit 6c8903c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/database/models/accommodations.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ module.exports = (sequelize, DataTypes) => {
sourceKey: "id",
as: "ratings"
});
accommodations.hasMany(models.likes, {
targetKey: "accommodationId",
sourceKey: "id"
});
accommodations.belongsTo(models.users,
{
targetKey: 'id',
Expand Down
5 changes: 5 additions & 0 deletions src/database/models/booking.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ module.exports = (sequelize, DataTypes) => {
sourceKey: "roomId",
targetKey: "id",
});
booking.hasMany(models.likes, {
foreignKey: "accommodationId",
onDelete: 'CASCADE',
onUpdate: 'CASCADE',
});

};
return booking;
Expand Down
19 changes: 17 additions & 2 deletions src/services/AccommodationService.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Sequelize from 'sequelize';
import {
accommodations, rooms, accommodationImages, ratings, likes, sequelize, cities, users, userProfile
accommodations, rooms, accommodationImages, ratings, likes, sequelize, cities, users, userProfile,
} from '../database/models';
import CommonQueries from './CommonQueries';

Expand Down Expand Up @@ -160,6 +160,8 @@ class AccommodationService {
*/
static async getAccommodationLikes(req) {
const { accommodationId } = req.params;
const { id } = req.user;

const likeCounter = await CommonQueries.count(likes, {
where: {
accommodationId,
Expand All @@ -172,7 +174,20 @@ class AccommodationService {
disliked: true
}
});
return { likeCounter, dislikeCounter };

const joinedTable = await CommonQueries.findAll(likes, {
where: { accommodationId, userId: id },
include: [{
model: accommodations,
where: { id: accommodationId }
}],
});

const [allAboutWhoReacted] = joinedTable;

return {
likeCounter, dislikeCounter, allAboutWhoReacted
};
}

/**
Expand Down

0 comments on commit 6c8903c

Please sign in to comment.