Merge branch 'backend/dev' into backend/sherlemious/dev

Author: Sherlemious

backend/src/controllers/booking.controller.ts

@@ -77,10 +77,10 @@ class BookingController {
 
       const booking = await bookingRepo.bookActivity(req.user.userId, activity_id, payment_method);
       await userRepo.updateUserLoyaltyPoints(req.user.userId, LOYALTY_POINT_GAIN);
-      await activityRepo.addTicket(req.body.activity_id);
-      const activity = await activityRepo.getActivityById(req.body.activity_id);
+      await activityRepo.addTicket(activity_id);
+      const activity = await activityRepo.getActivityById(activity_id);
       if (activity?.tickets !== undefined) {
-        const Users = await userRepo.getUsersByBookmarkedActivity(req.body.activity_id);
+        const Users = await userRepo.getUsersByBookmarkedActivity(activity_id);
         Users.forEach(async (user: any) => {
           await userRepo.ticketsNotification(user._id, activity.tickets);
           await emailService.ticketsUpdateEmail(user.email, activity.tickets);

backend/src/controllers/order.controller.ts

@@ -60,6 +60,8 @@ class OrderController {
         await emailService.sendReceiptEmail(customerEmail, order);
       }
 
+      await cartRepo.clearCart(req.user.userId);
+
       res
         .status(ResponseStatusCodes.CREATED)
         .json({ message: 'Order checked out successfully', data: { order: order } });

backend/src/database/repositories/cart.repo.ts

@@ -27,6 +27,10 @@ class CartRepo {
   async removeProductFromCart(userId: string, productId: string) {
     return await User.findByIdAndUpdate(userId, { $pull: { cart: { product: productId } } }, { new: true });
   }
+
+  async clearCart(userId: string) {
+    return await User.findByIdAndUpdate(userId, { cart: [] }, { new: true });
+  }
 }
 
 export default new CartRepo();