Merge pull request #249 from DiyorMarket/master

CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs

@@ -46,7 +46,7 @@ public async Task<IActionResult> DetailsForMechanicHandover(int id)
 
     public async Task<IActionResult> Create()
     {
-        var oilMarks = await GetOilMarkAsync();
+        var oilMarks = await GetOilMarksAsync();
         ViewBag.OilMarks = oilMarks;
 
         return View();
@@ -58,7 +58,7 @@ public async Task<IActionResult> Create([FromForm] CreateCarRequest request)
     {
         if (ModelState.IsValid)
         {
-            var newCar = await carStore.CreateAsync(request);
+            await carStore.CreateAsync(request);
             return RedirectToAction(nameof(Index));
         }
         return BadRequest(ModelState);
@@ -67,7 +67,7 @@ public async Task<IActionResult> Create([FromForm] CreateCarRequest request)
     public async Task<IActionResult> Edit(int id)
     {
         var car = await carStore.GetByIdAsync(id);
-        var oilMarks = await GetOilMarkAsync();
+        var oilMarks = await GetOilMarksAsync(car.OilMarkId);
 
         ViewBag.OilMarks = oilMarks;
         var carRequest = car.ToUpdateViewModel();
@@ -108,16 +108,17 @@ public async Task<IActionResult> DeleteConfirmed(int id)
         return RedirectToAction(nameof(Index));
     }
 
-    private async Task<List<SelectListItem>> GetOilMarkAsync()
+    private async Task<List<SelectListItem>> GetOilMarksAsync(int? oilMarkId = default)
     {
         var oilMarks = await oilMarkStore.GetAsync();
 
         return oilMarks
             .Select(e => new SelectListItem()
             {
                 Value = e.Id.ToString(),
-                Text = e.Name.ToString()
+                Text = e.Name.ToString(),
+                Selected = e.Id == oilMarkId
             })
             .ToList();
     }
-}
+}

CheckDrive.Web/CheckDrive.Web/Controllers/CheckPointController.cs

@@ -1,20 +1,40 @@
-using CheckDrive.Web.Stores.CheckPoint;
+using CheckDrive.Web.Mappings;
+using CheckDrive.Web.Services.CurrentUserService;
+using CheckDrive.Web.Stores.CheckPoint;
+using CheckDrive.Web.Stores.ManagerReview;
+using CheckDrive.Web.ViewModels.CheckPoint;
 using Microsoft.AspNetCore.Mvc;
 
