Merge pull request #42 from DiyorMarket/Get_CheckPoints_By_Id

Get check points

Author: Boburm1rzo

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

@@ -18,6 +18,14 @@ public async Task<ActionResult<List<CheckPointDto>>> GetCheckPointsAsync([FromQu
         return Ok(checkPoints);
     }
 
+    [HttpGet("{checkPointId:int}")]
+    public async Task<ActionResult<CheckPointDto>> GetCheckPointByIdAsync(int checkPointId)
+    {
+        var checkPoint = await service.GetByIdAsync(checkPointId);
+
+        return Ok(checkPoint);
+    }
+
     [HttpGet("drivers/{driverId:int}/current")]
     public async Task<ActionResult<CheckPointDto>> GetCurrentCheckPointByDriverIdAsync(int driverId)
     {

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

@@ -18,7 +18,7 @@ public CheckPointMappings()
             .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.MechanicHandover!.Car.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.DebtAmount), opt => opt.MapFrom(src => src.ManagerReview!.DebtAmount));

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

@@ -54,17 +54,27 @@ private async Task<List<OilConsumptionSummary>> GetOilConsumptionSummariesAsync(
     {
         return new List<OilConsumptionSummary>()
         {
-            new OilConsumptionSummary("September", 50, 40, 35, 40, 50),
-            new OilConsumptionSummary("October", 25, 67, 65, 15, 32),
-            new OilConsumptionSummary("November", 30, 20, 35, 45, 12),
-            new OilConsumptionSummary("December", 45, 17, 45, 55, 70),
+            new OilConsumptionSummary("January", 110, 105, 80, 75, 40),
+            new OilConsumptionSummary("February", 115, 110, 78, 73, 35),
+            new OilConsumptionSummary("March", 120, 115, 85, 80, 50),
+            new OilConsumptionSummary("April", 105, 100, 70, 65, 30),
+            new OilConsumptionSummary("May", 130, 125, 75, 70, 45),
+            new OilConsumptionSummary("June", 100, 95, 82, 77, 38),
+            new OilConsumptionSummary("July", 125, 120, 90, 85, 55),
+            new OilConsumptionSummary("August", 110, 108, 78, 73, 42),
+            new OilConsumptionSummary("September", 115, 112, 88, 83, 50),
+            new OilConsumptionSummary("October", 105, 102, 72, 68, 33),
+            new OilConsumptionSummary("November", 130, 128, 80, 75, 48),
+            new OilConsumptionSummary("December", 100, 98, 74, 70, 36),
+
         };
     }
 
     private async Task<List<CheckPointSummary>> GetCheckPointsSummariesAsync()
     {
         var checkPoints = await _context.CheckPoints
-                .Where(x => x.StartDate.Day == DateTime.UtcNow.Day)
+                .OrderByDescending(x => x.Id)
+                .Where(x => x.Status == CheckPointStatus.InProgress)
                 .Select(x => new CheckPointSummary(
                     x.Id,
                     x.StartDate,