Merge pull request #25 from DiyorMarket/signalR-integration

SignalR integration

Author: Mirazyzz

CheckDrive.Api/CheckDrive.Api/Controllers/CarsController.cs

@@ -0,0 +1,25 @@
+using CheckDrive.Application.DTOs.Car;
+using CheckDrive.Application.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Api.Controllers;
+
+[Route("api/cars")]
+[ApiController]
+public class CarsController : ControllerBase
+{
+    private readonly ICarService _carService;
+
+    public CarsController(ICarService carService)
+    {
+        _carService = carService;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<CarDto>>> GetAvailableCars()
+    {
+        var cars = await _carService.GetAvailableCarsAsync();
+
+        return Ok(cars);
+    }
+}

CheckDrive.Api/CheckDrive.Api/Controllers/CheckPointsController.cs

@@ -23,4 +23,12 @@ public async Task<ActionResult<List<CheckPointDto>>> GetCheckPointsAsync([FromQu
 
         return Ok(checkPoints);
     }
+
+    [HttpGet("drivers/{driverId:int}/current")]
+    public async Task<ActionResult<CheckPointDto>> GetCurrentCheckPointByDriverIdAsync(int driverId)
+    {
+        var checkPoint = await _service.GetCurrentCheckPointByDriverIdAsync(driverId);
+
+        return Ok(checkPoint);
+    }
 }

CheckDrive.Api/CheckDrive.Api/Controllers/DriversController.cs

@@ -0,0 +1,33 @@
+using CheckDrive.Application.DTOs.Driver;
+using CheckDrive.Application.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Api.Controllers;
+
+[Route("api/drivers")]
+[ApiController]
+public class DriversController : ControllerBase
+{
+    private readonly IDriverService _driverService;
+
+    public DriversController(IDriverService driverService)
+    {
+        _driverService = driverService ?? throw new ArgumentNullException(nameof(driverService));
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<DriverDto>>> GetAvailableDriversAsync()
+    {
+        var drivers = await _driverService.GetAvailableDriversAsync();
+
+        return Ok(drivers);
+    }
+
+    [HttpPost("reviews")]
+    public async Task<IActionResult> CreateReviewConfirmation(DriverReviewConfirmationDto confirmationDto)
+    {
+        await _driverService.CreateReviewConfirmation(confirmationDto);
+
+        return NoContent();
+    }
+}

CheckDrive.Api/CheckDrive.Api/Controllers/OilMarksController.cs

@@ -0,0 +1,25 @@
+using CheckDrive.Application.DTOs.OilMark;
+using CheckDrive.Application.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Api.Controllers;
+
+[Route("api/oilMarks")]
+[ApiController]
+public class OilMarksController : ControllerBase
+{
+    private readonly IOilMarkService _oilMarkService;
+
+    public OilMarksController(IOilMarkService oilMarkService)
+    {
+        _oilMarkService = oilMarkService ?? throw new ArgumentNullException(nameof(oilMarkService));
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OilMarkDto>>> GetAsync()
+    {
+        var oilMarks = await _oilMarkService.GetAllAsync();
+
+        return Ok(oilMarks);
+    }
+}

CheckDrive.Api/CheckDrive.Api/Extensions/DependencyInjection.cs

@@ -20,6 +20,10 @@ public static IServiceCollection ConfigureServices(this IServiceCollection servi
         services.RegisterInfrastructure(configuration);
 
         services.AddSingleton<FileExtensionContentTypeProvider>();
+        services.AddSignalR(options =>
+        {
+            options.EnableDetailedErrors = true;
+        });
 
         AddControllers(services);
         AddSwagger(services);

CheckDrive.Api/CheckDrive.Api/Program.cs

@@ -1,10 +1,11 @@
 using CheckDrive.Api.Extensions;
 using CheckDrive.Api.Helpers;
+using CheckDrive.Application.Hubs;
 using Microsoft.AspNetCore.CookiePolicy;
 using Serilog;
 
 Log.Logger = new LoggerConfiguration()
-    .MinimumLevel.Verbose()
+    .MinimumLevel.Information()
     .Enrich.FromLogContext()
     .WriteTo.Console(new CustomJsonFormatter())
     .WriteTo.File(new CustomJsonFormatter(), "logs/logs.txt", rollingInterval: RollingInterval.Day)
@@ -44,6 +45,8 @@
 
 app.MapControllers();
 
+app.MapHub<ReviewHub>("/review-hub");
+
 app.Run();
 
 // For API testing

CheckDrive.Api/CheckDrive.Application/BackgroundJobs/CarMonthlyMileageResetService.cs

@@ -0,0 +1,42 @@
+using CheckDrive.Domain.Interfaces;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace CheckDrive.Application.BackgroundJobs;
+
+internal sealed class CarMonthlyMileageResetService : BackgroundService
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public CarMonthlyMileageResetService(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            DateTime now = DateTime.UtcNow;
+
+            // Check if it's the first day of the month at midnight UTC
+            if (now.Day == 1 && now.Hour == 0)
+            {
+                await ResetCarMonthlyMileage(stoppingToken);
+            }
+
+            await Task.Delay(TimeSpan.FromHours(1), stoppingToken);
+        }
+    }
+
+    private async Task ResetCarMonthlyMileage(CancellationToken stoppingToken)
+    {
+        using var scope = _serviceProvider.CreateScope();
+        var context = scope.ServiceProvider.GetRequiredService<ICheckDriveDbContext>();
+
+        await context.Cars.ExecuteUpdateAsync(
+            x => x.SetProperty(x => x.CurrentMonthMileage, 0),
+            stoppingToken);
+    }
+}

CheckDrive.Api/CheckDrive.Application/DTOs/Account/AccountDto.cs

@@ -4,6 +4,7 @@ namespace CheckDrive.Application.DTOs.Account;
 
 public record class AccountDto(
     string Id,
+    string AccountId,
     string Username,
     string PhoneNumber,
     string? Email,

CheckDrive.Api/CheckDrive.Application/DTOs/Car/CarDto.cs

@@ -0,0 +1,17 @@
+using CheckDrive.Domain.Enums;
+
+namespace CheckDrive.Application.DTOs.Car;
+
+public sealed record CarDto(
+    int Id,
+    string Model,
+    string Color,
+    string Number,
+    int ManufacturedYear,
+    int Mileage,
+    int CurrentMonthMileage,
+    int YearlyDistanceLimit,
+    decimal AverageFuelConsumption,
+    decimal FuelCapacity,
+    decimal RemainingFuel,
+    CarStatus Status);

CheckDrive.Api/CheckDrive.Application/DTOs/CheckPoint/DriverCheckPointDto.cs

@@ -0,0 +1,14 @@
+using CheckDrive.Application.DTOs.Car;
+using CheckDrive.Application.DTOs.Review;
+using CheckDrive.Domain.Enums;
+
+namespace CheckDrive.Application.DTOs.CheckPoint;
+
+public sealed record DriverCheckPointDto(
+    int Id,
+    DateTime StartDate,
+    CheckPointStage Stage,
+    CheckPointStatus Status,
+    string DriverName,
+    CarDto? Car,
+    List<DriverReviewDto> Reviews);

CheckDrive.Api/CheckDrive.Application/DTOs/DispatcherReview/DispatcherReviewDto.cs

@@ -23,4 +23,4 @@ public sealed record DispatcherReviewDto(
         Notes: Notes,
         Date: Date,
         Status: Status,
-        Type: ReviewType.Dispatcher);
+        Type: ReviewType.DispatcherReview);

CheckDrive.Api/CheckDrive.Application/DTOs/DoctorReview/DoctorReviewDto.cs

@@ -21,4 +21,4 @@ public sealed record DoctorReviewDto(
         Date: Date,
         Notes: Notes,
         Status: Status,
-        Type: ReviewType.Doctor);
+        Type: ReviewType.DoctorReview);

CheckDrive.Api/CheckDrive.Application/DTOs/Driver/DriverDto.cs

@@ -0,0 +1,6 @@
+namespace CheckDrive.Application.DTOs.Driver;
+
+public record DriverDto(
+    int Id,
+    string AccountId,
+    string FullName);

CheckDrive.Api/CheckDrive.Application/DTOs/Driver/DriverReviewConfirmationDto.cs

@@ -0,0 +1,9 @@
+using CheckDrive.Domain.Enums;
+
+namespace CheckDrive.Application.DTOs.Driver;
+
+public sealed record DriverReviewConfirmationDto(
+    int CheckPointId,
+    ReviewType ReviewType,
+    bool IsAcceptedByDriver,
+    string? Notes);

CheckDrive.Api/CheckDrive.Application/DTOs/MechanicHandover/MechanicHandoverReviewDto.cs

@@ -1,4 +1,5 @@
-using CheckDrive.Application.DTOs.Review;
+using CheckDrive.Application.DTOs.Car;
+using CheckDrive.Application.DTOs.Review;
 using CheckDrive.Domain.Enums;
 
 namespace CheckDrive.Application.DTOs.MechanicHandover;
@@ -12,7 +13,8 @@ public sealed record MechanicHandoverReviewDto(
     string? Notes,
     DateTime Date,
     ReviewStatus Status,
-    int InitialMileage)
+    int InitialMileage,
+    CarDto Car)
     : ReviewDtoBase(
         CheckPointId: CheckPointId,
         ReviewerId: ReviewerId,

CheckDrive.Api/CheckDrive.Application/DTOs/OilMark/OilMarkDto.cs

@@ -0,0 +1,5 @@
+namespace CheckDrive.Application.DTOs.OilMark;
+
+public sealed record OilMarkDto(
+    int Id,
+    string Name);

CheckDrive.Api/CheckDrive.Application/DTOs/OperatorReview/OperatorReviewDto.cs

@@ -25,4 +25,4 @@ public sealed record OperatorReviewDto(
         Notes: Notes,
         Date: Date,
         Status: Status,
-        Type: ReviewType.Operator);
+        Type: ReviewType.OperatorReview);

