Conversation
|
|
||
| [HttpGet("{id}")] | ||
| [AuthorizeRole(Role.User, Role.Admin)] | ||
| public ActionResult<TicketModel> GetTicketById(int id) |
There was a problem hiding this comment.
при каких обстоятельствах у тебя не сработает if на 69 строке?
| if (user.Persons.Contains(entity.Person)) | ||
| if (user.Role == Role.Admin) | ||
| _ticketRepository.Update(entity, true); | ||
| else if(user.Persons.Contains(entity.Person)) |
There was a problem hiding this comment.
это в один if замечательно схловывается
| CheckUserRole(userId, Role.Admin); | ||
| var entity = _ticketRepository.GetById(id); | ||
| ThrowIfEntityNotFound(entity, id); | ||
| _ticketRepository.Update(entity, false); |
There was a problem hiding this comment.
ThrowIfEntityNotFound в базовом сервисе(BaseService) есть, посмотри
| .Returns(ticketsFiltredByIsDeletedProp); | ||
| _userRepositoryMock.Setup(x => x.GetById(userId)).Returns(new User() { Role = Role.Admin}); | ||
|
|
||
| expectedTicketModels = expectedTicketModels.Where(o => !o.IsDeleted || allIncluded).ToList(); |
There was a problem hiding this comment.
это подготовка данных, они должны готовятся в TicketServiceTestCaseSource
| public void GetListTest(List<Ticket> tickets, List<TicketModel> expectedTicketModels, bool allIncluded, int userId) | ||
| { | ||
| // given | ||
| var ticketsFiltredByIsDeletedProp = tickets.Where(o => !o.IsDeleted || allIncluded).ToList(); |
There was a problem hiding this comment.
в TicketServiceTestCaseSource должно быть
| public void GetByIdNegativeAuthorizationExceptionTest(Role role, int userId) | ||
| { | ||
| //given | ||
| _userRepositoryMock.Setup(x => x.GetById(It.IsAny<int>())).Returns(new User() { Role = role, Id = userId}); |
There was a problem hiding this comment.
тут достаточно только Role, Id не обязателен
| _userRepositoryMock.Verify(s => s.GetById(userId), Times.Exactly(2)); | ||
| _ticketRepositoryMock.Verify(s => s.GetById(5), Times.Once); | ||
| _ticketRepositoryMock.Verify(s => s.Update(ticket, true), Times.Once); | ||
| } |
There was a problem hiding this comment.
на Restore негативные есть, а на Delete где?
|
|
||
|
|
||
| // when then | ||
| // then |
There was a problem hiding this comment.
удали лишнюю строчку (ко всем негативным)
| _userRepositoryMock.Setup(x => x.GetList(false)).Returns(usersFiltredByIsDeletedProp); | ||
| _userRepositoryMock.Setup(x => x.GetById(userId)).Returns(entities[0]); | ||
|
|
||
| List<UserModel> expectedFiltredByIsDeletedProp = expected.Where(o => !o.IsDeleted).ToList(); |
There was a problem hiding this comment.
в UserServiceTestCaseSource
| _userRepositoryMock.Setup(x => x.GetList(true)).Returns(usersFiltredByIsDeletedProp); | ||
| _userRepositoryMock.Setup(x => x.GetById(userId)).Returns(entities[0]); | ||
|
|
||
| List<UserModel> expectedFiltredByIsDeletedProp = expected.Where(o => o.IsDeleted).ToList(); |
There was a problem hiding this comment.
в UserServiceTestCaseSource

No description provided.