Add Review Service and Controller

Dentizone.Application/AutoMapper/Payments/WalletProfile.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using Dentizone.Application.Services.Payment;
 using Dentizone.Domain.Entity;
 

Dentizone.Application/AutoMapper/Review/ReviewProfile.cs

@@ -0,0 +1,14 @@
+using AutoMapper;
+
+namespace Dentizone.Application.AutoMapper.Review
+{
+    internal class ReviewProfile : Profile
+    {
+        public ReviewProfile()
+        {
+            CreateMap<Dentizone.Domain.Entity.Review, Dentizone.Application.DTOs.Review.CreateReviewDto>().ReverseMap();
+            CreateMap<Dentizone.Domain.Entity.Review, Dentizone.Application.DTOs.Review.UpdateReviewDto>().ReverseMap();
+            CreateMap<Dentizone.Domain.Entity.Review, Dentizone.Application.DTOs.Review.ReviewDto>().ReverseMap();
+        }
+    }
+}

Dentizone.Application/DI/Services.cs

@@ -7,6 +7,7 @@
 using Dentizone.Application.Interfaces.Favorites;
 using Dentizone.Application.Interfaces.Order;
 using Dentizone.Application.Interfaces.Post;
+using Dentizone.Application.Interfaces.Review;
 using Dentizone.Application.Interfaces.User;
 using Dentizone.Application.Services;
 using Dentizone.Application.Services.Authentication;
@@ -40,6 +41,9 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
 
             services.AddScoped<IWalletService, WalletService>();
             services.AddScoped<IPaymentService, PaymentService>();
+
+            services.AddScoped<IReviewService, ReviewService>();
+
             services.AddScoped<IWithdrawalService, WithdrawalService>();
             return services;
         }

Dentizone.Application/DTOs/Review/CreateReviewDTO.cs

@@ -0,0 +1,27 @@
+using FluentValidation;
+
+namespace Dentizone.Application.DTOs.Review
+{
+    public class CreateReviewDto
+    {
+        public string OrderId { get; set; }
+        public int Stars { get; set; }
+        public string Comment { get; set; }
+    }
+
+    public class CreateReviewDtoValidation : AbstractValidator<CreateReviewDto>
+    {
+        public CreateReviewDtoValidation()
+        {
+            RuleFor(x => x.OrderId)
+                .NotEmpty().WithMessage("Order ID is required.")
+                .NotNull().WithMessage("Order ID cannot be null.");
+
+            RuleFor(x => x.Stars)
+                .InclusiveBetween(1, 5).WithMessage("Stars must be between 1 and 5.");
+
+            RuleFor(x => x.Comment)
+                .MaximumLength(500).WithMessage("Comment must not exceed 500 characters.");
+        }
+    }
+}

Dentizone.Application/DTOs/Review/ReviewDTO.cs

@@ -0,0 +1,24 @@
+using FluentValidation;
+
+namespace Dentizone.Application.DTOs.Review
+{
+    public class ReviewDto
+    {
+        public string Comment { get; set; }
+        public int Stars { get; set; }
+    }
+
+    public class ReviewDtoValidation : AbstractValidator<ReviewDto>
+    {
+        public ReviewDtoValidation()
+        {
+            RuleFor(x => x.Comment)
+                .NotEmpty()
+                .NotNull().WithMessage("Comment cannot be null.")
+                .MaximumLength(500).WithMessage("Comment must not exceed 500 characters.");
+
+            RuleFor(x => x.Stars)
+                .InclusiveBetween(1, 5).WithMessage("Stars must be between 1 and 5.");
+        }
+    }
+}

Dentizone.Application/DTOs/Review/UpdateReviewDTO.cs

@@ -0,0 +1,23 @@
+using FluentValidation;
+
+namespace Dentizone.Application.DTOs.Review
+{
+    public class UpdateReviewDto
+    {
+        public string? Comment { get; set; }
+        public int Stars { get; set; }
+    }
+
+    public class UpdateReviewDtoValidation : AbstractValidator<UpdateReviewDto>
+    {
+        public UpdateReviewDtoValidation()
+        {
+            RuleFor(x => x.Comment)
+                .MaximumLength(500)
+                .When(x => x.Comment != null)
+                .WithMessage("Comment must not exceed 500 characters when provided.");
+            RuleFor(x => x.Stars)
+                .InclusiveBetween(1, 5).WithMessage("Stars must be between 1 and 5.");
+        }
+    }
+}

Dentizone.Application/Interfaces/Order/IOrderService.cs

@@ -11,5 +11,7 @@ public interface IOrderService
         Task<OrderViewDto?> CancelOrderAsync(string orderId, string userId);
         Task CompleteOrder(string orderId);
         Task<PagedResultDto<OrderViewDto>> GetOrders(int page, FilterOrderDto filters);
+
+        Task<IEnumerable<Domain.Entity.Order>> GetReviewedOrdersByUserId(string userId);
     }
 }

Dentizone.Application/Interfaces/Review/IReviewService.cs

