Update/borrow

src/Api/ConfigureServices.cs

@@ -14,6 +14,7 @@ public static IServiceCollection AddApiServices(this IServiceCollection services
  {
  // Register services
  services.AddServices();
+ services.AddHostedService<ExpiryPermissionService>();
 
  services.AddControllers(opt =>
  opt.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer())));

src/Api/Controllers/BorrowsController.cs

@@ -1,15 +1,19 @@
+using Api.Controllers.Payload.Requests;
 using Api.Controllers.Payload.Requests.Borrows;
 using Application.Borrows.Commands;
 using Application.Borrows.Queries;
+using Application.Common.Extensions;
 using Application.Common.Interfaces;
 using Application.Common.Models;
+using Application.Common.Models.Dtos.Logging;
 using Application.Common.Models.Dtos.Physical;
 using Application.Identity;
 using Infrastructure.Identity.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Api.Controllers;
 
+[Route("api/v1/documents/[controller]")]
 public class BorrowsController : ApiControllerBase
 {
  private readonly ICurrentUserService _currentUserService;
@@ -28,7 +32,8 @@ public BorrowsController(ICurrentUserService currentUserService)
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> BorrowDocument([FromBody] BorrowDocumentRequest request)
+ public async Task<ActionResult<Result<BorrowDto>>> BorrowDocument(
+ [FromBody] BorrowDocumentRequest request)
  {
  var borrowerId = _currentUserService.GetCurrentUser().Id;
  var command = new BorrowDocument.Command()
@@ -37,7 +42,7 @@ public async Task<ActionResult<Result<BorrowDto>>> BorrowDocument([FromBody] Bor
  DocumentId = request.DocumentId,
  BorrowFrom = request.BorrowFrom,
  BorrowTo = request.BorrowTo,
-Reason = request.Reason,
+BorrowReason = request.Reason,
  };
  var result = await Mediator.Send(command);
  return Ok(Result<BorrowDto>.Succeed(result));
@@ -53,7 +58,8 @@ public async Task<ActionResult<Result<BorrowDto>>> BorrowDocument([FromBody] Bor
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> GetById([FromRoute] Guid borrowId)
+ public async Task<ActionResult<Result<BorrowDto>>> GetById(
+ [FromRoute] Guid borrowId)
  {
  var user = _currentUserService.GetCurrentUser();
  var command = new GetBorrowRequestById.Query()
@@ -65,47 +71,25 @@ public async Task<ActionResult<Result<BorrowDto>>> GetById([FromRoute] Guid borr
  return Ok(Result<BorrowDto>.Succeed(result));
  }
 
- [RequiresRole(IdentityData.Roles.Staff)]
- [HttpGet("staffs")]
- [ProducesResponseType(StatusCodes.Status200OK)]
- [ProducesResponseType(StatusCodes.Status403Forbidden)]
- [ProducesResponseType(StatusCodes.Status404NotFound)]
- [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequestsAsStaffPaginated(
- [FromQuery] GetAllBorrowRequestsPaginatedAsStaffQueryParameters queryParameters)
- {
- var departmentId = _currentUserService.GetCurrentDepartmentForStaff();
- var command = new GetAllBorrowRequestsPaginated.Query()
- {
- DepartmentId = departmentId,
- EmployeeId = queryParameters.EmployeeId,
- DocumentId = queryParameters.DocumentId,
- Page = queryParameters.Page,
- Size = queryParameters.Size,
- SortBy = queryParameters.SortBy,
- SortOrder = queryParameters.SortOrder,
- };
- var result = await Mediator.Send(command);
- return Ok(Result<PaginatedList<BorrowDto>>.Succeed(result));
- }
-
  /// <summary>
- /// Get all borrow requests as admin paginated
+ ///
  /// </summary>
  /// <param name="queryParameters"></param>
  /// <returns></returns>
- [RequiresRole(IdentityData.Roles.Admin)]
+ [RequiresRole(IdentityData.Roles.Admin, IdentityData.Roles.Staff, IdentityData.Roles.Employee)]
  [HttpGet]
  [ProducesResponseType(StatusCodes.Status200OK)]
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequestsAsAdminPaginated(
- [FromQuery] GetAllBorrowRequestsPaginatedAsAdminQueryParameters queryParameters)
+ public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequestsPaginated(
+ [FromQuery] GetAllBorrowRequestsPaginatedQueryParameters queryParameters)
  {
+ var currentUser = _currentUserService.GetCurrentUser();
  var command = new GetAllBorrowRequestsPaginated.Query()
  {
- DepartmentId = queryParameters.DepartmentId,
+ CurrentUser = currentUser,
+ RoomId = queryParameters.RoomId,
  EmployeeId = queryParameters.EmployeeId,
  DocumentId = queryParameters.DocumentId,
  Page = queryParameters.Page,
@@ -118,99 +102,28 @@ public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequests
  }
 
  /// <summary>
- /// Get all borrow requests as employee paginated
- /// </summary>
- /// <param name="queryParameters"></param>
- /// <returns></returns>
- [RequiresRole(IdentityData.Roles.Employee)]
- [HttpGet("employees")]
- [ProducesResponseType(StatusCodes.Status200OK)]
- [ProducesResponseType(StatusCodes.Status403Forbidden)]
- [ProducesResponseType(StatusCodes.Status404NotFound)]
- [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequestsAsEmployeePaginated(
- [FromQuery] GetAllBorrowRequestsPaginatedAsEmployeeQueryParameters queryParameters)
- {
- var userId = _currentUserService.GetCurrentUser().Id;
- var command = new GetAllBorrowRequestsPaginated.Query()
- {
- EmployeeId = userId,
- DocumentId = queryParameters.DocumentId,
- Page = queryParameters.Page,
- Size = queryParameters.Size,
- SortBy = queryParameters.SortBy,
- SortOrder = queryParameters.SortOrder,
- };
- var result = await Mediator.Send(command);
- return Ok(Result<PaginatedList<BorrowDto>>.Succeed(result));
- }
-
- /// <summary>
- /// Get all borrow requests for a document paginated
- /// </summary>
- /// <param name="documentId"></param>
- /// <param name="queryParameters"></param>
- /// <returns></returns>
- [RequiresRole(IdentityData.Roles.Admin, IdentityData.Roles.Staff)]
- [HttpGet("documents/{documentId:guid}")]
- [ProducesResponseType(StatusCodes.Status200OK)]
- [ProducesResponseType(StatusCodes.Status403Forbidden)]
- [ProducesResponseType(StatusCodes.Status404NotFound)]
- [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<PaginatedList<BorrowDto>>>> GetAllRequestsForDocumentPaginated(
- [FromRoute] Guid documentId,
- [FromQuery] GetAllBorrowRequestsPaginatedForDocumentQueryParameters queryParameters)
- {
- var command = new GetAllBorrowRequestsPaginated.Query()
- {
- DocumentId = documentId,
- Page = queryParameters.Page,
- Size = queryParameters.Size,
- SortBy = queryParameters.SortBy,
- SortOrder = queryParameters.SortOrder,
- Status = queryParameters.Status,
- };
- var result = await Mediator.Send(command);
- return Ok(Result<PaginatedList<BorrowDto>>.Succeed(result));
- }
-
- /// <summary>
- /// Approve a borrow request
+ /// Approve or Reject a borrow request
  /// </summary>
  /// <param name="borrowId">Id of the borrow request to be approved</param>
+ /// <param name="request"></param>
  /// <returns>A BorrowDto of the approved borrow request</returns>
  [RequiresRole(IdentityData.Roles.Staff)]
- [HttpPost("approve/{borrowId:guid}")]
+ [HttpPut("staffs/{borrowId:guid}")]
  [ProducesResponseType(StatusCodes.Status200OK)]
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> ApproveRequest([FromRoute] Guid borrowId)
- {
- var command = new ApproveBorrowRequest.Command()
- {
- BorrowId = borrowId,
- };
- var result = await Mediator.Send(command);
- return Ok(Result<BorrowDto>.Succeed(result));
- }
-
- /// <summary>
- /// Reject a borrow request
- /// </summary>
- /// <param name="borrowId">Id of the borrow request to be rejected</param>
- /// <returns>A BorrowDto of the rejected borrow request</returns>
- [RequiresRole(IdentityData.Roles.Staff)]
- [HttpPost("reject/{borrowId:guid}")]
- [ProducesResponseType(StatusCodes.Status200OK)]
- [ProducesResponseType(StatusCodes.Status403Forbidden)]
- [ProducesResponseType(StatusCodes.Status404NotFound)]
- [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> RejectRequest([FromRoute] Guid borrowId)
+ public async Task<ActionResult<Result<BorrowDto>>> ApproveOrRejectRequest(
+ [FromRoute] Guid borrowId,
+ [FromBody] ApproveOrRejectBorrowRequestRequest request)
  {
- var command = new RejectBorrowRequest.Command()
+ var performingUserId = _currentUserService.GetId();
+ var command = new ApproveOrRejectBorrowRequest.Command()
  {
+ CurrentUserId = performingUserId,
  BorrowId = borrowId,
+ StaffReason = request.StaffReason,
+ Decision = request.Decision
  };
  var result = await Mediator.Send(command);
  return Ok(Result<BorrowDto>.Succeed(result));
@@ -227,10 +140,13 @@ public async Task<ActionResult<Result<BorrowDto>>> RejectRequest([FromRoute] Gui
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> Checkout([FromRoute] Guid borrowId)
+ public async Task<ActionResult<Result<BorrowDto>>> Checkout(
+ [FromRoute] Guid borrowId)
  {
+ var currentStaff = _currentUserService.GetCurrentUser();
  var command = new CheckoutDocument.Command()
  {
+ CurrentStaff = currentStaff,
  BorrowId = borrowId,
  };
  var result = await Mediator.Send(command);
@@ -248,10 +164,13 @@ public async Task<ActionResult<Result<BorrowDto>>> Checkout([FromRoute] Guid bor
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> Return([FromRoute] Guid documentId)
+ public async Task<ActionResult<Result<BorrowDto>>> Return(
+ [FromRoute] Guid documentId)
  {
+ var currentUser = _currentUserService.GetCurrentUser();
  var command = new ReturnDocument.Command()
  {
+ CurrentUser = currentUser,
  DocumentId = documentId,
  };
  var result = await Mediator.Send(command);
@@ -274,12 +193,14 @@ public async Task<ActionResult<Result<BorrowDto>>> Update(
  [FromRoute] Guid borrowId,
  [FromBody] UpdateBorrowRequest request)
  {
+ var currentUser = _currentUserService.GetCurrentUser();
  var command = new UpdateBorrow.Command()
  {
+ CurrentUser = currentUser,
  BorrowId = borrowId,
  BorrowFrom = request.BorrowFrom,
  BorrowTo = request.BorrowTo,
-Reason = request.Reason,
+BorrowReason = request.Reason,
  };
  var result = await Mediator.Send(command);
  return Ok(Result<BorrowDto>.Succeed(result));
@@ -296,13 +217,38 @@ public async Task<ActionResult<Result<BorrowDto>>> Update(
  [ProducesResponseType(StatusCodes.Status403Forbidden)]
  [ProducesResponseType(StatusCodes.Status404NotFound)]
  [ProducesResponseType(StatusCodes.Status409Conflict)]
- public async Task<ActionResult<Result<BorrowDto>>> Cancel([FromRoute] Guid borrowId)
+ public async Task<ActionResult<Result<BorrowDto>>> Cancel(
+ [FromRoute] Guid borrowId)
  {
+ var currentUserId = _currentUserService.GetId();
  var command = new CancelBorrowRequest.Command()
  {
+ CurrentUserId = currentUserId,
  BorrowId = borrowId,
  };
  var result = await Mediator.Send(command);
  return Ok(Result<BorrowDto>.Succeed(result));
  }
+
+ /// <summary>
+ /// Get all logs related to requests.
+ /// </summary>
+ /// <param name="queryParameters">Query parameters</param>
+ /// <returns>A list of RequestLogsDtos.</returns>
+ [RequiresRole(IdentityData.Roles.Admin)]
+ [HttpGet("logs")]
+ [ProducesResponseType(StatusCodes.Status200OK)]
+ [ProducesResponseType(StatusCodes.Status403Forbidden)]
+ public async Task<ActionResult<Result<PaginatedList<RequestLogDto>>>> GetAllRequestLogs(
+ [FromQuery] GetAllLogsPaginatedQueryParameters queryParameters)
+ {
+ var query = new GetAllRequestLogsPaginated.Query()
+ {
+ SearchTerm = queryParameters.SearchTerm,
+ Page = queryParameters.Page,
+ Size = queryParameters.Size,
+ };
+ var result = await Mediator.Send(query);
+ return Ok(Result<PaginatedList<RequestLogDto>>.Succeed(result)); 
+ }
 }