Merge pull request #21 from anycode-pk/FixRating

Fix ratings

Author: pablolambo

TableBooking.Api/Controllers/RatingController.cs

@@ -5,6 +5,7 @@
 
 namespace TableBooking.Api.Controllers
 {
+    using System.Security.Claims;
 
     [Route("[controller]")]
     [ApiController]
@@ -18,9 +19,9 @@ public RatingController(IRatingService ratingService)
         }
 
         [HttpGet("GetAllRatings")]
-        public async Task<IActionResult> GetRatings([FromQuery] Guid restuarantId)
+        public async Task<IActionResult> GetRatings([FromQuery] Guid restaurantId)
         {
-            return await _ratingService.GetAllRatingsAsync(restuarantId);
+            return await _ratingService.GetAllRatingsAsync(restaurantId);
         }
 
         [HttpGet("GetRating/{id}")]
@@ -32,6 +33,19 @@ public async Task<IActionResult> GetRatingById(Guid id)
         [HttpPost("CreateRating")]
         public async Task<IActionResult> CreateRating([FromBody] CreateRatingDto createRatingDto)
         {
+            if (createRatingDto.AppUserId.HasValue)
+                return await _ratingService.CreateRatingAsync(createRatingDto);
+
+            var userIdString = User.FindFirstValue(ClaimTypes.NameIdentifier);
+
+            if (string.IsNullOrEmpty(userIdString))
+                return BadRequest("User ID could not be determined from the claims.");
+
+            if (!Guid.TryParse(userIdString, out var userId))
+                return BadRequest("Invalid User ID format in claims.");
+
+            createRatingDto.AppUserId = userId;
+
             return await _ratingService.CreateRatingAsync(createRatingDto);
         }
 

TableBooking.Api/Services/RatingService.cs

@@ -7,6 +7,8 @@
 
 namespace TableBooking.Api.Services
 {
+    using Microsoft.AspNetCore.Http.HttpResults;
+
     public class RatingService : IRatingService
     {
         private IUnitOfWork _unitOfWork;
@@ -19,32 +21,52 @@ public RatingService(IUnitOfWork unitOfWork, IRatingConverter ratingConverter)
         }
         public async Task<IActionResult> CreateRatingAsync(CreateRatingDto dto)
         {
-            var user = await _unitOfWork.UserRepository.GetByIdAsync(dto.AppUserId);
+            var user = await _unitOfWork.UserRepository.GetByIdAsync(dto.AppUserId!.Value);
             var restaurant = await _unitOfWork.RestaurantRepository.GetByIdAsync(dto.RestaurantId);
-            if (user == null || restaurant == null) return new BadRequestObjectResult(string.Empty);
+            
+            if (user == null) 
+                return new NotFoundObjectResult($"User with id {dto.AppUserId.Value} not found.");
+            
+            if (restaurant == null) 
+                return new NotFoundObjectResult($"Restaurant with id {dto.RestaurantId} not found.");
+            
+            if (dto.RatingStars < 1 || dto.RatingStars > 5)
+            {
+                return new BadRequestObjectResult("Rating must be between 1 and 5.");
+            }
+            
+            var existingRating = await _unitOfWork.RatingRepository.GetRatingByUserIdAsync(dto.AppUserId.Value, dto.RestaurantId);
 
+            if (existingRating != null)
+            {
+                return new BadRequestObjectResult("You have already submitted a review for this restaurant.");
+            }
+            
             var rating = new Rating
             {
+                Id = Guid.NewGuid(),
                 RatingStars = dto.RatingStars,
-                Comment = dto.Comment,
-                DateOfRating = dto.DateOfRating,
+                Comment = dto.Comment ?? string.Empty,
+                DateOfRating = DateTime.UtcNow,
                 RestaurantId = dto.RestaurantId,
-                AppUserId = dto.AppUserId
+                AppUserId =  dto.AppUserId.Value
             };
 
             await _unitOfWork.RatingRepository.InsertAsync(rating);
             await _unitOfWork.SaveChangesAsync();
             var ratings = await _unitOfWork.RatingRepository.GetRatingsAsync(dto.RestaurantId) ;
-            var numberOfRaitings = ratings.Count();
-            var result = 0d;
+            var enumerable = ratings.ToList();
+            var numberOfRatings = enumerable.Count;
 
-            if (numberOfRaitings > 0 && numberOfRaitings % 5 == 0)
-            {
-                result = ratings.Select(x => x.RatingStars).Average();
-                restaurant.Rating = result;
-                await _unitOfWork.RestaurantRepository.Update(restaurant);
-                await _unitOfWork.SaveChangesAsync();
-            }
+            if (numberOfRatings <= 0) return new OkObjectResult(_ratingConverter.RatingToRatingDto(rating));
+            
+            var averageRating = enumerable.Select(x => x.RatingStars).Average();
+            var roundedRating = Math.Round(averageRating, 0, MidpointRounding.AwayFromZero);
+
+
+            restaurant.Rating = (int)roundedRating;
+            await _unitOfWork.RestaurantRepository.Update(restaurant);
+            await _unitOfWork.SaveChangesAsync();
 
             return new OkObjectResult(_ratingConverter.RatingToRatingDto(rating));
         }

TableBooking.Logic/Interfaces/IRatingRepository.cs

@@ -5,6 +5,7 @@ namespace TableBooking.Logic.Interfaces
     public interface IRatingRepository : IGenericRepository<Rating>
     {
         Task<IEnumerable<Rating>> GetRatingsAsync(Guid restaurantId);
+        Task<Rating?> GetRatingByUserIdAsync(Guid userId, Guid restaurantId);
         Task<Rating> GetRating(Guid id);
     }
 }