@@ -0,0 +1,13 @@
+using Dentizone.Application.DTOs.Review;
+
+namespace Dentizone.Application.Interfaces.Review
+{
+    public interface IReviewService
+    {
+        Task CreateOrderReviewAsync(string userId, CreateReviewDto createReviewDto);
+        Task<bool> UpdateReviewAsync(string reviewId, UpdateReviewDto updateReviewDto);
+        Task<bool> DeleteReviewAsync(string reviewId);
+        Task<IEnumerable<ReviewDto>> GetSubmittedReviews(string userId);
+        Task<IEnumerable<ReviewDto>> GetReceivedReviews(string userId);
+    }
+}

Dentizone.Application/Services/Authentication/AuthService.cs

@@ -1,7 +1,6 @@
 using Dentizone.Application.DTOs.Auth;
 using Dentizone.Application.DTOs.User;
 using Dentizone.Application.Interfaces;
-using Dentizone.Application.Services.Payment;
 using Dentizone.Domain.Enums;
 using Dentizone.Domain.Exceptions;
 using Dentizone.Domain.Interfaces;

Dentizone.Application/Services/OrderService.cs

@@ -33,7 +33,7 @@ internal class OrderService(
         public async Task<OrderViewDto?> CancelOrderAsync(string orderId, string userId)
         {
             var order = await orderRepository.FindBy(o => o.Id == orderId,
-                                                     [o => o.OrderStatuses, o => o.OrderItems]);
+                [o => o.OrderStatuses, o => o.OrderItems]);
 
             if (order == null)
             {
@@ -79,7 +79,7 @@ internal class OrderService(
                     await postService.UpdatePostStatus(post.Id, PostStatus.Active);
                     var seller = await authService.GetById(post.Seller.Id);
                     await mailService.Send(seller.Email, "Order Cancelled",
-                                           $"Your post {post.Title} has been cancelled by the buyer. we relisted it now for sale again@!");
+                        $"Your post {post.Title} has been cancelled by the buyer. we relisted it now for sale again@!");
                 }
             }
 
@@ -99,7 +99,7 @@ private async Task SendConfirmationEmail(List<string> sellerEmails, string buyer
             foreach (var email in sellerEmails)
             {
                 await mailService.Send(email, "New Order Placed",
-                                       $"Your post has been sold. Wait for pickup. Order ID: {orderId}");
+                    $"Your post has been sold. Wait for pickup. Order ID: {orderId}");
             }
         }
 
@@ -154,7 +154,7 @@ public async Task<string> CreateOrderAsync(CreateOrderDto createOrderDto, string
                     await orderItemRepository.CreateAsync(orderItem);
                     // Create a Sale Transaction for each order item
                     await paymentService.CreateSaleTransaction(
-                                                               payment.Id, post.Seller.Wallet.Id, post.Price);
+                        payment.Id, post.Seller.Wallet.Id, post.Price);
                 }
 
                 // Create Ship Info 
@@ -262,11 +262,20 @@ public async Task<PagedResultDto<OrderViewDto>> GetOrders(int page, FilterOrderD
 
 
             var order = await orderRepository.GetAllAsync(
-                                                          page,
-                                                          filterExpression
-                                                         );
+                page,
+                filterExpression
+            );
 
             return mapper.Map<PagedResultDto<OrderViewDto>>(order);
         }
+
+        public async Task<IEnumerable<Order>> GetReviewedOrdersByUserId(string userId)
+        {
+            var orders = await orderRepository.GetAllAsync(
+                null,
+                o => o.IsReviewed && o.OrderItems.Any(oi => oi.Post.SellerId == userId)
+            );
+            return orders.Items;
+        }
     }
 }

Dentizone.Application/Services/Payment/WalletService.cs

@@ -69,40 +69,25 @@ public async Task CreateWallet(string userId)
 
         public async Task<WalletView> AddToBalance(decimal amount, string walletId)
         {
-            if (amount == 0)
+            var wallet = await walletRepository.FindBy(w => w.Id == walletId && w.Status == UserWallet.ACTIVE);
+
+            if (wallet is null)
             {
-                throw new ArgumentException("Amount must not be zero.", nameof(amount));
+                throw new BadActionException("No Wallet for this Wallet Id");
             }
 
-            await using var transaction = await dbContext.Database.BeginTransactionAsync();
-            try
+            var newBalance = wallet.Balance + amount;
+            if (newBalance < 0)
             {
-                var wallet = await walletRepository.FindBy(w => w.Id == walletId && w.Status == UserWallet.ACTIVE);
-
-                if (wallet is null)
-                {
-                    throw new BadActionException("No Wallet for this Wallet Id");
-                }
-
-                var newBalance = wallet.Balance + amount;
-                if (newBalance < 0)
-                {
-                    throw new BadActionException("Insufficient wallet balance.");
-                }
+                throw new BadActionException("Insufficient wallet balance.");
+            }
 
-                wallet.Balance = newBalance;
-                await walletRepository.UpdateAsync(wallet);
+            wallet.Balance = newBalance;
+            await walletRepository.UpdateAsync(wallet);
 
-                await transaction.CommitAsync();
 
-                var view = mapper.Map<WalletView>(wallet);
-                return view;
-            }
-            catch
-            {
-                await transaction.RollbackAsync();
-                throw;
-            }
+            var view = mapper.Map<WalletView>(wallet);
+            return view;
         }
 
         public async Task<WalletView> GetWalletBalanceAsync(string userId)

