diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs index 7720477..7b9024f 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs @@ -54,8 +54,8 @@ public class UserManager : ServiceBase, IUserManager _logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}."); var user = string.IsNullOrEmpty(login.Phone) - ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email, cancellationToken) - : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone, cancellationToken); + ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email && u.IsDeleted == false, cancellationToken) + : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone && u.IsDeleted == false, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -79,11 +79,11 @@ public class UserManager : ServiceBase, IUserManager { _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) { - 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 { GuestId = guest.GuestId, @@ -148,7 +148,7 @@ public class UserManager : ServiceBase, IUserManager { _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) { throw new EntityNotFoundException(); @@ -174,7 +174,7 @@ public class UserManager : ServiceBase, IUserManager { _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) { throw new EntityNotFoundException(); @@ -202,7 +202,7 @@ public class UserManager : ServiceBase, IUserManager { _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) { throw new EntityNotFoundException(); @@ -310,11 +310,11 @@ public class UserManager : ServiceBase, IUserManager 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))) { - 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); } } @@ -326,7 +326,7 @@ public class UserManager : ServiceBase, IUserManager { ValidateEmail(userDto.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("email", userDto.Email); } @@ -336,7 +336,7 @@ public class UserManager : ServiceBase, IUserManager { ValidatePhone(userDto.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("phone", userDto.Phone); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 8c4d567..532e023 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -38,7 +38,7 @@ public class ProductService : IProductService "\n[Products] - return semicolon separated product names"; 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 .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); diff --git a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs index d30bc3b..31c664c 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs @@ -24,7 +24,7 @@ public class RolesService : IRolesService public async Task 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) { throw new EntityAlreadyExistsException(); diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index b6814bb..c1473de 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -73,7 +73,8 @@ public class WishlistsService : IWishlistsService 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 { @@ -123,7 +124,7 @@ public class WishlistsService : IWishlistsService public async Task> 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>(entities); var count = await _wishlistsRepository.GetTotalCountAsync(); return new PagedList(dtos, pageNumber, pageSize, count); @@ -150,10 +151,10 @@ public class WishlistsService : IWishlistsService 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>(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(dtos, pageNumber, pageSize, count); } @@ -186,10 +187,10 @@ public class WishlistsService : IWishlistsService 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>(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(dtos, pageNumber, pageSize, count); } @@ -212,7 +213,7 @@ public class WishlistsService : IWishlistsService private async Task 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) { diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 98425a6..0025134 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -41,9 +41,9 @@ public class DbInitialaizer public async Task AddUsers(CancellationToken cancellationToken) { - var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User"))).FirstAsync(); - var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest"))).FirstAsync(); - var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin"))).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") && x.IsDeleted == false)).FirstAsync(); + var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin") && x.IsDeleted == false)).FirstAsync(); var users = new User[] { @@ -179,8 +179,8 @@ public class DbInitialaizer public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) { - var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); - var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua"))).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") && x.IsDeleted == false)).FirstAsync(); var wishlists = new Wishlist[] { diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index 8a128ff..7e50eac 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -21,7 +21,7 @@ public abstract class BaseRepository : IBaseRepository where T public async Task 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 GetOneAsync(Expression> predicate, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs index 2c09d63..fae93c2 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs @@ -13,7 +13,7 @@ public class RolesRepository : BaseRepository, IRolesRepository public async Task 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 GetRoleAsync(Expression> predicate, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs index 39b4ab5..07a77f0 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs @@ -14,7 +14,7 @@ public class UsersRepository : BaseRepository, IUsersRepository public async Task 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 GetUserAsync(Expression> predicate, CancellationToken cancellationToken)