update controllers

Author: Mirazyzz

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

@@ -22,7 +22,7 @@ public CarsController(ICarService carService)
     }
 
     [HttpGet]
-    public async Task<ActionResult<List<CarDto>>> GetAllAsync(CarQueryParameters queryParameters)
+    public async Task<ActionResult<List<CarDto>>> GetAllAsync([FromQuery] CarQueryParameters queryParameters)
     {
         var cars = await _carService.GetAllAsync(queryParameters);
 
@@ -46,7 +46,7 @@ public async Task<ActionResult<CarDto>> CreateAsync(CreateCarDto car)
     }
 
     [HttpPost("upload")]
-    public async Task<ActionResult> Upload(IFormFile file)
+    public IActionResult Upload(IFormFile file)
     {
         if (file == null || file.Length == 0)
             return BadRequest("File not provided or empty");

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

@@ -1,5 +1,6 @@
 using CheckDrive.Application.DTOs.Driver;
 using CheckDrive.Application.Interfaces;
+using CheckDrive.Application.QueryParameters;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CheckDrive.Api.Controllers;
@@ -16,9 +17,9 @@ public DriversController(IDriverService driverService)
     }
 
     [HttpGet]
-    public async Task<ActionResult<List<DriverDto>>> GetAvailableDriversAsync()
+    public async Task<ActionResult<List<DriverDto>>> GetAvailableDriversAsync([FromQuery] DriverQueryParameters queryParameters)
     {
-        var drivers = await _driverService.GetAvailableDriversAsync();
+        var drivers = await _driverService.GetAsync(queryParameters);
 
         return Ok(drivers);
     }

CheckDrive.Api/CheckDrive.Api/Controllers/AccountsController.cs CheckDrive.Api/CheckDrive.Api/Controllers/EmployeesController.cs

@@ -1,33 +1,33 @@
 using CheckDrive.Application.Constants;
-using CheckDrive.Application.DTOs.Account;
+using CheckDrive.Application.DTOs.Employee;
 using CheckDrive.Application.Interfaces;
-using CheckDrive.Domain.Enums;
+using CheckDrive.Application.QueryParameters;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CheckDrive.Api.Controllers;
 
-[Route("api/accounts")]
+[Route("api/employees")]
 [ApiController]
