cartaid/shopping-assistant-api
1
0
Fork 0
mirror of https://github.com/Shchoholiev/shopping-assistant-api.git synced 2025-04-05 00:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixed

Browse Source
This commit is contained in:
Mykyta Dubovyi 2023-11-07 19:37:12 +02:00
parent d3dd06fb58
commit 261bd276a8
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs
View File

@ -54,8 +54,8 @@ public class UserManager : ServiceBase, IUserManager
_logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}."); _logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}.");
var user = string.IsNullOrEmpty(login.Phone) var user = string.IsNullOrEmpty(login.Phone)
? await this._usersRepository.GetUserAsync(u => u.Email == login.Email, cancellationToken) ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email && u.IsDeleted == false, cancellationToken)
: await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone, cancellationToken); : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone && u.IsDeleted == false, cancellationToken);
if (user == null) if (user == null)
{ {
throw new EntityNotFoundException<User>(); throw new EntityNotFoundException<User>();
@ -79,11 +79,11 @@ public class UserManager : ServiceBase, IUserManager
{ {
_logger.LogInformation($"Logging in / Registering guest with guest id: {guest.GuestId}."); _logger.LogInformation($"Logging in / Registering guest with guest id: {guest.GuestId}.");
var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId, cancellationToken); var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId && x.IsDeleted == false, cancellationToken);
if (user == null) if (user == null)
{ {
var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest" && r.IsDeleted == false, cancellationToken);
user = new User user = new User
{ {
GuestId = guest.GuestId, GuestId = guest.GuestId,
@ -148,7 +148,7 @@ public class UserManager : ServiceBase, IUserManager
{ {
_logger.LogInformation($"Adding Role: {roleName} to User with Id: {userId}."); _logger.LogInformation($"Adding Role: {roleName} to User with Id: {userId}.");
var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken);
if (role == null) if (role == null)
{ {
throw new EntityNotFoundException<Role>(); throw new EntityNotFoundException<Role>();
@ -174,7 +174,7 @@ public class UserManager : ServiceBase, IUserManager
{ {
_logger.LogInformation($"Removing Role: {roleName} from User with Id: {userId}."); _logger.LogInformation($"Removing Role: {roleName} from User with Id: {userId}.");
var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken);
if (role == null) if (role == null)
{ {
throw new EntityNotFoundException<Role>(); throw new EntityNotFoundException<Role>();
@ -202,7 +202,7 @@ public class UserManager : ServiceBase, IUserManager
{ {
_logger.LogInformation($"Updating user with id: {GlobalUser.Id}."); _logger.LogInformation($"Updating user with id: {GlobalUser.Id}.");
var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id, cancellationToken); var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id && x.IsDeleted == false, cancellationToken);
if (user == null) if (user == null)
{ {
throw new EntityNotFoundException<User>(); throw new EntityNotFoundException<User>();
@ -310,11 +310,11 @@ public class UserManager : ServiceBase, IUserManager
private async Task CheckAndUpgradeToUserAsync(User user, CancellationToken cancellationToken) private async Task CheckAndUpgradeToUserAsync(User user, CancellationToken cancellationToken)
{ {
if (user.Roles.Any(x => x.Name == "Guest") && !user.Roles.Any(x => x.Name == "User")) if (user.Roles.Any(x => x.Name == "Guest" && x.IsDeleted == false) && !user.Roles.Any(x => x.Name == "User" && x.IsDeleted == false))
{ {
if (!string.IsNullOrEmpty(user.PasswordHash) && (!string.IsNullOrEmpty(user.Email) || !string.IsNullOrEmpty(user.Phone))) if (!string.IsNullOrEmpty(user.PasswordHash) && (!string.IsNullOrEmpty(user.Email) || !string.IsNullOrEmpty(user.Phone)))
{ {
var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User" && x.IsDeleted == false, cancellationToken);
user.Roles.Add(role); user.Roles.Add(role);
} }
} }
@ -326,7 +326,7 @@ public class UserManager : ServiceBase, IUserManager
{ {
ValidateEmail(userDto.Email); ValidateEmail(userDto.Email);
if (userDto.Email != user.Email if (userDto.Email != user.Email
&& await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email, cancellationToken)) && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email && x.IsDeleted == false, cancellationToken))
{ {
throw new EntityAlreadyExistsException<User>("email", userDto.Email); throw new EntityAlreadyExistsException<User>("email", userDto.Email);
} }
@ -336,7 +336,7 @@ public class UserManager : ServiceBase, IUserManager
{ {
ValidatePhone(userDto.Phone); ValidatePhone(userDto.Phone);
if (userDto.Phone != user.Phone if (userDto.Phone != user.Phone
&& await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone, cancellationToken)) && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone && x.IsDeleted == false, cancellationToken))
{ {
throw new EntityAlreadyExistsException<User>("phone", userDto.Phone); throw new EntityAlreadyExistsException<User>("phone", userDto.Phone);
} }

2
ShoppingAssistantApi.Infrastructure/Services/ProductService.cs
View File

@ -38,7 +38,7 @@ public class ProductService : IProductService
"\n[Products] - return semicolon separated product names"; "\n[Products] - return semicolon separated product names";
var countOfMessage = await _messagesRepository var countOfMessage = await _messagesRepository
.GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)) && message.IsDeleted == false, cancellationToken);
var previousMessages = await _wishlistsService var previousMessages = await _wishlistsService
.GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken);

2
ShoppingAssistantApi.Infrastructure/Services/RolesService.cs
View File

@ -24,7 +24,7 @@ public class RolesService : IRolesService
public async Task<RoleDto> AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken) public async Task<RoleDto> AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken)
{ {
var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name, cancellationToken); var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name && r.IsDeleted == false, cancellationToken);
if (role != null) if (role != null)
{ {
throw new EntityAlreadyExistsException<Role>(); throw new EntityAlreadyExistsException<Role>();

15
ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs
View File

@ -73,7 +73,8 @@ public class WishlistsService : IWishlistsService
var wishlist = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); var wishlist = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken);
var firstUserMessage = (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString(), cancellationToken)).First(); var firstUserMessage =
(await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString() && x.IsDeleted == false, cancellationToken)).First();
var chatCompletionRequest = new ChatCompletionRequest var chatCompletionRequest = new ChatCompletionRequest
{ {
@ -123,7 +124,7 @@ public class WishlistsService : IWishlistsService
public async Task<PagedList<WishlistDto>> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) public async Task<PagedList<WishlistDto>> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken)
{ {
var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id, cancellationToken); var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id && x.IsDeleted == false, cancellationToken);
var dtos = _mapper.Map<List<WishlistDto>>(entities); var dtos = _mapper.Map<List<WishlistDto>>(entities);
var count = await _wishlistsRepository.GetTotalCountAsync(); var count = await _wishlistsRepository.GetTotalCountAsync();
return new PagedList<WishlistDto>(dtos, pageNumber, pageSize, count); return new PagedList<WishlistDto>(dtos, pageNumber, pageSize, count);
@ -150,10 +151,10 @@ public class WishlistsService : IWishlistsService
await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); await TryGetPersonalWishlist(wishlistObjectId, cancellationToken);
var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken);
var dtos = _mapper.Map<List<MessageDto>>(entities); var dtos = _mapper.Map<List<MessageDto>>(entities);
var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken);
return new PagedList<MessageDto>(dtos, pageNumber, pageSize, count); return new PagedList<MessageDto>(dtos, pageNumber, pageSize, count);
} }
@ -186,10 +187,10 @@ public class WishlistsService : IWishlistsService
await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); await TryGetPersonalWishlist(wishlistObjectId, cancellationToken);
var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken);
var dtos = _mapper.Map<List<ProductDto>>(entities); var dtos = _mapper.Map<List<ProductDto>>(entities);
var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken);
return new PagedList<ProductDto>(dtos, pageNumber, pageSize, count); return new PagedList<ProductDto>(dtos, pageNumber, pageSize, count);
} }
@ -212,7 +213,7 @@ public class WishlistsService : IWishlistsService
private async Task<Wishlist> TryGetPersonalWishlist(ObjectId wishlistId, CancellationToken cancellationToken) private async Task<Wishlist> TryGetPersonalWishlist(ObjectId wishlistId, CancellationToken cancellationToken)
{ {
var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId, cancellationToken); var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId && x.IsDeleted == false, cancellationToken);
if (entity.CreatedById != GlobalUser.Id) if (entity.CreatedById != GlobalUser.Id)
{ {

10
ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs
View File

@ -41,9 +41,9 @@ public class DbInitialaizer
public async Task AddUsers(CancellationToken cancellationToken) public async Task AddUsers(CancellationToken cancellationToken)
{ {
var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User"))).FirstAsync(); var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User") && x.IsDeleted == false)).FirstAsync();
var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest"))).FirstAsync(); var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest") && x.IsDeleted == false)).FirstAsync();
var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin"))).FirstAsync(); var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin") && x.IsDeleted == false)).FirstAsync();
var users = new User[] var users = new User[]
{ {
@ -179,8 +179,8 @@ public class DbInitialaizer
public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) public async Task AddWishlistsWithMessages(CancellationToken cancellationToken)
{ {
var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com") && x.IsDeleted == false)).FirstAsync();
var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua"))).FirstAsync(); var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua") && x.IsDeleted == false)).FirstAsync();
var wishlists = new Wishlist[] var wishlists = new Wishlist[]
{ {

2
ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs
View File

@ -21,7 +21,7 @@ public abstract class BaseRepository<TEntity> : IBaseRepository<TEntity> where T
public async Task<TEntity> GetOneAsync(ObjectId id, CancellationToken cancellationToken) public async Task<TEntity> GetOneAsync(ObjectId id, CancellationToken cancellationToken)
{ {
return await this._collection.Find(x => x.Id == id).FirstOrDefaultAsync(cancellationToken); return await this._collection.Find(x => x.Id == id && x.IsDeleted == false).FirstOrDefaultAsync(cancellationToken);
} }
public async Task<TEntity> GetOneAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken) public async Task<TEntity> GetOneAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken)

