ch(likeAndDislike) Return fully info about who liked or disliked

src/controllers/BookingController.js

@@ -23,8 +23,6 @@ class BookingController {
       await NotificationService.newBookingNotification(req);
       return Response.successMessage(req, res, 'You have booked an accommodation facility successfully', result, 201);
     } catch (error) {
-      console.log(error);
-
       return Response.errorMessage(req, res, 'Server error', 500);
     }
   }

src/database/models/accommodations.js

@@ -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',

src/database/models/booking.js

@@ -15,6 +15,11 @@ module.exports = (sequelize, DataTypes) => {
       sourceKey: "roomId",
       targetKey: "id",
     });
+    booking.hasMany(models.likes, {
+      foreignKey: "accommodationId",
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE',
+    });
 
   };
   return booking;

src/services/AccommodationService.js

@@ -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';
 
@@ -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,
@@ -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
+    };
   }
 
   /**

src/services/BookingService.js

@@ -113,7 +113,6 @@ class BookingService {
       where: { managerId: req.user.id }
     };
     const findOneBookingOb = {
-<<<<<<< HEAD
       where: id ? { id, userId: req.user.id } : { userId: req.user.id },
       order: [['updatedAt', 'DESC']],
       include: [
@@ -135,39 +134,6 @@ class BookingService {
           ]
         }
       ]
-=======
-<<<<<<< HEAD
-      where: id ? { id } : {},
-      order: [
-        ['updatedAt', 'DESC'],
-      ],
-      include: [{
-        model: trips,
-        include: [{
-          model: tripRequests,
-          where: { userId: req.user.id }
-        }],
-      }],
-      raw: true
-=======
-      where: id ? { id, userId: req.user.id } : { userId: req.user.id },
-      include: [
-        {
-          model: rooms,
-          include: [{
-            model: accommodations,
-            include: [{
-              model: accommodationImages,
-              as: 'imagesAccommodation'
-            },
-            {
-              model: cities,
-            }]
-          }]
-        }
-      ]
->>>>>>> ch(booking): change user booking response
->>>>>>> ch(booking): change user booking response
     };
     const myBookingsresult = await CommonQueries.findAll(
       booking,