CheckDrive.Api/CheckDrive.Application/DTOs/Review/DriverReviewDto.cs

@@ -0,0 +1,10 @@
+using CheckDrive.Domain.Enums;
+
+namespace CheckDrive.Application.DTOs.Review;
+
+public sealed record DriverReviewDto(
+    string? Notes,
+    string ReviewerName,
+    DateTime Date,
+    ReviewType Type,
+    ReviewStatus Status);

CheckDrive.Api/CheckDrive.Application/DTOs/Review/ReviewConfirmationDto.cs

@@ -0,0 +1,8 @@
+using CheckDrive.Domain.Enums;
+
+namespace CheckDrive.Application.DTOs.Review;
+
+public sealed record ReviewConfirmationDto(
+    int CheckPointId,
+    ReviewType ReviewType,
+    string Message);

CheckDrive.Api/CheckDrive.Application/Extensions/DependencyInjection.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using CheckDrive.Application.Interfaces.Auth;
 using CheckDrive.Application.Services.Auth;
+using CheckDrive.Application.BackgroundJobs;
 
 namespace CheckDrive.Application.Extensions;
 
@@ -28,5 +29,10 @@ private static void AddServices(IServiceCollection services)
         services.AddScoped<IDispatcherReviewService, DispatcherReviewService>();
         services.AddScoped<ICheckPointService, CheckPointService>();
         services.AddScoped<IAccountService, AccountService>();