2
ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs
View File

@ -13,7 +13,7 @@ public class RolesRepository : BaseRepository<Role>, IRolesRepository
public async Task<Role> GetRoleAsync(ObjectId id, CancellationToken cancellationToken) public async Task<Role> GetRoleAsync(ObjectId id, CancellationToken cancellationToken)
{ {
return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); return await (await this._collection.FindAsync(x => x.Id == id && x.IsDeleted == false)).FirstOrDefaultAsync(cancellationToken);
} }
public async Task<Role> GetRoleAsync(Expression<Func<Role, bool>> predicate, CancellationToken cancellationToken) public async Task<Role> GetRoleAsync(Expression<Func<Role, bool>> predicate, CancellationToken cancellationToken)

2
ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs
View File

@ -14,7 +14,7 @@ public class UsersRepository : BaseRepository<User>, IUsersRepository
public async Task<User> GetUserAsync(ObjectId id, CancellationToken cancellationToken) public async Task<User> GetUserAsync(ObjectId id, CancellationToken cancellationToken)
{ {
return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); return await (await this._collection.FindAsync(x => x.Id == id && x.IsDeleted == false)).FirstOrDefaultAsync(cancellationToken);
} }
public async Task<User> GetUserAsync(Expression<Func<User, bool>> predicate, CancellationToken cancellationToken) public async Task<User> GetUserAsync(Expression<Func<User, bool>> predicate, CancellationToken cancellationToken)