diff --git a/Data/Enums/DocumentTypeEnum.cs b/Data/Enums/DocumentTypeEnum.cs deleted file mode 100644 index c52cd02..0000000 --- a/Data/Enums/DocumentTypeEnum.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace HelloPets.Data.Enums; - -public enum DocumentTypeEnum -{ - Other, - Cpf, - Passport -} \ No newline at end of file diff --git a/Data/Repositories/UserRepository.cs b/Data/Repositories/UserRepository.cs index 771e147..1928896 100644 --- a/Data/Repositories/UserRepository.cs +++ b/Data/Repositories/UserRepository.cs @@ -33,26 +33,26 @@ await _context.Users.FirstOrDefaultAsync(x => x.PublicId == publicId public async Task IsRegistered(string email) => await _context.Users.AnyAsync(x => x.Email.ToLower() == email.ToLower() && x.IsActive); - public async Task CreateUserAsync(User tutor) + public async Task CreateUserAsync(User user) { - var newTutor = await _context.Users.AddAsync(tutor); + var newUser = await _context.Users.AddAsync(user); await _context.SaveChangesAsync(); - return newTutor.Entity; + return newUser.Entity; } - public async Task UpdateUserAsync(User tutor) + public async Task UpdateUserAsync(User user) { - tutor.UpdatedAt = DateTime.UtcNow; - var newTutor = _context.Users.Update(tutor); + user.UpdatedAt = DateTime.UtcNow; + var newUser = _context.Users.Update(user); await _context.SaveChangesAsync(); - return newTutor.Entity; + return newUser.Entity; } - public async Task DeleteUserAsync(User tutor) + public async Task DeleteUserAsync(User user) { - tutor.IsActive = false; - await UpdateUserAsync(tutor); + user.IsActive = false; + await UpdateUserAsync(user); } } \ No newline at end of file diff --git a/Services/ApplicationServices/Interfaces/ITokenService.cs b/Services/ApplicationServices/Interfaces/ITokenService.cs index 0ea59cf..6b56057 100644 --- a/Services/ApplicationServices/Interfaces/ITokenService.cs +++ b/Services/ApplicationServices/Interfaces/ITokenService.cs @@ -4,6 +4,6 @@ namespace HelloPets.Services.ApplicationServices.Interfaces; public interface ITokenService { - public string Generate(User tutor, TimeSpan periodo); + public string Generate(User user, TimeSpan timeSpan); public int GetUserIdFromToken(); } \ No newline at end of file diff --git a/Services/ApplicationServices/TokenService.cs b/Services/ApplicationServices/TokenService.cs index 4ce94af..e1eb017 100644 --- a/Services/ApplicationServices/TokenService.cs +++ b/Services/ApplicationServices/TokenService.cs @@ -48,13 +48,13 @@ public string Generate(User user, TimeSpan timeSpan) } } - private static IEnumerable GetClaims(User tutor) + private static IEnumerable GetClaims(User user) { return [ - new Claim("id", tutor.Id.ToString()), - new Claim(JwtRegisteredClaimNames.Name, tutor.Name), - new Claim(JwtRegisteredClaimNames.Email, tutor.Email), + new Claim("id", user.Id.ToString()), + new Claim(JwtRegisteredClaimNames.Name, user.Name), + new Claim(JwtRegisteredClaimNames.Email, user.Email), //Insere a data de criacao do token ao token new Claim(JwtRegisteredClaimNames.Iat, diff --git a/WebApi/Controllers/UsersController.cs b/WebApi/Controllers/UsersController.cs index 613f462..cee79e4 100644 --- a/WebApi/Controllers/UsersController.cs +++ b/WebApi/Controllers/UsersController.cs @@ -13,21 +13,21 @@ namespace HelloPets.WebApi.Controllers; public class UsersController : BaseController { private readonly IPasswordService _passwordService; - private readonly IUserRepository _tutorRepository; + private readonly IUserRepository _userRepository; public UsersController(ITokenService tokenService, IPasswordService passwordService, - IUserRepository tutorRepository) : base(tokenService) + IUserRepository userRepository) : base(tokenService) { _passwordService = passwordService; - _tutorRepository = tutorRepository; + _userRepository = userRepository; } [HttpPost] [AllowAnonymous] public async Task RegisterUser([FromBody] CreateUserViewModel userVM) { - if (await _tutorRepository.IsRegistered(userVM.Email)) + if (await _userRepository.IsRegistered(userVM.Email)) return BadRequest("Email já cadastrado"); if (userVM.Password.Trim() != userVM.PasswordVerification.Trim()) @@ -52,7 +52,7 @@ userVM.Document is not null && Salt = userVM.Salt, }; - await _tutorRepository.CreateUserAsync(user); + await _userRepository.CreateUserAsync(user); return Ok(new ReturnUserViewModel { @@ -68,7 +68,7 @@ userVM.Document is not null && [AllowAnonymous] public async Task UpdateUser([FromRoute] Guid publicId, [FromBody] PatchUserViewModel user) { - var existingUser = await _tutorRepository.GetUserByPublicIdAsync(publicId); + var existingUser = await _userRepository.GetUserByPublicIdAsync(publicId); if (existingUser == null) return BadRequest("Usuário não existe com Id informado."); @@ -85,7 +85,7 @@ public async Task UpdateUser([FromRoute] Guid publicId, [FromBody if (existingUser.FileId != user.ProfileImageId) existingUser.FileId = user.ProfileImageId; - await _tutorRepository.UpdateUserAsync(existingUser); + await _userRepository.UpdateUserAsync(existingUser); return NoContent(); } @@ -94,7 +94,7 @@ public async Task UpdateUser([FromRoute] Guid publicId, [FromBody [HttpDelete("{publicId}")] public async Task DeleteUser([FromRoute] Guid publicId, [FromBody] DeleteUserViewModel userVM) { - var user = await _tutorRepository.GetUserByPublicIdAsync(publicId); + var user = await _userRepository.GetUserByPublicIdAsync(publicId); if (user is null) return BadRequest("Usuário não existente."); @@ -102,7 +102,7 @@ public async Task DeleteUser([FromRoute] Guid publicId, [FromBody if (user.Id != userVM.Id) return BadRequest("ID do usuário diferente do fornecido."); - await _tutorRepository.DeleteUserAsync(user); + await _userRepository.DeleteUserAsync(user); return NoContent(); }