Skip to content

fix: admin can see borrow request by id#380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChienNQuang merged 2 commits into from
Jul 12, 2023
Merged

fix: admin can see borrow request by id #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5666e4
fix: admin can see borrow request by id
vzart Jul 12, 2023
ea0013f
la la la la
vzart Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Api/Controllers/BorrowsController.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public async Task<ActionResult<Result<BorrowDto>>> BorrowDocument(
/// Get a borrow request by id
/// </summary>
/// <returns>A BorrowDto of the retrieved borrow</returns>
[RequiresRole(IdentityData.Roles.Staff, IdentityData.Roles.Employee)]
[RequiresRole(IdentityData.Roles.Admin ,IdentityData.Roles.Staff, IdentityData.Roles.Employee)]
[HttpGet("{borrowId:guid}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
Expand Down
32 changes: 30 additions & 2 deletions src/Application/Borrows/Queries/GetBorrowRequestById.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
using Application.Common.Exceptions;
using Application.Common.Extensions;
using Application.Common.Interfaces;
using Application.Common.Models.Dtos;
using Application.Common.Models.Dtos.Physical;
Expand DownExpand Up@@ -34,20 +35,47 @@ public async Task<BorrowDto> Handle(Query request, CancellationToken cancellatio
.Include(x => x.Borrower)
.Include(x => x.Document)
.ThenInclude(y => y.Department)
.Include(x => x.Document)
.ThenInclude(x => x.Folder)
.ThenInclude(x => x.Locker)
.ThenInclude(x => x.Room)
.FirstOrDefaultAsync(x => x.Id == request.BorrowId, cancellationToken);

if (borrow is null)
{
throw new KeyNotFoundException("Borrow request does not exist.");
}

if (!request.User.Role.Equals(IdentityData.Roles.Employee))
if (request.User.Role.IsAdmin())
{
return _mapper.Map<BorrowDto>(borrow);
}

if (request.User.Role.IsStaff())
{
var staff = _context.Staffs
.Include(x => x.Room)
.FirstOrDefault(x => x.Id == request.User.Id);
if (staff is null)
{
throw new KeyNotFoundException("Staff does not exist.");
}

if (staff.Room is null)
{
throw new ConflictException("Staff does not manage a room.");
}

if (staff.Room.Id != borrow.Document.Folder!.Locker.Room.Id )
{
throw new UnauthorizedAccessException("User can not access this resource.");
}

return _mapper.Map<BorrowDto>(borrow);
}

return borrow.Borrower.Id != request.User.Id
? throw new UnauthorizedAccessException()
? throw new UnauthorizedAccessException("User can not access this resource")
: _mapper.Map<BorrowDto>(borrow);
}
}
Expand Down