Dentizone.Application/Services/ReviewService.cs

@@ -0,0 +1,65 @@
+using AutoMapper;
+using Dentizone.Application.DTOs.Review;
+using Dentizone.Application.Interfaces.Order;
+using Dentizone.Application.Interfaces.Review;
+using Dentizone.Domain.Entity;
+using Dentizone.Domain.Interfaces.Repositories;
+using Dentizone.Domain.Exceptions;
+using Microsoft.EntityFrameworkCore;
+
+namespace Dentizone.Application.Services
+{
+    public class ReviewService(IMapper mapper, IReviewRepository repo, IOrderService orderService) : IReviewService
+    {
+        public async Task CreateOrderReviewAsync(string userId, CreateReviewDto createReviewDto)
+        {
+            var review = new Review()
+            {
+                OrderId = createReviewDto.OrderId,
+                Text = createReviewDto.Comment,
+                UserId = userId
+            };
+
+            await repo.CreateAsync(review);
+        }
+
+        public async Task DeleteReviewAsync(string reviewId)
+        {
+            await repo.DeleteAsync(reviewId);
+        }
+
+        public async Task<IEnumerable<ReviewDto>> GetSubmittedReviews(string userId)
+        {
+            var review = repo.FindAllBy(r => r.UserId == userId && !r.IsDeleted);
+
+
+            return await review.Select(r => mapper.Map<ReviewDto>(r)).ToListAsync();
+        }
+
+        public async Task UpdateReviewAsync(string reviewId, UpdateReviewDto updateReviewDto)
+        {
+            var review = await repo.GetByIdAsync(reviewId);
+            if (review == null || review.IsDeleted)
+                throw new NotFoundException("Review not found.");
+
+            review.Text = updateReviewDto.Comment;
+
+            await repo.Update(review);
+        }
+
+        public async Task<IEnumerable<ReviewDto>> GetReceivedReviews(string userId)
+        {
+            var reviews = await orderService.GetReviewedOrdersByUserId(userId);
+
+
+            // Get the reviews for the orders
+            var reviewDtos = reviews.Select(r => new ReviewDto
+            {
+                Comment = r.Review.Text ?? "No Comment",
+                Stars = r.Review.Stars,
+            });
+
+            return reviewDtos.ToList();
+        }
+    }
+}

Dentizone.Application/Services/UserService.cs

@@ -7,11 +7,14 @@
 using Dentizone.Domain.Exceptions;
 using Dentizone.Domain.Interfaces.Repositories;
 using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore;
 
 namespace Dentizone.Application.Services
 {
-    public class UserService(IUserRepository userRepository, IMapper mapper, IWalletService walletService, Infrastructure.AppDbContext dbContext)
+    public class UserService(
+        IUserRepository userRepository,
+        IMapper mapper,
+        IWalletService walletService,
+        Infrastructure.AppDbContext dbContext)
         : IUserService
     {
         public async Task<UserView> CreateAsync(CreateAppUser userDto)
@@ -46,7 +49,7 @@ public async Task<UserView> DeleteAsync(string id)
         }
 
         public async Task<ICollection<UserView>> GetAllAsync(int page, string? searchByName = null,
-                                                             Expression<Func<AppUser, bool>>? filterExpression = null)
+            Expression<Func<AppUser, bool>>? filterExpression = null)
         {
             var users = await userRepository.GetAllAsync(page, filterExpression);
             if (users == null)
@@ -57,7 +60,7 @@ public async Task<ICollection<UserView>> GetAllAsync(int page, string? searchByN
             if (!string.IsNullOrEmpty(searchByName))
             {
                 users = users.Where(u => u.FullName.Contains(searchByName, StringComparison.OrdinalIgnoreCase))
-                             .ToList();
+                    .ToList();
             }
 
             return mapper.Map<ICollection<UserView>>(users);
@@ -66,10 +69,10 @@ public async Task<ICollection<UserView>> GetAllAsync(int page, string? searchByN
         public async Task<DomainUserView> GetByIdAsync(string id)
         {
             var user = await userRepository.FindBy(u => u.Id == id,
-                                                   [
-                                                       u => u.University
-                                                   ]
-                                                  );
+                [
+                    u => u.University
+                ]
+            );
             if (user == null)
             {
                 throw new NotFoundException($"User with id {id} not found.");

Dentizone.Domain/Entity/Order.cs

@@ -21,6 +21,5 @@ public class Order : IBaseEntity, IDeletable, IUpdatable
         public DateTime UpdatedAt { get; set; }
         public bool IsDeleted { get; set; }
         public virtual Review Review { get; set; }
-        public virtual ReviewUx ReviewUx { get; set; }
     }
 }