+        services.AddScoped<IDriverService, DriverService>();
+        services.AddScoped<ICarService, CarService>();
+        services.AddScoped<IOilMarkService, OilMarkService>();
+
+        services.AddHostedService<CarMonthlyMileageResetService>();
     }
 }

CheckDrive.Api/CheckDrive.Application/Hubs/IReviewHub.cs

@@ -0,0 +1,14 @@
+using CheckDrive.Application.DTOs.MechanicAcceptance;
+using CheckDrive.Application.DTOs.MechanicHandover;
+using CheckDrive.Application.DTOs.OperatorReview;
+using CheckDrive.Application.DTOs.Review;
+
+namespace CheckDrive.Application.Hubs;
+
+public interface IReviewHub
+{
+    Task NotifyDoctorReview(ReviewDtoBase review);
+    Task MechanicHandoverConfirmation(MechanicHandoverReviewDto review);
+    Task OperatorReviewConfirmation(OperatorReviewDto review);
+    Task MechanicAcceptanceConfirmation(MechanicAcceptanceReviewDto review);
+}

CheckDrive.Api/CheckDrive.Application/Hubs/ReviewHub.cs

@@ -0,0 +1,14 @@
+using CheckDrive.Application.DTOs.Review;
+using Microsoft.AspNetCore.SignalR;
+
+namespace CheckDrive.Application.Hubs;
+
+public sealed class ReviewHub : Hub<IReviewHub>
+{
+    public async Task NotifyNewReviewAsync(ReviewDtoBase review)
+    {
+        await Clients
+            .User(review.DriverId.ToString())
+            .NotifyDoctorReview(review);
+    }
+}

