Merge pull request #44 from DiyorMarket/close_endPoint

manager checkpoint

Author: Boburm1rzo

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

@@ -9,15 +9,17 @@ public sealed record CheckPointDto(
     CheckPointStatus Status,
     string Driver,
     string CarModel,
-    decimal CurrentFuelAmount,
-    string Mechanic,
     decimal InitialMillage,
-    decimal FinalMileage,
+    decimal CurrentFuelAmount,
+    string MechanicAcceptance,
+    string MechanicHandover,
     string Operator,
     decimal InitialOilAmount,
     decimal OilRefillAmount,
     string Oil,
     string Dispatcher,
+    decimal FinalMileage,
     decimal FuelConsumptionAdjustment,
+    decimal RemainingFuelAmount,
     decimal DebtAmount
 );

CheckDrive.Api/CheckDrive.Application/DTOs/ManagerReview/CreateManagerReviewDto.cs

@@ -6,8 +6,8 @@ public sealed record CreateManagerReviewDto(
     int CheckPointId,
     int ReviewerId,
     string? Notes,
-    int InitialMileage,
-    int FinalMileage,
+    decimal InitialMileage,
+    decimal FinalMileage,
     decimal FuelConsumption,
     decimal RemainingFuelAmount,
     decimal DebtAmount)

CheckDrive.Api/CheckDrive.Application/Mappings/CheckPointMappings.cs

@@ -12,15 +12,17 @@ public CheckPointMappings()
             .ForCtorParam(nameof(CheckPointDto.Driver), opt => opt.MapFrom(src => $"{src.DoctorReview.Driver.FirstName} {src.DoctorReview.Driver.LastName}"))
             .ForCtorParam(nameof(CheckPointDto.CarModel), opt => opt.MapFrom(src => $"{src.MechanicHandover!.Car.Model}"))
             .ForCtorParam(nameof(CheckPointDto.CurrentFuelAmount), opt => opt.MapFrom(src => src.OperatorReview!.InitialOilAmount))
-            .ForCtorParam(nameof(CheckPointDto.Mechanic), opt => opt.MapFrom(src => $"{src.MechanicHandover!.Mechanic.FirstName} {src.MechanicHandover.Mechanic.LastName}"))
+            .ForCtorParam(nameof(CheckPointDto.MechanicHandover), opt => opt.MapFrom(src => $"{src.MechanicHandover!.Mechanic.FirstName} {src.MechanicHandover.Mechanic.LastName}"))
+            .ForCtorParam(nameof(CheckPointDto.MechanicAcceptance), opt => opt.MapFrom(src => $"{src.MechanicAcceptance!.Mechanic.FirstName} {src.MechanicAcceptance.Mechanic.LastName}"))
             .ForCtorParam(nameof(CheckPointDto.InitialMillage), opt => opt.MapFrom(src => src.MechanicHandover!.InitialMileage))
             .ForCtorParam(nameof(CheckPointDto.FinalMileage), opt => opt.MapFrom(src => src.DispatcherReview!.FinalMileage))
             .ForCtorParam(nameof(CheckPointDto.Operator), opt => opt.MapFrom(src => $"{src.OperatorReview!.Operator.FirstName} {src.OperatorReview.Operator.LastName}"))
             .ForCtorParam(nameof(CheckPointDto.InitialOilAmount), opt => opt.MapFrom(src => src.OperatorReview!.InitialOilAmount))
             .ForCtorParam(nameof(CheckPointDto.OilRefillAmount), opt => opt.MapFrom(src => src.OperatorReview!.OilRefillAmount))
-            .ForCtorParam(nameof(CheckPointDto.Oil), opt => opt.MapFrom(src => src.OperatorReview.OilMark.Name))
+            .ForCtorParam(nameof(CheckPointDto.Oil), opt => opt.MapFrom(src => src.OperatorReview!.OilMark.Name))
             .ForCtorParam(nameof(CheckPointDto.Dispatcher), opt => opt.MapFrom(src => $"{src.DispatcherReview!.Dispatcher.FirstName} {src.DispatcherReview.Dispatcher.LastName}"))
             .ForCtorParam(nameof(CheckPointDto.FuelConsumptionAdjustment), opt => opt.MapFrom(src => src.DispatcherReview!.FuelConsumptionAmount))
+            .ForCtorParam(nameof(CheckPointDto.RemainingFuelAmount), opt => opt.MapFrom(src => src.DispatcherReview!.RemainingFuelAmount))
             .ForCtorParam(nameof(CheckPointDto.DebtAmount), opt => opt.MapFrom(src => src.ManagerReview!.DebtAmount));
     }
 }

CheckDrive.Api/CheckDrive.Application/Services/DashboardService.cs

@@ -73,15 +73,15 @@ private async Task<List<OilConsumptionSummary>> GetOilConsumptionSummariesAsync(
     private async Task<List<CheckPointSummary>> GetCheckPointsSummariesAsync()
     {
         var checkPoints = await _context.CheckPoints
-                .OrderByDescending(x => x.Id)
-                .Where(x => x.Status == CheckPointStatus.InProgress)
+                .Where(x => x.StartDate == DateTime.UtcNow || x.Status == CheckPointStatus.InProgress)
                 .Select(x => new CheckPointSummary(
                     x.Id,
                     x.StartDate,
                     x.DoctorReview.Driver.FirstName + " " + x.DoctorReview.Driver.LastName,
                     x.MechanicHandover != null ? x.MechanicHandover.Car.Model : "",
                     x.Stage,
                     x.Status))
+                .OrderByDescending(x => x.Id)
                 .ToListAsync();
 
         return checkPoints;

CheckDrive.Api/CheckDrive.Application/Services/Review/ManagerReviewService.cs

@@ -33,6 +33,10 @@ public async Task<ManagerReviewDto> CreateAsync(CreateManagerReviewDto review)
         CreateDebt(review, checkPoint);
         UpdateDriver(checkPoint);
         UpdateCar(review, checkPoint);
+
+        checkPoint.Stage = CheckPointStage.ManagerReview;
+        checkPoint.Status = CheckPointStatus.Completed;
+
         var reviewEntity = CreateReview(review, checkPoint, manager);
 
         context.ManagerReviews.Add(reviewEntity);