Refactor Domain (DDD)

Application/Application.csproj

@@ -18,4 +18,9 @@
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Features\AppointmentServiceLink\Interfaces\" />
+      <Folder Include="Features\Service\Interfaces\" />
+    </ItemGroup>
+
 </Project>

Application/Common/Interfaces/IJwtTokenGenerator.cs

@@ -1,3 +1,4 @@
+using Domain.Aggregates.User;
 using Domain.Entities;
 
 namespace Application.Common.Interfaces;

Application/Common/Interfaces/IUSerContext.cs → Application/Common/Interfaces/IUserContext.cs

@@ -2,7 +2,7 @@
 
 namespace Application.Common.Interfaces;
 
-public interface IUSerContext
+public interface IUserContext
 {
     Guid UserId { get;}
     string? Email { get;}

Application/Features/Appointments/Interfaces/IAppointmentService.cs

@@ -1,4 +1,5 @@
 using Application.Features.Appointments.DTOs;
+using Domain.Aggregates.Appointment;
 using Domain.Entities;
 
 namespace Application.Features.Appointments.Interfaces;

Application/Features/Appointments/Services/AppointmentService.cs

@@ -1,12 +1,12 @@
 using Application.Common.Interfaces;
 using Application.Features.Appointments.DTOs;
 using Application.Features.Appointments.Interfaces;
-using Application.Features.AppointmentServiceLink.Interfaces;
 using Application.Features.Auth.Interfaces;
-using Application.Features.Service.Interfaces;
+using Domain.Aggregates.Appointment;
 using Domain.Entities;
 using Domain.Enums;
 using Domain.Exceptions;
+using Domain.Repository;
 
 namespace Application.Features.Appointments.Services;
 
@@ -16,11 +16,11 @@
     private readonly IUserRepository _userRepository;
     private readonly IServiceRepository _serviceRepository;
     private readonly IAppointmenServiceLinkRepository _appointmenServiceLinkRepository;
-    private readonly IUSerContext _userContext;
+    private readonly IUserContext _userContext;
 
     public AppointmentService(IAppointmentRepository repository, IUserRepository userRepository,
         IServiceRepository serviceRepository, IAppointmenServiceLinkRepository appointmenServiceLinkRepository,
-        IUSerContext userContext)
+        IUserContext userContext)
     {
         _appointmentRepository = repository;
         _userRepository = userRepository;
@@ -40,7 +40,7 @@
             throw new UnauthorizedAccessException("Not Authenticated");
 
         var userId = _userContext.UserId;
         var appointment = new Appointment(userId, dto.StartTime, dto.EndTime, dto.AppoinmentTitle);
 
         if (!await _userRepository.IsUserExistsByIdAsync(userId))
             throw new NotFoundException($"User with {userId} does not exist");
@@ -54,10 +54,10 @@
         if (services.Count != dto.ServiceId.Count)
             return "One or more services not found";
 
         appointment.AddServices(services);
 
         await _appointmentRepository.AddAsync(appointment);
         await _appointmentRepository.SaveAsync();
         return $"{appointment.Title} Created";
     }
 
@@ -94,7 +94,7 @@
     public async Task<List<ViewAppointments>> ViewAppointments()
     {
         EnsureAdmin();
         return await _appointmentRepository.ViewAppointments();
     }
 
     public async Task<List<ViewAppointments>> ViewMyAppointments()

Application/Features/Auth/Services/PasswordRecoveryService.cs

@@ -2,6 +2,7 @@
 using Application.Features.Auth.Interfaces;
 using Domain.Entities;
 using Domain.Exceptions;
+using Domain.Repository;
 
 namespace Application.Features.Auth.Services;
 
@@ -55,13 +56,5 @@ public async Task ForgetPasswordAsync(string email)
         );
 
         await _userRepository.SaveChangesAsync();
-
-        //Implement Email Service
-
-        // await _emailService.SendAsync(
-        //     email,
-        //     "Password Reset Code",
-        //     $"Your verification code is: {code}"
-        // );
     }
 }

Application/Features/Auth/Services/UserService.cs

@@ -3,7 +3,9 @@
 using Application.Common.Interfaces.Repositories;
 using Application.Features.Auth.DTOs;
 using Application.Features.Auth.Interfaces;
+using Domain.Aggregates.User;
 using Domain.Entities;
+using Domain.Repository;
 
 namespace Application.Features.Auth.Services;
 
@@ -14,12 +16,12 @@ public class UserService : IUserService
     private readonly IPasswordHasher _passwordHasher;
     private readonly IJwtTokenService _jwtTokenService;
     private readonly IRefreshTokenRepository _refreshTokenRepository;