CheckDrive.Api/CheckDrive.Application/Interfaces/Auth/IJwtTokenGenerator.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Identity;
+using CheckDrive.Domain.Entities;
 
 namespace CheckDrive.Application.Interfaces.Auth;
 
 public interface IJwtTokenGenerator
 {
-    string GenerateToken(IdentityUser user, IList<string> roles);
+    string GenerateToken(Employee employee, IList<string> roles);
 }

CheckDrive.Api/CheckDrive.Application/Interfaces/ICarService.cs

@@ -0,0 +1,8 @@
+using CheckDrive.Application.DTOs.Car;
+
+namespace CheckDrive.Application.Interfaces;
+
+public interface ICarService
+{
+    Task<List<CarDto>> GetAvailableCarsAsync();
+}

CheckDrive.Api/CheckDrive.Application/Interfaces/ICheckPointService.cs

@@ -6,5 +6,5 @@ namespace CheckDrive.Application.Interfaces;
 public interface ICheckPointService
 {
     Task<List<CheckPointDto>> GetCheckPointsAsync(CheckPointQueryParameters queryParameters);
-    Task<CheckPointDto> GetCheckPointsByDriverIdAsync(int driverId);
+    Task<CheckPointDto> GetCurrentCheckPointByDriverIdAsync(int driverId);
 }

CheckDrive.Api/CheckDrive.Application/Interfaces/IDriverService.cs

@@ -0,0 +1,9 @@
+using CheckDrive.Application.DTOs.Driver;
+
+namespace CheckDrive.Application.Interfaces;
+
+public interface IDriverService
+{
+    Task<List<DriverDto>> GetAvailableDriversAsync();
+    Task CreateReviewConfirmation(DriverReviewConfirmationDto confirmation);
+}

CheckDrive.Api/CheckDrive.Application/Interfaces/IOilMarkService.cs

@@ -0,0 +1,8 @@
+using CheckDrive.Application.DTOs.OilMark;
+
+namespace CheckDrive.Application.Interfaces;
+
+public interface IOilMarkService
+{
+    Task<List<OilMarkDto>> GetAllAsync();
+}

CheckDrive.Api/CheckDrive.Application/Mappings/AccountMappings.cs

@@ -10,7 +10,8 @@ internal sealed class AccountMappings : Profile
     public AccountMappings()
     {
         CreateMap<Employee, AccountDto>()
-            .ForCtorParam(nameof(AccountDto.Id), cfg => cfg.MapFrom(e => e.AccountId))
+            .ForCtorParam(nameof(AccountDto.Id), cfg => cfg.MapFrom(e => e.Id))
+            .ForCtorParam(nameof(AccountDto.AccountId), cfg => cfg.MapFrom(e => e.AccountId))
             .ForCtorParam(nameof(AccountDto.Username), cfg => cfg.MapFrom(e => e.Account.UserName))
             .ForCtorParam(nameof(AccountDto.PhoneNumber), cfg => cfg.MapFrom(e => e.Account.PhoneNumber))
             .ForCtorParam(nameof(AccountDto.Email), cfg => cfg.MapFrom(e => e.Account.Email))