TableBooking.Logic/Interfaces/IRestaurantRepository.cs

@@ -5,5 +5,6 @@ namespace TableBooking.Logic.Interfaces
     public interface IRestaurantRepository : IGenericRepository<Restaurant>
     {
         public Task<IEnumerable<Restaurant>> GetRestaurantsAsync(string? restaurantName, Price? price);
+        public Task<IEnumerable<Guid>> GetAllRestaurantIds();
     }
 }

TableBooking.Logic/Repositories/RatingRepository.cs

@@ -18,6 +18,14 @@ public async Task<IEnumerable<Rating>> GetRatingsAsync(Guid restaurantId)
                 .Where(x => x.RestaurantId.Equals(restaurantId)).ToListAsync();
         }
 
+        public async Task<Rating?> GetRatingByUserIdAsync(Guid userId, Guid restaurantId)
+        {
+            return await _objectSet
+                .Include(x => x.Restaurant)
+                .Include(x => x.AppUser)
+                .FirstOrDefaultAsync(x => x.AppUserId == userId && x.RestaurantId == restaurantId);
+        }
+
         public async Task<Rating> GetRating(Guid id)
         {
             return await _objectSet

TableBooking.Logic/Repositories/RestaurantRepository.cs

@@ -18,5 +18,12 @@ public async Task<IEnumerable<Restaurant>> GetRestaurantsAsync(string? restauran
                 .FilterByPrice(price)
                 .ToListAsync();
         }
+
+        public async Task<IEnumerable<Guid>> GetAllRestaurantIds()
+        {
+            return await _objectSet
+                .Select(r => r.Id)
+                .ToListAsync();
+        }
     }
 }

TableBooking.Model/Dtos/RatingDtos/CreateRatingDto.cs

@@ -3,9 +3,8 @@
     public class CreateRatingDto
     {
         public int RatingStars { get; set; }
-        public string Comment { get; set; }
-        public DateTime DateOfRating { get; set; }
+        public string? Comment { get; set; } = string.Empty;
         public Guid RestaurantId { get; set; }
-        public Guid AppUserId { get; set; }
+        public Guid? AppUserId { get; set; }
     }
 }