-    private readonly IUSerContext _userContext;
+    private readonly IUserContext _userContext;
     private readonly IVerificationCodeGenerator _verificationCodeGenerator;
 
     public UserService(IUserRepository repository, IJwtTokenService jwtTokenGenerator,
         IRefreshTokenRepository refreshTokenRepository, IHasher hasher, IPasswordHasher passwordHasher,
-        IUSerContext userContext, IVerificationCodeGenerator verificationCodeGenerator)
+        IUserContext userContext, IVerificationCodeGenerator verificationCodeGenerator)
     {
         _userRepository = repository;
         _jwtTokenService = jwtTokenGenerator;

Application/Features/Service/Services/ServiceAppService.cs

@@ -1,16 +1,16 @@
 using Application.Common.Interfaces;
 using Application.Features.Service.DTOs;
-using Application.Features.Service.Interfaces;
 using Domain.Enums;
 using Domain.Exceptions;
+using Domain.Repository;
 
 namespace Application.Features.Service.Services;
 
 public class ServiceAppService:IServiceAppService
 {
     private readonly IServiceRepository _repository;
-    private readonly IUSerContext _userContext;
-    public ServiceAppService(IServiceRepository repository, IUSerContext context)
+    private readonly IUserContext _userContext;
+    public ServiceAppService(IServiceRepository repository, IUserContext context)
     {
         _repository = repository;
         _userContext = context;
@@ -24,8 +24,8 @@
     public async Task<string> CreateServiceAsync(CreateService createService)
     {
         EnsureAdmin();
-        var service=new Domain.Entities.Service(createService.Title,createService.DurationMinutes);
+        var service=new Domain.Aggregates.Service.Service(createService.Title,createService.DurationMinutes);
         await _repository.CreatServiceAsync(service);
         return $"{service.Title} created";
     }
 
@@ -34,8 +34,8 @@
         EnsureAdmin();
         var appointment = await _repository.GetServiceByIdAsync(serviceId) ?? throw new NotFoundException("Service not found");
 
         appointment.Edit(editService.DurationMinutes,editService.Title);
         await _repository.SaveChangesAsync();
         return $"{appointment.Title} Updated";
     }
 
@@ -48,6 +48,6 @@
 
     public async Task<List<ViewServices>> ViewAllServicesAsync()
     {
         return await _repository.ViewAllServiceAsync();
     }
 

Domain/Aggregates/Appointment/Appointment.cs

@@ -0,0 +1,64 @@
+using Domain.Base;
+using Domain.Enums;
+using Domain.ValueObject;
+
+namespace Domain.Aggregates.Appointment
+{
+    public class Appointment:AggregatedRoot
+    {
+        public Guid AppointmentId { get; private set; }
+        public Guid UserId { get; private set; }
+        public string Title { get; private set; }
+        public AppointmentTimeRange TimeRange { get; private set; }
+        public AppointmentStatus Status { get; private set; }
+
+        private readonly List<Guid> _serviceIds = new();
+        public IReadOnlyList<Guid> ServiceIds=>_serviceIds;
+
+        public void AddServices(IEnumerable<Guid> serviceIds)
+        {
+            foreach (var id in serviceIds.Distinct())
+            {
+                if (!_serviceIds.Contains(id))
+                    _serviceIds.Add(id);
+            }
+        }
+
+        private Appointment() { } // For EF
+
+        public Appointment(Guid userId,AppointmentTimeRange timeRange, string title)
+        {
+            if (string.IsNullOrEmpty(title))
+                throw new ArgumentException("Title cannot be null or empty");
+            AppointmentId = Guid.NewGuid();
+            UserId = userId;
+            TimeRange = timeRange??throw new ArgumentNullException(nameof(timeRange))   ;
+            Title = title;
+            Status = AppointmentStatus.Reserved;
+        }
+
+        public void Cancel()
+        {
+            if (Status == AppointmentStatus.Cancelled)
+                throw new InvalidOperationException("Already cancelled");
+
+            Status = AppointmentStatus.Cancelled;
+        }
+
+        public void Reschedule(AppointmentTimeRange timeRange)
+        {
+            if (Status == AppointmentStatus.Cancelled)
+                throw new InvalidOperationException("Cannot reschedule cancelled appointment");
+            TimeRange = timeRange ?? throw new ArgumentNullException(nameof(timeRange));
+        }
+        public void ChangeTitle(string title)
+        {
+            if (Status == AppointmentStatus.Cancelled)
+                throw new InvalidOperationException("Cannot edit cancelled appointment");
+
+            if (string.IsNullOrEmpty(title))
+                throw new ArgumentException("Title cannot be null or empty");
+            Title=title;
+        }
+    }
+}

Domain/Aggregates/Service/Service.cs

@@ -0,0 +1,32 @@
+using Domain.Base;
+
+namespace Domain.Aggregates.Service;
+
+public class Service:AggregatedRoot
+{
+    public Guid Id { get; private set; }
+    public string Title { get; private set; }
+    public TimeSpan DurationMinutes { get; private set; }
+    private Service() { }
+
+    public Service(string title, TimeSpan durationMinutes)
+    {
+        if (string.IsNullOrEmpty(title))
+            throw new ArgumentException("Title required");
+        if (durationMinutes.TotalMinutes <= 0)
+            throw new ArgumentException("Invalid duration");
+        Id = Guid.NewGuid();
+        Title = title;
+        DurationMinutes = durationMinutes;
+    }
+
+    public void Edit(TimeSpan durationMinutes,string title)
+    {
+        if (string.IsNullOrEmpty(title))
+            throw new ArgumentException("Title required");
+        if (durationMinutes.TotalMinutes <= 0)
+            throw new ArgumentException("Invalid duration");
+        DurationMinutes = durationMinutes;
+        Title = title;
+    }
+}

Domain/Aggregates/User/User.cs

@@ -0,0 +1,95 @@
+using Domain.Base;
+using Domain.Entities;
+using Domain.Enums;
+using Domain.ValueObject;
+
+namespace Domain.Aggregates.User;
+
+public class User:AggregatedRoot
+{
+    public Guid Id { get; private set; }
+    public string FullName { get; private set; }
+    public UserRole Role { get; private set; }
+    public Email Email { get; private set; }
+    public PhoneNumber PhoneNumber { get; private set; }
+    public Password Password { get; private set; }
+    public string? PasswordResetCodeHash { get; private set; }
+    public DateTime? PasswordResetCodeExpireAt { get; private set; }
+    public int PasswordResetAttemptsCount { get; private set; }
+    private readonly List<RefreshToken> _refreshTokens = new();
+    public IReadOnlyList<RefreshToken> RefreshTokens => _refreshTokens;
+
+    public void AddRefreshToken(string refreshToken, DateTime expiresAt)
+    {
+        _refreshTokens.RemoveAll(tk => tk.IsExpired);
+        _refreshTokens.Add(new RefreshToken(refreshToken, expiresAt));
+    }
+
+    public void RevokeRefreshToken(Guid tokenId)
+    {
+        var token = _refreshTokens.FirstOrDefault(tk => tk.Id == tokenId);
+        if (token == null) throw new InvalidOperationException("Refresh token not found");
+        token.Revoke();
+    }
+
+    private User()
+    {
+    }
+
+    public User(string fullName, Email email, PhoneNumber phoneNumber, Password password)
+    {
+        Id = Guid.NewGuid();
+        FullName = fullName;
+        Role = UserRole.User;
+        Email = email;
+        PhoneNumber = phoneNumber;
+        Password = password;
+    }
+
+    public User(string fullName, Email email, PhoneNumber phoneNumber, UserRole role, Password password)
+    {
+        Id = Guid.NewGuid();
+        FullName = fullName;
+        Role = role;
+        Email = email ?? throw new ArgumentNullException(nameof(email));
+        PhoneNumber = phoneNumber ?? throw new ArgumentNullException(nameof(phoneNumber));
+        Password = password ?? throw new ArgumentNullException(nameof(password));
+    }
+
+    public void UpdateProfile(string fullName, PhoneNumber phoneNumber)
+    {
+        if (string.IsNullOrWhiteSpace(fullName)) throw new ArgumentException("Full name required");
+        if (phoneNumber == null) throw new ArgumentException("Phone number required");
+        FullName = fullName;
+        PhoneNumber = phoneNumber;
+    }
+
+    public void ResetPassword(string codeHash, DateTime expiresAt)
+    {
+        if (string.IsNullOrWhiteSpace(codeHash)) throw new ArgumentException("Code hash required");
+        if (expiresAt <= DateTime.UtcNow) throw new ArgumentException("Expires must be in future");
+        PasswordResetCodeHash = codeHash;
+        PasswordResetCodeExpireAt = expiresAt;
+        PasswordResetAttemptsCount = 0;
+    }
+
+    private const int MaxResetAttempts = 5;
+
+    public bool CanUseResetPassword(string codeHash, DateTime now)
+    {
+        if (PasswordResetCodeExpireAt == null || now > PasswordResetCodeExpireAt)
+            return false;
+        if (PasswordResetAttemptsCount >= MaxResetAttempts)
+            return false;
+        return PasswordResetCodeHash == codeHash;
+    }
+
+    public void IncreasePasswordResetAttemptCount() => PasswordResetAttemptsCount++;
+
+    public void ClearPasswordResetCode()
+    {
+        PasswordResetCodeHash = null;
+        PasswordResetCodeExpireAt = null;
+        PasswordResetAttemptsCount = 0;
+    }
+}

Domain/Base/AggregatedRoot.cs

@@ -0,0 +1,11 @@
+namespace Domain.Base;
+
+public class AggregatedRoot:EntityBase
+{
+    private readonly List<DomainEvent> _domainEvents=[];
+    public IReadOnlyCollection<DomainEvent> DomainEvents => _domainEvents;
+
+    protected void AddDomainEvent(DomainEvent domainEvent)=> _domainEvents.Add(domainEvent);
+
+    public void ClearDomainEvents() => _domainEvents.Clear();
+}