-namespace CheckDrive.Web.Controllers
+namespace CheckDrive.Web.Controllers;
+
+public class CheckPointController(
+    ICheckPointStore checkPointStore,
+    IManagerReviewStore managerReviewStore,
+    ICurrentUserService currentUserService) : Controller
 {
-    public class CheckPointController : Controller
+    public async Task<ActionResult> Details(int id)
+    {
+        var checkPoint = await checkPointStore.GetByIdAsync(id);
+
+        return View(checkPoint);
+    }
+
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<ActionResult> Create(CheckPointViewModel model)
     {
-        private readonly ICheckPointStore _checkPointStore;
-        public CheckPointController(ICheckPointStore checkPointStore)
+        try
         {
-            _checkPointStore = checkPointStore ?? throw new ArgumentNullException(nameof(checkPointStore));
+            var createManagerReviewRequest = model.ToCreateManagerReviewRequest();
+            createManagerReviewRequest.ReviewerId = currentUserService.GetUserId();
+
+            var createdReview = await managerReviewStore.CreateAsync(createManagerReviewRequest);
+
+            return RedirectToAction("Index", "Home");
         }
-        public async Task<ActionResult> Index(int id)
+        catch
         {
-            var checkPoint = await _checkPointStore.GetCheckPointByIdAsync(id);
-
-            return View(checkPoint);
+            return View(model);
         }
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/DebtsController.cs

@@ -1,24 +1,19 @@
-using System.ComponentModel.DataAnnotations;
-using System.Reflection;
-using CheckDrive.Web.Mappings;
+using CheckDrive.Web.Mappings;
 using CheckDrive.Web.Models.Enums;
 using CheckDrive.Web.Requests.Debt;
 using CheckDrive.Web.Stores.Debts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
 
 namespace CheckDrive.Web.Controllers;
 
-public class DebtsController : Controller
+public class DebtsController(IDebtsStore debtStore) : Controller
 {
-    private readonly IDebtsStore _debtStore;
-    public DebtsController(IDebtsStore debtStore)
-    {
-        _debtStore = debtStore ?? throw new ArgumentNullException(nameof(debtStore));
-    }
     public async Task<ActionResult> Index()
     {
-        var debts = await _debtStore.GetAsync();
+        var debts = await debtStore.GetAsync();
 
         ViewBag.SelectedStatus = GetDebtStatuses();
 
@@ -28,19 +23,19 @@ public async Task<ActionResult> Index()
     [HttpGet]
     public async Task<ActionResult> Edit(int id)
     {
-        var debt = await _debtStore.GetByIdAsync(id);
+        var debt = await debtStore.GetByIdAsync(id);
 
         var updateRequest = debt.ToUpdateViewModel();
-        
+
         return View(updateRequest);
     }
 
     [HttpPost]
     public async Task<ActionResult> Edit(UpdateDebtRequest request)
-    {   
+    {
         request.Status = DebtStatus.Paid;
 
-        await _debtStore.UpdateAsync(request);
+        await debtStore.UpdateAsync(request);
 
         return RedirectToAction(nameof(Index));
     }
@@ -53,11 +48,11 @@ private static List<SelectListItem> GetDebtStatuses()
                     .Where(e => excludedStatuses.Contains(e))
                     .Select(e => new SelectListItem()
                     {
-                        Value = e.ToString(),
+                        Value = ((int)e).ToString(),
                         Text = e.GetType().GetField(e.ToString())?.GetCustomAttribute<DisplayAttribute>()?.Name ?? e.ToString()
                     })
                     .ToList();
-    
+
         return statuses;
     }
 }

CheckDrive.Web/CheckDrive.Web/Controllers/EmployeesController.cs

@@ -12,6 +12,8 @@ namespace CheckDrive.Web.Controllers;
 
 public class EmployeesController(IEmployeeStore employeeStore, ICarStore carStore) : Controller
 {
+    private static readonly EmployeePosition[] excludedPositions = [EmployeePosition.Custom];
+
     public async Task<ActionResult> Index()
     {
         var employees = await employeeStore.GetAsync();
@@ -42,7 +44,7 @@ public async Task<ActionResult> Create(CreateEmployeeRequest request)
         try
         {
             var createdEmployee = await employeeStore.CreateAsync(request);
-            
+
             return RedirectToAction(nameof(Index));
         }
         catch
@@ -54,7 +56,7 @@ public async Task<ActionResult> Create(CreateEmployeeRequest request)
     public async Task<ActionResult> Edit(int id)
     {
         var employee = await employeeStore.GetByIdAsync(id);
-        ViewBag.Positions = GetPositions();
+        ViewBag.Positions = GetPositions(employee.Position);
         ViewBag.Cars = await GetCarsAsync();
 
         var updateRequest = employee.ToUpdateViewModel();
@@ -99,16 +101,16 @@ public async Task<ActionResult> Delete(int id, IFormCollection _)
         }
     }
 
-    private static List<SelectListItem> GetPositions()
+    private static List<SelectListItem> GetPositions(EmployeePosition? selectedPosition = EmployeePosition.Driver)
     {
-        var excludedPositions = new[] { EmployeePosition.Manager, EmployeePosition.Custom };
         var positions = Enum.GetValues(typeof(EmployeePosition))
                     .Cast<EmployeePosition>()
                     .Where(e => !excludedPositions.Contains(e))
                     .Select(e => new SelectListItem()
                     {
                         Value = e.ToString(),
-                        Text = e.GetType().GetField(e.ToString())?.GetCustomAttribute<DisplayAttribute>()?.Name ?? e.ToString()
+                        Text = e.GetType().GetField(e.ToString())?.GetCustomAttribute<DisplayAttribute>()?.Name ?? e.ToString(),
+                        Selected = e == selectedPosition
                     })
                     .ToList();
 
@@ -123,7 +125,7 @@ private async Task<List<SelectListItem>> GetCarsAsync()
             .Select(e => new SelectListItem()
             {
                 Value = e.Id.ToString(),
-                Text = e.ToString()
+                Text = $"{e.Model} ({e.Number})"
             })
             .ToList();
     }

CheckDrive.Web/CheckDrive.Web/Controllers/ErrorController.cs

@@ -5,10 +5,7 @@ namespace CheckDrive.Web.Controllers;
 [Route("Error")]
 public class ErrorController : Controller
 {
-    public IActionResult Index()
-    {
-        return View();
-    }
+    public IActionResult Index() => View();
 
     [Route("{statusCode:int}")]
     public IActionResult ErrorPage(int statusCode)
@@ -23,28 +20,13 @@ public IActionResult ErrorPage(int statusCode)
         };
     }
 
-    public IActionResult Unauthorized()
-    {
-        return View();
-    }
+    public IActionResult Unauthorized() => View();
 
-    public IActionResult Forbidden()
-    {
-        return View();
-    }
+    public IActionResult Forbidden() => View();
 
-    public IActionResult NotFound()
-    {
-        return View();
-    }
+    public IActionResult NotFound() => View();
 
-    public IActionResult InternalServerError()
-    {
-        return View();
-    }
+    public IActionResult InternalServerError() => View();
 
-    public IActionResult Error409()
-    {
-        return View();
-    }
+    public IActionResult Error409() => View();
 }

CheckDrive.Web/CheckDrive.Web/Controllers/OilMarksController.cs

@@ -1,4 +1,5 @@
-using CheckDrive.Web.Requests.OilMark;
+using CheckDrive.Web.Mappings;
+using CheckDrive.Web.Requests.OilMark;
 using CheckDrive.Web.Stores.OilMarks;
 using Microsoft.AspNetCore.Mvc;
 
@@ -20,10 +21,7 @@ public async Task<IActionResult> Details(int id)
         return View(oilMark);
     }
 
-    public IActionResult Create()
-    {
-        return View();
-    }
+    public IActionResult Create() => View();
 
     [HttpPost]
     [ValidateAntiForgeryToken]
@@ -40,8 +38,9 @@ public async Task<IActionResult> Create([FromForm] CreateOilMarkRequest request)
     public async Task<IActionResult> Edit(int id)
     {
         var oilMark = await oilMarkDataStore.GetByIdAsync(id);
+        var updateRequest = oilMark.ToUpdateViewModel();
 
-        return View(oilMark);
+        return View(updateRequest);
     }
 
     [HttpPost]

CheckDrive.Web/CheckDrive.Web/Extensions/DependencyInjection.cs

@@ -5,29 +5,15 @@
 using CheckDrive.Web.Services;
 using CheckDrive.Web.Services.CookieHandler;
 using CheckDrive.Web.Services.CurrentUserService;
-using CheckDrive.Web.Stores.Accounts;
 using CheckDrive.Web.Stores.Auth;
 using CheckDrive.Web.Stores.Cars;
 using CheckDrive.Web.Stores.CheckPoint;
 using CheckDrive.Web.Stores.Dashboard;
 using CheckDrive.Web.Stores.Debts;
-using CheckDrive.Web.Stores.DispatcherReviews;
-using CheckDrive.Web.Stores.Dispatchers;
-using CheckDrive.Web.Stores.DoctorReviews;
-using CheckDrive.Web.Stores.Doctors;
-using CheckDrive.Web.Stores.Drivers;
 using CheckDrive.Web.Stores.Employee;
-using CheckDrive.Web.Stores.MechanicAcceptances;
-using CheckDrive.Web.Stores.MechanicHandovers;
-using CheckDrive.Web.Stores.Mechanics;
+using CheckDrive.Web.Stores.ManagerReview;
 using CheckDrive.Web.Stores.Menu;
-using CheckDrive.Web.Stores.MockDashboard;
 using CheckDrive.Web.Stores.OilMarks;
-using CheckDrive.Web.Stores.OperatorReviews;
-using CheckDrive.Web.Stores.Operators;
-using CheckDrive.Web.Stores.Roles;
-using CheckDrive.Web.Stores.Technicians;
-using CheckDrive.Web.Stores.User;
 using Syncfusion.Licensing;
 
 namespace CheckDrive.Web.Extensions;
@@ -58,28 +44,14 @@ private static void AddConfigurations(IServiceCollection services, IConfiguratio
 
     private static void AddStores(IServiceCollection services)
     {
-        services.AddScoped<IAccountDataStore, AccountDataStore>();
         services.AddScoped<ICarStore, CarStore>();
-        services.AddScoped<IDispatcherReviewDataStore, DispatcherReviewDataStore>();
-        services.AddScoped<IDispatcherDataStore, DispatcherDataStore>();
-        services.AddScoped<IDoctorDataStore, DoctorDataStore>();
-        services.AddScoped<IDoctorReviewDataStore, DoctorReviewDataStore>();
-        services.AddScoped<IDriverDataStore, DriverDataStore>();
-        services.AddScoped<IMechanicAcceptanceDataStore, MechanicAcceptanceDataStore>();
-        services.AddScoped<IMechanicHandoverDataStore, MechanicHandoverDataStore>();
-        services.AddScoped<IMechanicDataStore, MechanicDataStore>();
         services.AddScoped<IOilMarkStore, OilMarkStore>();
-        services.AddScoped<IOperatorReviewDataStore, OperatorReviewDataStore>();
-        services.AddScoped<IOperatorDataStore, OperatorDataStore>();
-        services.AddScoped<IRoleDataStore, RoleDataStore>();
-        services.AddScoped<ITechnicianDataStore, MockTechnicianDataStore>();
         services.AddScoped<IDashboardStore, DashboardStore>();
-        services.AddScoped<IMockDashboardStore, MockDashboardStore>();
         services.AddScoped<IDebtsStore, DebtsStore>();
-        services.AddScoped<IUserDataStore, UserDataStore>();
         services.AddScoped<ICheckPointStore, CheckPointStore>();
         services.AddScoped<IAuthStore, AuthStore>();
         services.AddScoped<IEmployeeStore, EmployeeStore>();
+        services.AddScoped<IManagerReviewStore, ManagerReviewStore>();
     }
 
     private static void AddServices(IServiceCollection services)
@@ -122,4 +94,4 @@ private static void RegisterLicenses(IConfiguration configuration)
 
         SyncfusionLicenseProvider.RegisterLicense(key);
     }
-}
+}

CheckDrive.Web/CheckDrive.Web/Helpers/AuthorizationHandler.cs

@@ -4,6 +4,7 @@
 using CheckDrive.Web.Requests.Auth;
 using CheckDrive.Web.Services.CookieHandler;
 using CheckDrive.Web.Stores.Auth;
+using Microsoft.IdentityModel.Tokens;
 
 namespace CheckDrive.Web.Helpers;
 
@@ -33,6 +34,11 @@ private async Task TryAddAuthorizationHeadersAsync(HttpRequestMessage request)
 
         var (accessToken, refreshToken) = cookieHandler.GetTokens();
 
+        if (accessToken is null || refreshToken is null)
+        {
+            throw new SecurityTokenException("Access token or refresh token is missing.");
+        }
+
         if (JwtHelper.IsValid(accessToken))
         {
             request.Headers.Authorization = new AuthenticationHeaderValue(HeaderConstants.AuthenticationSchema, accessToken);