-public class AccountsController : ControllerBase
+public class EmployeesController : ControllerBase
 {
-    private readonly IAccountService _service;
+    private readonly IEmployeeService _service;
 
-    public AccountsController(IAccountService service)
+    public EmployeesController(IEmployeeService service)
     {
         _service = service ?? throw new ArgumentNullException(nameof(service));
     }
 
     [HttpGet]
-    public async Task<ActionResult<List<AccountDto>>> GetAsync(EmployeePosition? position)
+    public async Task<ActionResult<List<EmployeeDto>>> GetAsync([FromQuery] EmployeeQueryParameters queryParameters)
     {
-        var accounts = await _service.GetAsync(position);
+        var accounts = await _service.GetAsync(queryParameters);
 
         return Ok(accounts);
     }
 
-    [HttpGet("{id}", Name = nameof(GetAccountByIdAsync))]
-    public async Task<ActionResult<AccountDto>> GetAccountByIdAsync(string id)
+    [HttpGet("{id}", Name = nameof(GetEmployeeByIdAsync))]
+    public async Task<ActionResult<EmployeeDto>> GetEmployeeByIdAsync(string id)
     {
         var account = await _service.GetByIdAsync(id);
 
@@ -36,15 +36,15 @@ public async Task<ActionResult<AccountDto>> GetAccountByIdAsync(string id)
 
     [HttpPost]
     [Authorize(Roles = $"{Roles.Manager},{Roles.Administrator}")]
-    public async Task<ActionResult<AccountDto>> CreateAsync([FromBody] CreateAccountDto account)
+    public async Task<ActionResult<EmployeeDto>> CreateAsync([FromBody] CreateEmployeeDto account)
     {
         var createdAccount = await _service.CreateAsync(account);
 
-        return CreatedAtAction(nameof(GetAccountByIdAsync), new { id = createdAccount.Id }, createdAccount);
+        return CreatedAtAction(nameof(GetEmployeeByIdAsync), new { id = createdAccount.Id }, createdAccount);
     }
 
     [HttpPut("{id}")]
-    public async Task<ActionResult<AccountDto>> UpdateAsync([FromRoute] string id, [FromBody] UpdateAccountDto account)
+    public async Task<ActionResult<EmployeeDto>> UpdateAsync([FromRoute] string id, [FromBody] UpdateEmployeeDto account)
     {
         if (id != account.Id)
         {

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

@@ -17,7 +17,7 @@ public OilMarksController(IOilMarkService oilMarkService)
     }
 
     [HttpGet]
-    public async Task<ActionResult<List<OilMarkDto>>> GetAsync(OilMarkQueryParameters queryParameters)
+    public async Task<ActionResult<List<OilMarkDto>>> GetAsync([FromQuery] OilMarkQueryParameters queryParameters)
     {
         var oilMarks = await _oilMarkService.GetAllAsync(queryParameters);
 

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DispatcherReviewsController.cs

@@ -20,9 +20,9 @@ public async Task<ActionResult<DispatcherReviewDto>> CreateAsync(
         [FromRoute] int dispatcherId,
         [FromBody] CreateDispatcherReviewDto review)
     {
-        if (review.ReviewerId != dispatcherId)
+        if (review.DispatcherId != dispatcherId)
         {
-            return BadRequest($"Route id: {dispatcherId} does not match with body id: {review.ReviewerId}.");
+            return BadRequest($"Route id: {dispatcherId} does not match with body id: {review.DispatcherId}.");
         }
 
         var createdReview = await _reviewService.CreateAsync(review);

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/DoctorReviewsController.cs

@@ -20,9 +20,9 @@ public async Task<ActionResult<DoctorReviewDto>> CreateReview(
         [FromRoute] int doctorId,
         [FromBody] CreateDoctorReviewDto review)
     {
-        if (doctorId != review.ReviewerId)
+        if (doctorId != review.DoctorId)
         {
-            return BadRequest($"Route id: {doctorId} does not match with body id: {review.ReviewerId}.");
+            return BadRequest($"Route id: {doctorId} does not match with body id: {review.DoctorId}.");
         }
 
         var craetedReview = await _reviewService.CreateAsync(review);

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/ManagerReviewsController.cs

@@ -0,0 +1,25 @@
+using CheckDrive.Application.DTOs.ManagerReview;
+using CheckDrive.Application.Interfaces.Review;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Api.Controllers.Reviews;
+
+[ApiController]
+[Route("api/reviews/managers/{managerId:int}")]
+public class ManagerReviewsController : ControllerBase
+{
+    private readonly IManagerReviewService _reviewService;
+
+    public ManagerReviewsController(IManagerReviewService reviewService)
+    {
+        _reviewService = reviewService;
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<ManagerReviewDto>> CreateReview([FromBody] CreateManagerReviewDto review)
+    {
+        var result = await _reviewService.CreateAsync(review);
+
+        return Created("", result);
+    }
+}

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicAcceptancesController.cs

@@ -20,9 +20,9 @@ public async Task<ActionResult<MechanicAcceptanceReviewDto>> CreateAcceptanceRev
         [FromRoute] int mechanicId,
         [FromBody] CreateMechanicAcceptanceReviewDto review)
     {
-        if (review.ReviewerId != mechanicId)
+        if (review.MechanicId != mechanicId)
         {
-            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.ReviewerId}.");
+            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.MechanicId}.");
         }
 
         var createdReview = await _reviewService.CreateAsync(review);

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/MechanicHandoversController.cs

@@ -20,9 +20,9 @@ public async Task<ActionResult<MechanicHandoverReviewDto>> CreateHandoverReviewA
         [FromRoute] int mechanicId,
         [FromBody] CreateMechanicHandoverReviewDto review)
     {
-        if (review.ReviewerId != mechanicId)
+        if (review.MechanicId != mechanicId)
         {
-            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.ReviewerId}.");
+            return BadRequest($"Route id: {mechanicId} does not match with body id: {review.MechanicId}.");
         }
 
         var createdReview = await _reviewService.CreateAsync(review);

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/OperatorReviewsController.cs

@@ -20,9 +20,9 @@ public async Task<ActionResult<OperatorReviewDto>> CreateAsync(
         [FromRoute] int operatorId,
         [FromBody] CreateOperatorReviewDto review)
     {
-        if (review.ReviewerId != operatorId)
+        if (review.OperatorId != operatorId)
         {
-            return BadRequest($"Route id: {operatorId} does not match with body id: {review.ReviewerId}.");
+            return BadRequest($"Route id: {operatorId} does not match with body id: {review.OperatorId}.");
         }
 
         var createdReview = await _reviewService.CreateAsync(review);

CheckDrive.Api/CheckDrive.Api/Controllers/Reviews/ReviewHistoriesController.cs

@@ -4,6 +4,7 @@
 using CheckDrive.Application.DTOs.OperatorReview;
 using CheckDrive.Application.DTOs.Review;
 using CheckDrive.Application.Interfaces.Review;
+using CheckDrive.Application.DTOs.DispatcherReview;
 
 namespace CheckDrive.Api.Controllers.Reviews;
 
@@ -43,10 +44,18 @@ public async Task<ActionResult<List<MechanicReviewHistoryDto>>> GetMechanicHisto
     }
 
     [HttpGet("operators/{operatorId:int}")]
-    public async Task<ActionResult<List<OperatorReviewDto>>> GetOperatorHistoriesAsync(int operatorId)
+    public async Task<ActionResult<List<OperatorReviewHistory>>> GetOperatorHistoriesAsync(int operatorId)
     {
         var reviews = await _historyService.GetOperatorHistoriesAsync(operatorId);
 
         return Ok(reviews);
     }
+
+    [HttpGet("dispatchers/{dispatcherId:int}")]
+    public async Task<ActionResult<List<DispatcherReviewHistoryDto>>> GetDispatcherHistoriesAsync(int dispatcherId)
+    {
+        var reviews = await _historyService.GetDispatcherHistoriesAsync(dispatcherId);
+
+        return Ok(reviews);
+    }
 }