From e9c3b57fc4e95efad1903fb75071e8dca37e6e2e Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 12 Oct 2023 20:55:34 +0300 Subject: [PATCH 01/18] added product entity and initial data for it --- .../Entities/Product.cs | 19 ++++++++ .../PersistanceExtentions/DbInitialaizer.cs | 45 +++++++++++++++++++ .../Repositories/ProductsRepository.cs | 9 ++++ 3 files changed, 73 insertions(+) create mode 100644 ShoppingAssistantApi.Domain/Entities/Product.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/ProductsRepository.cs diff --git a/ShoppingAssistantApi.Domain/Entities/Product.cs b/ShoppingAssistantApi.Domain/Entities/Product.cs new file mode 100644 index 0000000..c581196 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/Product.cs @@ -0,0 +1,19 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class Product : EntityBase +{ + public ObjectId WishlistId { get; set; } + + public string? Url { get; set; } + + public string? Name { get; set; } + + public string? Description { get; set; } + + public double Rating { get; set; } + + public string[]? ImagesUrls { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index a63c8f7..651e374 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -23,9 +23,13 @@ public class DbInitialaizer private readonly ITokensService _tokensService; + private readonly IWishlistsService _wishlistsService; + private readonly IMongoCollection _userCollection; private readonly IMongoCollection _wishlistCollection; + + private readonly IMongoCollection _productCollection; public IEnumerable Roles { get; set; } @@ -35,8 +39,10 @@ public class DbInitialaizer _rolesService = serviceProvider.GetService(); _userManager = serviceProvider.GetService(); _tokensService = serviceProvider.GetService(); + _wishlistsService = serviceProvider.GetService(); _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); + _productCollection = serviceProvider.GetService().Db.GetCollection("Product"); } public async Task InitialaizeDb(CancellationToken cancellationToken) @@ -213,4 +219,43 @@ public class DbInitialaizer await _wishlistCollection.InsertManyAsync(wishlists); } + + public async Task AddProducts(CancellationToken cancellationToken) + { + var wishList1 = await _wishlistCollection.FindAsync(w => w.Name == "Gaming PC"); + var wishList2 = await _wishlistCollection.FindAsync(w => w.Name == "Generic Wishlist Name"); + + var products = new Product[] + { + new Product() + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Url = "url", + Name = "Thermaltake Glacier", + Description = "Something", + Rating = 4.1, + ImagesUrls = new string[] + { + "url1", + "url2" + } + }, + + new Product() + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Url = "url", + Name = "Mac", + Description = "very very cool laptop", + Rating = 4.9, + ImagesUrls = new string[] + { + "url1", + "url2" + } + } + + }; + + } } diff --git a/ShoppingAssistantApi.Persistance/Repositories/ProductsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/ProductsRepository.cs new file mode 100644 index 0000000..5de13b9 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/ProductsRepository.cs @@ -0,0 +1,9 @@ +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class ProductsRepository : BaseRepository +{ + public ProductsRepository(MongoDbContext db) : base(db, "Products") { } +} \ No newline at end of file From 59780361646ebbe40f02bd14aba3174852f24635 Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 01:12:39 +0000 Subject: [PATCH 02/18] SA-29 Added solution explorer to extensions --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0e6d68c..10b6f03 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,7 +20,8 @@ "kreativ-software.csharpextensions", "ms-dotnettools.csharp", "patcx.vscode-nuget-gallery", - "mhutchie.git-graph" + "mhutchie.git-graph", + "fernandoescolar.vscode-solution-explorer" ] } } From 9b0410fb1f55da0b956239349a3e1afed9cfa761 Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 01:14:46 +0000 Subject: [PATCH 03/18] SA-29 added OpenAiService --- .../Services/OpenAiService.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs diff --git a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs new file mode 100644 index 0000000..097100e --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class OpenAiService +{ + +} From bdc3e658cc27aa8221d522650fb6feb6d8617cdd Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 02:12:25 +0000 Subject: [PATCH 04/18] SA-29 added models and interface --- .../IServices/IOpenAiService.cs | 13 ++++++++++ .../Models/OpenAi/ChatCompletionRequest.cs | 14 +++++++++++ .../Models/OpenAi/OpenAiMessage.cs | 10 ++++++++ .../Enums/OpenAiRole.cs | 8 ++++++ .../Services/OpenAiService.cs | 25 ++++++++++++++----- 5 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 ShoppingAssistantApi.Application/IServices/IOpenAiService.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs create mode 100644 ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs diff --git a/ShoppingAssistantApi.Application/IServices/IOpenAiService.cs b/ShoppingAssistantApi.Application/IServices/IOpenAiService.cs new file mode 100644 index 0000000..df56a10 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/IOpenAiService.cs @@ -0,0 +1,13 @@ +using ShoppingAssistantApi.Application.Models.OpenAi; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IOpenAiService +{ + Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken); + + /// + /// Retrieves a stream of tokens (pieces of words) based on provided chat. + /// + IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken); +} diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs new file mode 100644 index 0000000..d2ad66b --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs @@ -0,0 +1,14 @@ +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class ChatCompletionRequest +{ + public string Model { get; set; } = "gpt-3.5-turbo"; + + public List Messages { get; set; } + + public double Temperature { get; set; } = 0.7; + + public int MaxTokens { get; set; } = 256; + + public bool Stream { get; set; } = false; +} diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs new file mode 100644 index 0000000..91bd757 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Domain.Enums; + +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class OpenAiMessage +{ + public OpenAiRole Role { get; set; } + + public string Content { get; set; } +} diff --git a/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs b/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs new file mode 100644 index 0000000..54d2c0a --- /dev/null +++ b/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Domain.Enums; + +public enum OpenAiRole +{ + System, + User, + Assistant +} diff --git a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs index 097100e..9ed750a 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs @@ -1,11 +1,24 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.OpenAi; namespace ShoppingAssistantApi.Infrastructure.Services; -public class OpenAiService +public class OpenAiService : IOpenAiService { - + private readonly HttpClient _httpClient; + + public OpenAiService(HttpClient client) + { + _httpClient = client; + } + + public Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) + { + throw new NotImplementedException(); + } + + public IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) + { + throw new NotImplementedException(); + } } From 236153d486dac24b31bc34fce3f9841e931aba66 Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 02:13:50 +0000 Subject: [PATCH 05/18] SA-29 added Unit test for OpenAiService --- .devcontainer/devcontainer.json | 3 +- .vscode/settings.json | 3 + .../GlobalUsings.cs | 1 + .../OpenAiServiceTests.cs | 86 +++++++++++++++++++ .../ShoppingAssistantApi.UnitTests.csproj | 31 +++++++ ShoppingAssistantApi.sln | 6 ++ 6 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json create mode 100644 ShoppingAssistantApi.UnitTests/GlobalUsings.cs create mode 100644 ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs create mode 100644 ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 10b6f03..3075303 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -21,7 +21,8 @@ "ms-dotnettools.csharp", "patcx.vscode-nuget-gallery", "mhutchie.git-graph", - "fernandoescolar.vscode-solution-explorer" + "fernandoescolar.vscode-solution-explorer", + "formulahendry.dotnet-test-explorer" ] } } diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cf3a569 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.formatOnType": true +} \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/GlobalUsings.cs b/ShoppingAssistantApi.UnitTests/GlobalUsings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/ShoppingAssistantApi.UnitTests/GlobalUsings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs new file mode 100644 index 0000000..7ec9de8 --- /dev/null +++ b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs @@ -0,0 +1,86 @@ +using System.Net; +using Moq; +using Moq.Protected; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Infrastructure.Services; + +namespace ShoppingAssistantApi.UnitTests; + +public class OpenAiServiceTests +{ + private readonly IOpenAiService _openAiService; + + private readonly Mock _mockHttpMessageHandler; + + private readonly HttpClient _httpClient; + + public OpenAiServiceTests() + { + // Mock any dependencies + _mockHttpMessageHandler = new Mock(); + _httpClient = new HttpClient(_mockHttpMessageHandler.Object); + _openAiService = new OpenAiService(_httpClient); + } + + [Fact] + public async Task GetChatCompletion_ValidChat_ReturnsNewMessage() + { + // Arrange + _mockHttpMessageHandler + .Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny() + ) + .ReturnsAsync(new HttpResponseMessage + { + StatusCode = HttpStatusCode.OK, + Content = new StringContent(@" + { + ""id"": ""chatcmpl-89OMdgTZXOLAXv7bPUJ4SwrPpS5Md"", + ""object"": ""chat.completion"", + ""created"": 1697249299, + ""model"": ""gpt-3.5-turbo-0613"", + ""choices"": [ + { + ""index"": 0, + ""message"": { + ""role"": ""assistant"", + ""content"": ""Hello World!"" + }, + ""finish_reason"": ""stop"" + } + ], + ""usage"": { + ""prompt_tokens"": 10, + ""completion_tokens"": 3, + ""total_tokens"": 13 + } + }"), + }); + + var chat = new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "Return Hello World!" + } + } + }; + + // Act + var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None); + + // Assert + Assert.NotNull(newMessage); + Assert.Equal("Hello, World!", newMessage.Content); + } + + // TODO: Add more tests +} \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj new file mode 100644 index 0000000..9274a65 --- /dev/null +++ b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj @@ -0,0 +1,31 @@ + + + + net7.0 + enable + enable + + false + true + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/ShoppingAssistantApi.sln b/ShoppingAssistantApi.sln index fb54417..f2f2788 100644 --- a/ShoppingAssistantApi.sln +++ b/ShoppingAssistantApi.sln @@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Api", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShoppingAssistantApi.Tests", "ShoppingAssistantApi.Tests\ShoppingAssistantApi.Tests.csproj", "{297B5378-79D7-406C-80A5-151C6B3EA147}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShoppingAssistantApi.UnitTests", "ShoppingAssistantApi.UnitTests\ShoppingAssistantApi.UnitTests.csproj", "{B4EFE8F1-89F5-44E4-BD0A-4F63D09C8E6F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,6 +47,10 @@ Global {297B5378-79D7-406C-80A5-151C6B3EA147}.Debug|Any CPU.Build.0 = Debug|Any CPU {297B5378-79D7-406C-80A5-151C6B3EA147}.Release|Any CPU.ActiveCfg = Release|Any CPU {297B5378-79D7-406C-80A5-151C6B3EA147}.Release|Any CPU.Build.0 = Release|Any CPU + {B4EFE8F1-89F5-44E4-BD0A-4F63D09C8E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4EFE8F1-89F5-44E4-BD0A-4F63D09C8E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4EFE8F1-89F5-44E4-BD0A-4F63D09C8E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4EFE8F1-89F5-44E4-BD0A-4F63D09C8E6F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From e26177528b38c6386601ecba241672b4ead80677 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 14 Oct 2023 20:05:02 +0300 Subject: [PATCH 06/18] add ability to delete wishlist --- .../Mutations/WishlistsMutation.cs | 4 + .../IServices/IWishlistService.cs | 2 + .../Services/WishlistsService.cs | 49 ++++++++--- .../Tests/WishlistsTests.cs | 85 +++++++++++++++++-- 4 files changed, 118 insertions(+), 22 deletions(-) diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs index 9c195fb..3bd1d7c 100644 --- a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -14,4 +14,8 @@ public class WishlistsMutation public Task AddMessageToPersonalWishlist(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); + + public Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.DeletePersonalWishlistAsync(wishlistId, cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index 5bfae6a..41081c6 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -13,4 +13,6 @@ public interface IWishlistsService Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); + + Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 7e1fc40..a5166f2 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -67,12 +67,7 @@ public class WishlistsService : IWishlistsService newMessage.CreatedById = (ObjectId) GlobalUser.Id; newMessage.CreatedDateUtc = DateTime.UtcNow; - var relatedWishlist = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistObjectId && x.CreatedById == GlobalUser.Id, cancellationToken); - - if (relatedWishlist == null) - { - throw new UnAuthorizedException(); - } + await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); var createdMessage = await _messagesRepository.AddAsync(newMessage, cancellationToken); @@ -93,15 +88,43 @@ public class WishlistsService : IWishlistsService { throw new InvalidDataException("Provided id is invalid."); } - var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistObjectId && x.CreatedById == GlobalUser.Id, cancellationToken); - Console.WriteLine(" WISHLIST: " + entity.CreatedById + " " + GlobalUser.Id); - - if (entity == null) - { - throw new UnAuthorizedException(); - } + var entity = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); return _mapper.Map(entity); } + + public async Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var entity = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); + + entity.LastModifiedById = GlobalUser.Id; + entity.LastModifiedDateUtc = DateTime.UtcNow; + + await _wishlistsRepository.DeleteAsync(entity, cancellationToken); + + return _mapper.Map(entity); + } + + private async Task TryGetPersonalWishlist(ObjectId wishlistId, CancellationToken cancellationToken) + { + var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId, cancellationToken); + + if (entity.CreatedById != GlobalUser.Id) + { + throw new UnAuthorizedException(); + } + + if (entity == null) + { + throw new EntityNotFoundException(); + } + + return entity; + } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index d153a33..93f37f8 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -17,7 +17,15 @@ public class WishlistsTests : IClassFixture> private const string WISHLIST_TESTING_USER_PASSWORD = "Yuiop12345"; - private const string TESTING_WISHLIST_ID = "ab79cde6f69abcd3efab65cd"; + private const string WISHLIST_TESTING_VALID_WISHLIST_ID = "ab79cde6f69abcd3efab65cd"; + + private const string WISHLIST_TESTING_VALID_WISHLIST_NAME = "Gaming PC"; + + private const WishlistTypes WISHLIST_TESTING_VALID_WISHLIST_TYPE = WishlistTypes.Product; + + private const string WISHLIST_TESTING_INVALID_WISHLIST_ID = "1234567890abcdef12345678"; + + private const string WISHLIST_TESTING_OTHER_USER_WISHLIST_ID = "ab6c2c2d9edf39abcd1ef9ab"; public WishlistsTests(TestingFactory factory) { @@ -111,7 +119,7 @@ public class WishlistsTests : IClassFixture> query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", variables = new { - wishlistId = TESTING_WISHLIST_ID + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID } }; @@ -130,9 +138,9 @@ public class WishlistsTests : IClassFixture> var personalWishlistType = (string) document.data.personalWishlist.type; var personalWishlistCreatedById = (string) document.data.personalWishlist.createdById; - Assert.Equal(TESTING_WISHLIST_ID, personalWishlistId); - Assert.Equal("Gaming PC", personalWishlistName); - Assert.Equal(WishlistTypes.Product.ToString(), personalWishlistType); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_ID, personalWishlistId); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_NAME, personalWishlistName); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_TYPE.ToString(), personalWishlistType); Assert.Equal(user.Id, personalWishlistCreatedById); } @@ -150,7 +158,7 @@ public class WishlistsTests : IClassFixture> query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", variables = new { - wishlistId = TESTING_WISHLIST_ID, + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, dto = new { text = MESSAGE_TEXT @@ -177,6 +185,42 @@ public class WishlistsTests : IClassFixture> Assert.Equal(user.Id, messageCreatedById); } + [Fact] + public async Task DeletePersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlistModel() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation deletePersonalWishlist($wishlistId: String!) { deletePersonalWishlist (wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var personalWishlistId = (string) document.data.deletePersonalWishlist.id; + var personalWishlistName = (string) document.data.deletePersonalWishlist.name; + var personalWishlistType = (string) document.data.deletePersonalWishlist.type; + var personalWishlistCreatedById = (string) document.data.deletePersonalWishlist.createdById; + + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_ID, personalWishlistId); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_NAME, personalWishlistName); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_TYPE.ToString(), personalWishlistType); + Assert.Equal(user.Id, personalWishlistCreatedById); + } + [Fact] public async Task StartPersonalWishlistAsync_InvalidWishlistModel_ReturnsInternalServerError() { @@ -216,7 +260,7 @@ public class WishlistsTests : IClassFixture> query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", variables = new { - wishlistId = "1234567890abcdef12345678" // Invalid wishlistId + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID } }; @@ -239,7 +283,7 @@ public class WishlistsTests : IClassFixture> query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", variables = new { - wishlistId = "ab6c2c2d9edf39abcd1ef9ab" // Other user's wishlist + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID } }; @@ -264,7 +308,7 @@ public class WishlistsTests : IClassFixture> query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", variables = new { - wishlistId = "8125jad7g12", // Invalid wishlistId + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID, dto = new { text = MESSAGE_TEXT, @@ -278,4 +322,27 @@ public class WishlistsTests : IClassFixture> using var response = await _httpClient.PostAsync("graphql", content); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + + [Fact] + public async Task DeletePersonalWishlist_InValidWishlistId_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation deletePersonalWishlist($wishlistId: String!) { deletePersonalWishlist (wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } } From 4f67175ff7c50b47cc641362816a2f3f3b4ef32c Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 09:44:20 +0300 Subject: [PATCH 07/18] add ability to view personal wishlists (get pages of messages starting from last messages) --- .../Mutations/WishlistsMutation.cs | 4 +- .../Queries/WishlistsQuery.cs | 11 +- .../IRepositories/IMessagerepository.cs | 6 +- .../IServices/IWishlistService.cs | 2 + .../Services/WishlistsService.cs | 21 ++- .../PersistanceExtentions/DbInitialaizer.cs | 85 ++++++--- .../Repositories/MessagesRepository.cs | 12 ++ .../Tests/WishlistsTests.cs | 161 ++++++++++++++++++ 8 files changed, 271 insertions(+), 31 deletions(-) diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs index 3bd1d7c..c4dde4c 100644 --- a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -7,11 +7,11 @@ namespace ShoppingAssistantApi.Api.Mutations; [ExtendObjectType(OperationTypeNames.Mutation)] public class WishlistsMutation { - public Task StartPersonalWishlist(WishlistCreateDto dto, CancellationToken cancellationToken, + public Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.StartPersonalWishlistAsync(dto, cancellationToken); - public Task AddMessageToPersonalWishlist(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, + public Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); diff --git a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs index 389864f..49a229f 100644 --- a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs @@ -9,12 +9,17 @@ namespace ShoppingAssistantApi.Api.Queries; public class WishlistsQuery { [Authorize] - public Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken, - [Service] IWishlistsService wishlistsService) + public Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, + CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.GetPersonalWishlistsPageAsync(pageNumber, pageSize, cancellationToken); [Authorize] public Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken, - [Service] IWishlistsService wishlistsService) + [Service] IWishlistsService wishlistsService) => wishlistsService.GetPersonalWishlistAsync(wishlistId, cancellationToken); + + [Authorize] + public Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, + CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) + => wishlistsService.GetMessagesPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs b/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs index 5387549..3d0483e 100644 --- a/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs +++ b/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs @@ -1,5 +1,9 @@ +using System.Linq.Expressions; using ShoppingAssistantApi.Domain.Entities; namespace ShoppingAssistantApi.Application.IRepositories; -public interface IMessagesRepository : IBaseRepository { } +public interface IMessagesRepository : IBaseRepository +{ + Task> GetPageStartingFromEndAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken); +} diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index 41081c6..c2cd5f3 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -14,5 +14,7 @@ public interface IWishlistsService Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); + Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken); + Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index a5166f2..6ec7a20 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -47,6 +47,8 @@ public class WishlistsService : IWishlistsService { Text = dto.FirstMessageText, Role = MessageRoles.User.ToString(), + CreatedById = (ObjectId) GlobalUser.Id, + CreatedDateUtc = DateTime.UtcNow, WishlistId = createdWishlist.Id }; var createdMessage = await _messagesRepository.AddAsync(newMessage, cancellationToken); @@ -62,10 +64,11 @@ public class WishlistsService : IWishlistsService { throw new InvalidDataException("Provided id is invalid."); } - newMessage.WishlistId = wishlistObjectId; + newMessage.Role = MessageRoles.User.ToString(); newMessage.CreatedById = (ObjectId) GlobalUser.Id; newMessage.CreatedDateUtc = DateTime.UtcNow; + newMessage.WishlistId = wishlistObjectId; await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); @@ -94,6 +97,22 @@ public class WishlistsService : IWishlistsService return _mapper.Map(entity); } + public async Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); + + var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); + + var dtos = _mapper.Map>(entities); + var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); + return new PagedList(dtos, pageNumber, pageSize, count); + } + public async Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken) { if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index a63c8f7..2d3af82 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -27,6 +27,8 @@ public class DbInitialaizer private readonly IMongoCollection _wishlistCollection; + private readonly IMongoCollection _messageCollection; + public IEnumerable Roles { get; set; } public DbInitialaizer(IServiceProvider serviceProvider) @@ -35,8 +37,9 @@ public class DbInitialaizer _rolesService = serviceProvider.GetService(); _userManager = serviceProvider.GetService(); _tokensService = serviceProvider.GetService(); - _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); + _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); + _messageCollection = serviceProvider.GetService().Db.GetCollection("Messages"); } public async Task InitialaizeDb(CancellationToken cancellationToken) @@ -172,45 +175,79 @@ public class DbInitialaizer 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 wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); + var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + var wishlists = new Wishlist[] { new Wishlist { - Id = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), + Id = wishlistId1, Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), CreatedById = user1.Id, - Messages = new Message[] - { - new Message - { - Text = "Prompt", - Role = MessageRoles.User.ToString(), - }, - new Message - { - Text = "Answer", - Role = MessageRoles.Application.ToString(), - }, - } }, new Wishlist { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Id = wishlistId2, Name = "Generic Wishlist Name", Type = WishlistTypes.Product.ToString(), CreatedById = user2.Id, - Messages = new Message[] - { - new Message - { - Text = "Prompt", - Role = MessageRoles.User.ToString(), - } - } } }; await _wishlistCollection.InsertManyAsync(wishlists); + + var messages = new Message[] + { + new Message + { + Text = "Message 1", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId1, + CreatedById = user1.Id, + }, + new Message + { + Text = "Message 2", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId1, + }, + new Message + { + Text = "Message 3", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId1, + CreatedById = user1.Id, + }, + new Message + { + Text = "Message 4", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId1, + }, + new Message + { + Text = "Message 5", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId1, + CreatedById = user1.Id, + }, + new Message + { + Text = "Message 6", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId1, + }, + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId2, + CreatedById = user2.Id, + } + }; + + await _messageCollection.InsertManyAsync(messages); } } diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 06481f6..23f9b8f 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -1,3 +1,5 @@ +using System.Linq.Expressions; +using MongoDB.Driver; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Persistance.Database; @@ -7,4 +9,14 @@ namespace ShoppingAssistantApi.Persistance.Repositories; public class MessagesRepository : BaseRepository, IMessagesRepository { public MessagesRepository(MongoDbContext db) : base(db, "Messages") { } + + public async Task> GetPageStartingFromEndAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken) + { + var messageCount = await GetCountAsync(predicate, cancellationToken); + + return await _collection.Find(predicate) + .Skip((messageCount / pageSize - pageNumber) * pageSize) + .Limit(pageSize) + .ToListAsync(cancellationToken); + } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 93f37f8..2c64d42 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -185,6 +185,44 @@ public class WishlistsTests : IClassFixture> Assert.Equal(user.Id, messageCreatedById); } + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsWishlistModel() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query messagesPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { messagesPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, text, role, createdById }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + Console.WriteLine(document.data.messagesPageFromPersonalWishlist); + + var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); + var firstMessageInPage = messagesPageFromPersonalWishlist[0]; + var secondMessageInPage = messagesPageFromPersonalWishlist[1]; + + Assert.Equal("Message 5", (string) firstMessageInPage.text); + Assert.Equal(MessageRoles.User.ToString(), (string) firstMessageInPage.role); + Assert.Equal(user.Id, (string) firstMessageInPage.createdById); + } + [Fact] public async Task DeletePersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlistModel() { @@ -323,6 +361,106 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query messagesPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { messagesPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, text, role, createdById }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 4, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_InValidPageSize_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query messagesPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { messagesPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, text, role, createdById }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 1, + pageSize = 10 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_InValidWishlistId_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query messagesPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { messagesPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, text, role, createdById }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_UnAuthorizedAccess_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query messagesPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { messagesPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, text, role, createdById }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + [Fact] public async Task DeletePersonalWishlist_InValidWishlistId_ReturnsInternalServerError() { @@ -345,4 +483,27 @@ public class WishlistsTests : IClassFixture> using var response = await _httpClient.PostAsync("graphql", content); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + + [Fact] + public async Task DeletePersonalWishlist_UnAuthorizedAccess_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation deletePersonalWishlist($wishlistId: String!) { deletePersonalWishlist (wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } } From 9c9081a44f3fcbd250566dd05cf731682010370c Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 10:55:39 +0300 Subject: [PATCH 08/18] fix unauthorized access to wishlistsPage --- .../Services/WishlistsService.cs | 2 +- .../Repositories/BaseRepository.cs | 2 +- .../Repositories/MessagesRepository.cs | 5 +- .../Tests/WishlistsTests.cs | 86 +++++++++++++++++-- 4 files changed, 86 insertions(+), 9 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 6ec7a20..99cbad7 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -79,7 +79,7 @@ public class WishlistsService : IWishlistsService public async Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) { - var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, cancellationToken); + var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id, cancellationToken); var dtos = _mapper.Map>(entities); var count = await _wishlistsRepository.GetTotalCountAsync(); return new PagedList(dtos, pageNumber, pageSize, count); diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index 565112e..319942d 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -69,4 +69,4 @@ public abstract class BaseRepository where TEntity : EntityBase return await this._collection.FindOneAndUpdateAsync( Builders.Filter.Eq(e => e.Id, entity.Id), updateDefinition, options, cancellationToken); } -} \ No newline at end of file +} diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 23f9b8f..2181ac5 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -14,8 +14,11 @@ public class MessagesRepository : BaseRepository, IMessagesRepository { var messageCount = await GetCountAsync(predicate, cancellationToken); + pageSize = Math.Clamp(pageSize, 1, messageCount); + var numberOfPages = messageCount / pageSize; + return await _collection.Find(predicate) - .Skip((messageCount / pageSize - pageNumber) * pageSize) + .Skip((numberOfPages - pageNumber) * pageSize) .Limit(pageSize) .ToListAsync(cancellationToken); } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 2c64d42..2e2a97d 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -86,7 +86,7 @@ public class WishlistsTests : IClassFixture> variables = new { pageNumber = 1, - pageSize = 1 + pageSize = 5 } }; @@ -212,8 +212,6 @@ public class WishlistsTests : IClassFixture> var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); - Console.WriteLine(document.data.messagesPageFromPersonalWishlist); - var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); var firstMessageInPage = messagesPageFromPersonalWishlist[0]; var secondMessageInPage = messagesPageFromPersonalWishlist[1]; @@ -286,6 +284,71 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task GetPersonalWishlistsPage_InValidPageNumber_ReturnsEmptyList() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var query = new + { + query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }", + variables = new + { + pageNumber = 100, + pageSize = 1 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(query); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); + + Assert.Empty(personalWishlistsPageItems); + } + + [Fact] + public async Task GetPersonalWishlistsPage_InValidPageSize_ReturnsPage() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var query = new + { + query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }", + variables = new + { + pageNumber = 1, + pageSize = 100 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(query); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + response.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); + var personalWishlistCreatedById = (string) personalWishlistsPageItems[0].createdById; + + Assert.NotEmpty(personalWishlistsPageItems); + Assert.Equal(user.Id, personalWishlistCreatedById); + } + [Fact] public async Task GetPersonalWishlist_InvalidWishlistId_ReturnsInternalServerError() { @@ -362,7 +425,7 @@ public class WishlistsTests : IClassFixture> } [Fact] - public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsInternalServerError() + public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsEmptyList() { var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); @@ -387,7 +450,7 @@ public class WishlistsTests : IClassFixture> } [Fact] - public async Task GetMessagesPageFromPersonalWishlist_InValidPageSize_ReturnsInternalServerError() + public async Task GetMessagesPageFromPersonalWishlist_InValidPageSize_ReturnsPage() { var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); @@ -408,7 +471,18 @@ public class WishlistsTests : IClassFixture> var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); + var firstMessageInPage = messagesPageFromPersonalWishlist[0]; + var secondMessageInPage = messagesPageFromPersonalWishlist[1]; + + Assert.Equal("Message 1", (string) firstMessageInPage.text); + Assert.Equal(MessageRoles.User.ToString(), (string) firstMessageInPage.role); + Assert.Equal(user.Id, (string) firstMessageInPage.createdById); } [Fact] From f24365a3eb088c3f87a4c22cf7e483be5ffdead6 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 12:17:00 +0300 Subject: [PATCH 09/18] fix unpredictable results from GetPage method --- .../Repositories/MessagesRepository.cs | 15 ++++++++++++++ .../Tests/WishlistsTests.cs | 20 ++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 2181ac5..801963e 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -17,6 +17,21 @@ public class MessagesRepository : BaseRepository, IMessagesRepository pageSize = Math.Clamp(pageSize, 1, messageCount); var numberOfPages = messageCount / pageSize; + if (pageNumber > numberOfPages) + { + return new List(); + } + + if (pageNumber < 1) + { + throw new ArgumentOutOfRangeException(); + } + + if (pageSize < 1) + { + throw new ArgumentOutOfRangeException(); + } + return await _collection.Find(predicate) .Skip((numberOfPages - pageNumber) * pageSize) .Limit(pageSize) diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 2e2a97d..90394c5 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -310,6 +310,8 @@ public class WishlistsTests : IClassFixture> var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); + Console.WriteLine(document); + var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); Assert.Empty(personalWishlistsPageItems); @@ -342,6 +344,9 @@ public class WishlistsTests : IClassFixture> var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); + Console.WriteLine(document); + + var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); var personalWishlistCreatedById = (string) personalWishlistsPageItems[0].createdById; @@ -446,7 +451,17 @@ public class WishlistsTests : IClassFixture> var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + Console.WriteLine(document); + + + var messagesPageFromPersonalWishlistItems = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); + + Assert.Empty(messagesPageFromPersonalWishlistItems); } [Fact] @@ -476,6 +491,9 @@ public class WishlistsTests : IClassFixture> var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); + Console.WriteLine(document); + + var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); var firstMessageInPage = messagesPageFromPersonalWishlist[0]; var secondMessageInPage = messagesPageFromPersonalWishlist[1]; From b9a58a963a63f870474e3d374ea3c0b7150b2531 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 13:22:06 +0300 Subject: [PATCH 10/18] add ability to view products in wishlist --- .../Queries/WishlistsQuery.cs | 5 + .../IRepositories/IProductsRepository.cs | 5 + .../IServices/IWishlistService.cs | 2 + .../MappingProfiles/ProductProfile.cs | 15 ++ .../Models/CreateDtos/ProductCreateDto.cs | 18 +++ .../Models/Dtos/MessageDto.cs | 2 +- .../Models/Dtos/ProductDto.cs | 20 +++ .../Models/Dtos/WishlistDto.cs | 2 +- .../Entities/Message.cs | 2 +- .../Entities/Product.cs | 21 +++ .../Services/WishlistsService.cs | 26 +++- .../PersistanceExtentions/DbInitialaizer.cs | 54 ++++++- .../RepositoriesExtention.cs | 1 + .../Repositories/ProductRepository.cs | 10 ++ .../Tests/WishlistsTests.cs | 145 +++++++++++++++++- 15 files changed, 321 insertions(+), 7 deletions(-) create mode 100644 ShoppingAssistantApi.Application/IRepositories/IProductsRepository.cs create mode 100644 ShoppingAssistantApi.Application/MappingProfiles/ProductProfile.cs create mode 100644 ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/Product.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/ProductRepository.cs diff --git a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs index 49a229f..086be2e 100644 --- a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs @@ -22,4 +22,9 @@ public class WishlistsQuery public Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.GetMessagesPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); + + [Authorize] + public Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, + CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) + => wishlistsService.GetProductsPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IRepositories/IProductsRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IProductsRepository.cs new file mode 100644 index 0000000..d5c6c02 --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IProductsRepository.cs @@ -0,0 +1,5 @@ +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IProductsRepository : IBaseRepository { } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index c2cd5f3..b34e985 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -16,5 +16,7 @@ public interface IWishlistsService Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken); + Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken); + Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Application/MappingProfiles/ProductProfile.cs b/ShoppingAssistantApi.Application/MappingProfiles/ProductProfile.cs new file mode 100644 index 0000000..92ab66f --- /dev/null +++ b/ShoppingAssistantApi.Application/MappingProfiles/ProductProfile.cs @@ -0,0 +1,15 @@ +using AutoMapper; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.MappingProfiles; +public class ProductProfile : Profile +{ + public ProductProfile() + { + CreateMap().ReverseMap(); + + CreateMap().ReverseMap(); + } +} diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs new file mode 100644 index 0000000..56687e1 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs @@ -0,0 +1,18 @@ +namespace ShoppingAssistantApi.Application.Models.CreateDtos; + +public class ProductCreateDto +{ + public required string Url { get; set; } + + public required string Name { get; set; } + + public required string Description { get; set; } + + public required double Rating { get; set; } + + public required string[] ImagesUrls { get; set; } + + public required bool WasOpened { get; set; } + + public required string WishlistId { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs index a33c92e..9225d00 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs @@ -8,5 +8,5 @@ public class MessageDto public required string Role { get; set; } - public string? CreatedById { get; set; } = null; + public required string CreatedById { get; set; } } diff --git a/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs new file mode 100644 index 0000000..1697cd6 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs @@ -0,0 +1,20 @@ +namespace ShoppingAssistantApi.Application.Models.Dtos; + +public class ProductDto +{ + public required string Id { get; set; } + + public required string Url { get; set; } + + public required string Name { get; set; } + + public required string Description { get; set; } + + public required double Rating { get; set; } + + public required string[] ImagesUrls { get; set; } + + public required bool WasOpened { get; set; } + + public required string WishlistId { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs index 9398c26..cbb2cf6 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs @@ -8,5 +8,5 @@ public class WishlistDto public required string Type { get; set; } - public string CreatedById { get; set; } = null!; + public required string CreatedById { get; set; } } diff --git a/ShoppingAssistantApi.Domain/Entities/Message.cs b/ShoppingAssistantApi.Domain/Entities/Message.cs index 8a50457..77f4004 100644 --- a/ShoppingAssistantApi.Domain/Entities/Message.cs +++ b/ShoppingAssistantApi.Domain/Entities/Message.cs @@ -9,5 +9,5 @@ public class Message : EntityBase public required string Role { get; set; } - public ObjectId WishlistId { get; set; } + public required ObjectId WishlistId { get; set; } } diff --git a/ShoppingAssistantApi.Domain/Entities/Product.cs b/ShoppingAssistantApi.Domain/Entities/Product.cs new file mode 100644 index 0000000..40fbf90 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/Product.cs @@ -0,0 +1,21 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class Product : EntityBase +{ + public required string Url { get; set; } + + public required string Name { get; set; } + + public required string Description { get; set; } + + public required double Rating { get; set; } + + public required string[] ImagesUrls { get; set; } + + public required bool WasOpened { get; set; } + + public required ObjectId WishlistId { get; set; } +} diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 99cbad7..1a91f55 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -18,12 +18,15 @@ public class WishlistsService : IWishlistsService private readonly IMessagesRepository _messagesRepository; + private readonly IProductsRepository _productRepository; + private readonly IMapper _mapper; - public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, IMapper mapper) + public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, IProductsRepository productRepository, IMapper mapper) { _wishlistsRepository = wishlistRepository; _messagesRepository = messageRepository; + _productRepository = productRepository; _mapper = mapper; } @@ -113,6 +116,27 @@ public class WishlistsService : IWishlistsService return new PagedList(dtos, pageNumber, pageSize, count); } + public async Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); + + var entities = await _productRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); + + foreach (var e in entities) + { + Console.WriteLine(e.Name); + } + + var dtos = _mapper.Map>(entities); + var count = await _productRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); + return new PagedList(dtos, pageNumber, pageSize, count); + } + public async Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken) { if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 2d3af82..6233c86 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -29,6 +29,8 @@ public class DbInitialaizer private readonly IMongoCollection _messageCollection; + private readonly IMongoCollection _productCollection; + public IEnumerable Roles { get; set; } public DbInitialaizer(IServiceProvider serviceProvider) @@ -40,13 +42,14 @@ public class DbInitialaizer _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); _messageCollection = serviceProvider.GetService().Db.GetCollection("Messages"); + _productCollection = serviceProvider.GetService().Db.GetCollection("Products"); } public async Task InitialaizeDb(CancellationToken cancellationToken) { await AddRoles(cancellationToken); await AddUsers(cancellationToken); - await AddWishlistsWithMessages(cancellationToken); + await AddWishlistsWithMessagesAndProducts(cancellationToken); } public async Task AddUsers(CancellationToken cancellationToken) @@ -170,7 +173,7 @@ public class DbInitialaizer var dto3 = await _rolesService.AddRoleAsync(role3, cancellationToken); } - public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) + public async Task AddWishlistsWithMessagesAndProducts(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(); @@ -186,6 +189,7 @@ public class DbInitialaizer Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, new Wishlist { @@ -193,6 +197,7 @@ public class DbInitialaizer Name = "Generic Wishlist Name", Type = WishlistTypes.Product.ToString(), CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow } }; @@ -206,12 +211,14 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId1, CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, new Message { Text = "Message 2", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow }, new Message { @@ -219,12 +226,14 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId1, CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, new Message { Text = "Message 4", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow }, new Message { @@ -232,12 +241,14 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId1, CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, new Message { Text = "Message 6", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow }, new Message { @@ -245,9 +256,48 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId2, CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow } }; await _messageCollection.InsertManyAsync(messages); + + var products = new Product[] + { + new Product + { + Name = "AMD Ryzen 5 5600G 6-Core 12-Thread Unlocked Desktop Processor with Radeon Graphics", + Description = "Features best-in-class graphics performance in a desktop processor for smooth 1080p gaming, no graphics card required", + Rating = 4.8, + Url = "https://a.co/d/5ceuIrq", + ImagesUrls = new string[] + { + "https://m.media-amazon.com/images/I/51f2hkWjTlL._AC_SL1200_.jpg", + "https://m.media-amazon.com/images/I/51iji7Gel-L._AC_SL1200_.jpg" + }, + WasOpened = false, + WishlistId = wishlistId1, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Product + { + Name = "Samsung 970 EVO Plus SSD 2TB NVMe M.2 Internal Solid State Hard Drive, V-NAND Technology, Storage and Memory Expansion for Gaming, Graphics w/ Heat Control, Max Speed, MZ-V7S2T0B/AM ", + Description = "7 Year Limited Warranty: The 970 EVO Plus provides up to 1200 TBW (Terabytes Written) with 5-years of protection for exceptional endurance powered by the latest V-NAND technology and Samsung's reputation for quality ", + Rating = 4.8, + Url = "https://a.co/d/gxnuqs1", + ImagesUrls = new string[] + { + "https://m.media-amazon.com/images/I/51Brl+iYtvL._AC_SL1001_.jpg", + "https://m.media-amazon.com/images/I/51GOfLlVwoL._AC_SL1001_.jpg" + }, + WasOpened = false, + WishlistId = wishlistId1, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + }; + + await _productCollection.InsertManyAsync(products); } } diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs index e48ae73..2fbfa72 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs @@ -15,6 +15,7 @@ public static class RepositoriesExtention services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); return services; } diff --git a/ShoppingAssistantApi.Persistance/Repositories/ProductRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/ProductRepository.cs new file mode 100644 index 0000000..3e0863a --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/ProductRepository.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class ProductsRepository : BaseRepository, IProductsRepository +{ + public ProductsRepository(MongoDbContext db) : base(db, "Products") { } +} diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 90394c5..6f22fe7 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -186,7 +186,7 @@ public class WishlistsTests : IClassFixture> } [Fact] - public async Task GetMessagesPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsWishlistModel() + public async Task GetMessagesPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsPage() { var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); @@ -221,6 +221,40 @@ public class WishlistsTests : IClassFixture> Assert.Equal(user.Id, (string) firstMessageInPage.createdById); } + [Fact] + public async Task GetProductsPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsPage() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query productsPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { productsPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, url, name, description, rating, imagesUrls, wasOpened, wishlistId }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var productsPageFromPersonalWishlist = Enumerable.ToList(document.data.productsPageFromPersonalWishlist.items); + var secondProductInPage = productsPageFromPersonalWishlist[1]; + + Assert.Equal("Samsung 970 EVO Plus SSD 2TB NVMe M.2 Internal Solid State Hard Drive, V-NAND Technology, Storage and Memory Expansion for Gaming, Graphics w/ Heat Control, Max Speed, MZ-V7S2T0B/AM ", (string) secondProductInPage.name); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_ID, (string) secondProductInPage.wishlistId); + } + [Fact] public async Task DeletePersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlistModel() { @@ -553,6 +587,115 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task GetProductsPageFromPersonalWishlist_InValidPageNumber_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query productsPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { productsPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, url, name, description, rating, imagesUrls, wasOpened, wishlistId }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_InValidPageSize_ReturnsPage() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query productsPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { productsPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, url, name, description, rating, imagesUrls, wasOpened, wishlistId }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + pageNumber = 1, + pageSize = 100 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var productsPageFromPersonalWishlist = Enumerable.ToList(document.data.productsPageFromPersonalWishlist.items); + var secondProductInPage = productsPageFromPersonalWishlist[1]; + + Assert.Equal("Samsung 970 EVO Plus SSD 2TB NVMe M.2 Internal Solid State Hard Drive, V-NAND Technology, Storage and Memory Expansion for Gaming, Graphics w/ Heat Control, Max Speed, MZ-V7S2T0B/AM ", (string) secondProductInPage.name); + Assert.Equal(WISHLIST_TESTING_VALID_WISHLIST_ID, (string) secondProductInPage.wishlistId); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_InValidWishlistId_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query productsPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { productsPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, url, name, description, rating, imagesUrls, wasOpened, wishlistId }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_UnAuthorizedAccess_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "query productsPageFromPersonalWishlist($wishlistId: String!, $pageNumber: Int!, $pageSize: Int!) { productsPageFromPersonalWishlist (wishlistId: $wishlistId, pageNumber: $pageNumber, pageSize: $pageSize) { hasNextPage, hasPreviousPage, items { id, url, name, description, rating, imagesUrls, wasOpened, wishlistId }, pageNumber, pageSize, totalItems, totalPages } }", + variables = new + { + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + [Fact] public async Task DeletePersonalWishlist_InValidWishlistId_ReturnsInternalServerError() { From 1412c07fa279774837f188ba153e98f098d49445 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 13:32:35 +0300 Subject: [PATCH 11/18] fix: return oredered wishlist messages Before that there was a possibility of returning pages with incorrectly ordered messages --- .../PersistanceExtentions/DbInitialaizer.cs | 10 +++++----- .../Repositories/MessagesRepository.cs | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 6233c86..cd43f63 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -218,7 +218,7 @@ public class DbInitialaizer Text = "Message 2", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow.AddSeconds(5) }, new Message { @@ -226,14 +226,14 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId1, CreatedById = user1.Id, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow.AddSeconds(20) }, new Message { Text = "Message 4", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow.AddSeconds(25) }, new Message { @@ -241,14 +241,14 @@ public class DbInitialaizer Role = MessageRoles.User.ToString(), WishlistId = wishlistId1, CreatedById = user1.Id, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow.AddSeconds(45) }, new Message { Text = "Message 6", Role = MessageRoles.Application.ToString(), WishlistId = wishlistId1, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow.AddSeconds(50) }, new Message { diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 801963e..02d309d 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -33,6 +33,7 @@ public class MessagesRepository : BaseRepository, IMessagesRepository } return await _collection.Find(predicate) + .SortBy(x => x.CreatedDateUtc) .Skip((numberOfPages - pageNumber) * pageSize) .Limit(pageSize) .ToListAsync(cancellationToken); From 2096df2c34c6e138d5a4852f7d8d35cbc283f62d Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 14:04:57 +0300 Subject: [PATCH 12/18] add ability to add product to wishlist --- .../Mutations/WishlistsMutation.cs | 10 +- .../Queries/WishlistsQuery.cs | 8 +- .../IServices/IWishlistService.cs | 2 + .../Models/CreateDtos/ProductCreateDto.cs | 2 - .../Services/WishlistsService.cs | 33 ++-- .../Tests/WishlistsTests.cs | 148 +++++++++++++++++- 6 files changed, 184 insertions(+), 19 deletions(-) diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs index c4dde4c..f3ff806 100644 --- a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -8,14 +8,18 @@ namespace ShoppingAssistantApi.Api.Mutations; public class WishlistsMutation { public Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken, - [Service] IWishlistsService wishlistsService) + [Service] IWishlistsService wishlistsService) => wishlistsService.StartPersonalWishlistAsync(dto, cancellationToken); public Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, - [Service] IWishlistsService wishlistsService) + [Service] IWishlistsService wishlistsService) => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); + public Task AddProductToPersonalWishlistAsync(string wishlistId, ProductCreateDto dto, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, dto, cancellationToken); + public Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken, - [Service] IWishlistsService wishlistsService) + [Service] IWishlistsService wishlistsService) => wishlistsService.DeletePersonalWishlistAsync(wishlistId, cancellationToken); } diff --git a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs index 086be2e..d3d36be 100644 --- a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs @@ -11,20 +11,20 @@ public class WishlistsQuery [Authorize] public Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) - => wishlistsService.GetPersonalWishlistsPageAsync(pageNumber, pageSize, cancellationToken); + => wishlistsService.GetPersonalWishlistsPageAsync(pageNumber, pageSize, cancellationToken); [Authorize] public Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) - => wishlistsService.GetPersonalWishlistAsync(wishlistId, cancellationToken); + => wishlistsService.GetPersonalWishlistAsync(wishlistId, cancellationToken); [Authorize] public Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) - => wishlistsService.GetMessagesPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); + => wishlistsService.GetMessagesPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); [Authorize] public Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) - => wishlistsService.GetProductsPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); + => wishlistsService.GetProductsPageFromPersonalWishlistAsync(wishlistId, pageNumber, pageSize, cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index b34e985..d95a874 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -16,6 +16,8 @@ public interface IWishlistsService Task> GetMessagesPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken); + Task AddProductToPersonalWishlistAsync(string wishlistId, ProductCreateDto dto, CancellationToken cancellationToken); + Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken); Task DeletePersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs index 56687e1..015706c 100644 --- a/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs @@ -13,6 +13,4 @@ public class ProductCreateDto public required string[] ImagesUrls { get; set; } public required bool WasOpened { get; set; } - - public required string WishlistId { get; set; } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 1a91f55..5dd2ae7 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -18,7 +18,7 @@ public class WishlistsService : IWishlistsService private readonly IMessagesRepository _messagesRepository; - private readonly IProductsRepository _productRepository; + private readonly IProductsRepository _productsRepository; private readonly IMapper _mapper; @@ -26,7 +26,7 @@ public class WishlistsService : IWishlistsService { _wishlistsRepository = wishlistRepository; _messagesRepository = messageRepository; - _productRepository = productRepository; + _productsRepository = productRepository; _mapper = mapper; } @@ -116,6 +116,26 @@ public class WishlistsService : IWishlistsService return new PagedList(dtos, pageNumber, pageSize, count); } + public async Task AddProductToPersonalWishlistAsync(string wishlistId, ProductCreateDto dto, CancellationToken cancellationToken) + { + var newProduct = _mapper.Map(dto); + + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); + + newProduct.CreatedById = (ObjectId) GlobalUser.Id; + newProduct.CreatedDateUtc = DateTime.UtcNow; + newProduct.WishlistId = wishlistObjectId; + + var createdProduct = await _productsRepository.AddAsync(newProduct, cancellationToken); + + return _mapper.Map(createdProduct); + } + public async Task> GetProductsPageFromPersonalWishlistAsync(string wishlistId, int pageNumber, int pageSize, CancellationToken cancellationToken) { if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) @@ -125,15 +145,10 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var entities = await _productRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); - - foreach (var e in entities) - { - Console.WriteLine(e.Name); - } + var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); var dtos = _mapper.Map>(entities); - var count = await _productRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); + var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); return new PagedList(dtos, pageNumber, pageSize, count); } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 6f22fe7..eab15fa 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -221,6 +221,51 @@ public class WishlistsTests : IClassFixture> Assert.Equal(user.Id, (string) firstMessageInPage.createdById); } + [Fact] + public async Task AddProductToPersonalWishlist_ValidMessageModel_ReturnsNewProductModel() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { url, name, description, rating, imagesUrls, wasOpened } }", + variables = new + { + wishlistId = WISHLIST_TESTING_VALID_WISHLIST_ID, + dto = new + { + url = "https://www.amazon.com/url", + name = "Generic name", + description = "Generic description", + rating = 4.8, + imagesUrls = new string[] + { + "https://www.amazon.com/image-url-1", + "https://www.amazon.com/image-url-2" + }, + wasOpened = false + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + Assert.Equal("https://www.amazon.com/url", (string) document.data.addProductToPersonalWishlist.url); + Assert.Equal("Generic name", (string) document.data.addProductToPersonalWishlist.name); + Assert.Equal("Generic description", (string) document.data.addProductToPersonalWishlist.description); + Assert.Equal(4.8, (double) document.data.addProductToPersonalWishlist.rating); + Assert.Equal("https://www.amazon.com/image-url-1", (string) document.data.addProductToPersonalWishlist.imagesUrls[0]); + } + [Fact] public async Task GetProductsPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsPage() { @@ -435,7 +480,7 @@ public class WishlistsTests : IClassFixture> } [Fact] - public async Task AddMessageToPersonalWishlist_InvalidMessageModel_ReturnsInternalServerError() + public async Task AddMessageToPersonalWishlist_InvalidWishlistId_ReturnsInternalServerError() { var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); @@ -463,6 +508,35 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task AddMessageToPersonalWishlist_UnAuthorizedAccess_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + const string MESSAGE_TEXT = "Second Message"; + + var mutation = new + { + query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", + variables = new + { + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID, + dto = new + { + text = MESSAGE_TEXT, + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + [Fact] public async Task GetMessagesPageFromPersonalWishlist_InValidPageNumber_ReturnsEmptyList() { @@ -587,6 +661,78 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task AddProductToPersonalWishlist_InValidWishlistId_RturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { url, name, description, rating, imagesUrls, wasOpened } }", + variables = new + { + wishlistId = WISHLIST_TESTING_INVALID_WISHLIST_ID, + dto = new + { + url = "https://www.amazon.com/url", + name = "Generic name", + description = "Generic description", + rating = 4.8, + imagesUrls = new string[] + { + "https://www.amazon.com/image-url-1", + "https://www.amazon.com/image-url-2" + }, + wasOpened = false + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task AddProductToPersonalWishlist_UnAuthorizedAccess_RturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login(WISHLIST_TESTING_USER_EMAIL, WISHLIST_TESTING_USER_PASSWORD, _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { url, name, description, rating, imagesUrls, wasOpened } }", + variables = new + { + wishlistId = WISHLIST_TESTING_OTHER_USER_WISHLIST_ID, + dto = new + { + url = "https://www.amazon.com/url", + name = "Generic name", + description = "Generic description", + rating = 4.8, + imagesUrls = new string[] + { + "https://www.amazon.com/image-url-1", + "https://www.amazon.com/image-url-2" + }, + wasOpened = false + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + [Fact] public async Task GetProductsPageFromPersonalWishlist_InValidPageNumber_ReturnsInternalServerError() { From 98795719dc57bad764950a4ab90bcf78279b8e05 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 14:10:19 +0300 Subject: [PATCH 13/18] remove unused unit test class --- .../OpenAiServiceTests.cs | 86 ------------------- 1 file changed, 86 deletions(-) delete mode 100644 ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs diff --git a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs deleted file mode 100644 index 7ec9de8..0000000 --- a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System.Net; -using Moq; -using Moq.Protected; -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Application.Models.OpenAi; -using ShoppingAssistantApi.Domain.Enums; -using ShoppingAssistantApi.Infrastructure.Services; - -namespace ShoppingAssistantApi.UnitTests; - -public class OpenAiServiceTests -{ - private readonly IOpenAiService _openAiService; - - private readonly Mock _mockHttpMessageHandler; - - private readonly HttpClient _httpClient; - - public OpenAiServiceTests() - { - // Mock any dependencies - _mockHttpMessageHandler = new Mock(); - _httpClient = new HttpClient(_mockHttpMessageHandler.Object); - _openAiService = new OpenAiService(_httpClient); - } - - [Fact] - public async Task GetChatCompletion_ValidChat_ReturnsNewMessage() - { - // Arrange - _mockHttpMessageHandler - .Protected() - .Setup>( - "SendAsync", - ItExpr.IsAny(), - ItExpr.IsAny() - ) - .ReturnsAsync(new HttpResponseMessage - { - StatusCode = HttpStatusCode.OK, - Content = new StringContent(@" - { - ""id"": ""chatcmpl-89OMdgTZXOLAXv7bPUJ4SwrPpS5Md"", - ""object"": ""chat.completion"", - ""created"": 1697249299, - ""model"": ""gpt-3.5-turbo-0613"", - ""choices"": [ - { - ""index"": 0, - ""message"": { - ""role"": ""assistant"", - ""content"": ""Hello World!"" - }, - ""finish_reason"": ""stop"" - } - ], - ""usage"": { - ""prompt_tokens"": 10, - ""completion_tokens"": 3, - ""total_tokens"": 13 - } - }"), - }); - - var chat = new ChatCompletionRequest - { - Messages = new List - { - new OpenAiMessage - { - Role = OpenAiRole.User, - Content = "Return Hello World!" - } - } - }; - - // Act - var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None); - - // Assert - Assert.NotNull(newMessage); - Assert.Equal("Hello, World!", newMessage.Content); - } - - // TODO: Add more tests -} \ No newline at end of file From 5abb14201518fbdeea3e1c5cab19aba4b71b1720 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 16:26:00 +0300 Subject: [PATCH 14/18] fix message pages --- .../Repositories/MessagesRepository.cs | 24 ++----------------- .../Tests/WishlistsTests.cs | 12 +++++----- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 02d309d..55734c9 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -12,29 +12,9 @@ public class MessagesRepository : BaseRepository, IMessagesRepository public async Task> GetPageStartingFromEndAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken) { - var messageCount = await GetCountAsync(predicate, cancellationToken); - - pageSize = Math.Clamp(pageSize, 1, messageCount); - var numberOfPages = messageCount / pageSize; - - if (pageNumber > numberOfPages) - { - return new List(); - } - - if (pageNumber < 1) - { - throw new ArgumentOutOfRangeException(); - } - - if (pageSize < 1) - { - throw new ArgumentOutOfRangeException(); - } - return await _collection.Find(predicate) - .SortBy(x => x.CreatedDateUtc) - .Skip((numberOfPages - pageNumber) * pageSize) + .SortByDescending(x => x.CreatedDateUtc) + .Skip((pageNumber - 1) * pageSize) .Limit(pageSize) .ToListAsync(cancellationToken); } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index eab15fa..fa884c9 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -212,13 +212,14 @@ public class WishlistsTests : IClassFixture> var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); + Console.WriteLine(document); + var messagesPageFromPersonalWishlist = Enumerable.ToList(document.data.messagesPageFromPersonalWishlist.items); var firstMessageInPage = messagesPageFromPersonalWishlist[0]; var secondMessageInPage = messagesPageFromPersonalWishlist[1]; - Assert.Equal("Message 5", (string) firstMessageInPage.text); - Assert.Equal(MessageRoles.User.ToString(), (string) firstMessageInPage.role); - Assert.Equal(user.Id, (string) firstMessageInPage.createdById); + Assert.Equal("Message 6", (string) firstMessageInPage.text); + Assert.Equal(MessageRoles.Application.ToString(), (string) firstMessageInPage.role); } [Fact] @@ -606,9 +607,8 @@ public class WishlistsTests : IClassFixture> var firstMessageInPage = messagesPageFromPersonalWishlist[0]; var secondMessageInPage = messagesPageFromPersonalWishlist[1]; - Assert.Equal("Message 1", (string) firstMessageInPage.text); - Assert.Equal(MessageRoles.User.ToString(), (string) firstMessageInPage.role); - Assert.Equal(user.Id, (string) firstMessageInPage.createdById); + Assert.Equal("Message 6", (string) firstMessageInPage.text); + Assert.Equal(MessageRoles.Application.ToString(), (string) firstMessageInPage.role); } [Fact] From 80c9bc2b3289ce000ef86733f41b8bde85f72895 Mon Sep 17 00:00:00 2001 From: stasex Date: Sun, 15 Oct 2023 16:27:29 +0300 Subject: [PATCH 15/18] Small changes for DbInitialaizer with products collection --- .../PersistanceExtentions/DbInitialaizer.cs | 74 +++++++++++++------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 651e374..9d88eb1 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -222,40 +222,72 @@ public class DbInitialaizer public async Task AddProducts(CancellationToken cancellationToken) { - var wishList1 = await _wishlistCollection.FindAsync(w => w.Name == "Gaming PC"); - var wishList2 = await _wishlistCollection.FindAsync(w => w.Name == "Generic Wishlist Name"); - var products = new Product[] { new Product() { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Url = "url", - Name = "Thermaltake Glacier", - Description = "Something", - Rating = 4.1, + Name = "Thermaltake Glacier 360 Liquid-Cooled PC", + Description = "Cool PC for any task!", + Rating = 4.3, + Url = "https://www.amazon.com/Thermaltake-Liquid-Cooled-ToughRAM-Computer-S3WT-B550-G36-LCS/dp" + + "/B09FYNM2GW/ref=sr_1_1?crid=391KAS4JFJSFF&keywords=gaming%2Bpc&qid=1697132083&sprefix=gaming%2Bpc%2Caps%2C209&sr=8-1&th=1", ImagesUrls = new string[] { - "url1", - "url2" - } + "https://m.media-amazon.com/images/I/61cXu9yGldL._AC_SL1200_.jpg", + "https://m.media-amazon.com/images/I/615gxSGp42L._AC_SL1200_.jpg" + }, + CreatedDateUtc = DateTime.UtcNow }, new Product() { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Url = "url", - Name = "Mac", - Description = "very very cool laptop", - Rating = 4.9, + Name = "Apple MagSafe Battery Pack", + Description = "Portable Charger with Fast Charging Capability, Power Bank Compatible with iPhone", + Rating = 4.3, + Url = "https://www.amazon.com/Apple-MJWY3AM-A-MagSafe-Battery/dp/" + + "B099BWY7WT/ref=sr_1_1?keywords=apple+power+bank&qid=1697375350&sr=8-1", ImagesUrls = new string[] { - "url1", - "url2" - } - } + "https://m.media-amazon.com/images/I/418SjFMB1wL._AC_SX679_.jpg", + "https://m.media-amazon.com/images/I/51v4pgChtLL._AC_SX679_.jpg", + "https://m.media-amazon.com/images/I/61mJ0z7uYQL._AC_SX679_.jpg" + }, + CreatedDateUtc = DateTime.UtcNow + }, + new Product() + { + Name = "Logitech K400 Plus Wireless Touch With Easy Media Control and Built-in Touchpad", + Description = "Reliable membrane keyboard with touchpad!", + Rating = 4.5, + Url = "https://www.amazon.com/Logitech-Wireless-Keyboard-Touchpad-PC-connected/dp/B014EUQOGK/" + + "ref=sr_1_11?crid=BU2PHZKHKD65&keywords=keyboard+wireless&qid=1697375559&sprefix=keyboard+wir%2Caps%2C195&sr=8-11", + ImagesUrls = new string[] + { + "https://m.media-amazon.com/images/I/51yjnWJ5urL._AC_SX466_.jpg", + "https://m.media-amazon.com/images/I/71al70zP7QL._AC_SX466_.jpg", + "https://m.media-amazon.com/images/I/71+JXDDY01L._AC_SX466_.jpg" + }, + CreatedDateUtc = DateTime.UtcNow + }, + + new Product() + { + Name = "Logitech MX Anywhere 2S Wireless Mouse Use On Any Surface", + Description = "Cross computer control: Game changing capacity to navigate seamlessly on three computers," + + " and copy paste text, images, and files from one to the other using Logitech Flow", + Rating = 4.6, + Url = "https://www.amazon.com/Logitech-Hyper-Fast-Scrolling-Rechargeable-Computers/dp/B08P2JFPQC/ref=sr_1_8?" + + "crid=2BL6Z14W2TPP3&keywords=mouse%2Bwireless&qid=1697375784&sprefix=mousewireless%2Caps%2C197&sr=8-8&th=1", + ImagesUrls = new string[] + { + "https://m.media-amazon.com/images/I/6170mJHIsYL._AC_SX466_.jpg", + "https://m.media-amazon.com/images/I/71a5As76MDL._AC_SX466_.jpg" + }, + CreatedDateUtc = DateTime.UtcNow + } }; - + + await _productCollection.InsertManyAsync(products); } } From 004033f3076cb42c402eda941a289a5cfb59bac3 Mon Sep 17 00:00:00 2001 From: stasex Date: Sun, 15 Oct 2023 16:38:20 +0300 Subject: [PATCH 16/18] added the missing property to the product entity --- ShoppingAssistantApi.Domain/Entities/Product.cs | 2 ++ .../PersistanceExtentions/DbInitialaizer.cs | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ShoppingAssistantApi.Domain/Entities/Product.cs b/ShoppingAssistantApi.Domain/Entities/Product.cs index c581196..f3b2ccd 100644 --- a/ShoppingAssistantApi.Domain/Entities/Product.cs +++ b/ShoppingAssistantApi.Domain/Entities/Product.cs @@ -16,4 +16,6 @@ public class Product : EntityBase public double Rating { get; set; } public string[]? ImagesUrls { get; set; } + + public bool WasOpened { get; set; } } \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 9d88eb1..dbba926 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -236,7 +236,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/61cXu9yGldL._AC_SL1200_.jpg", "https://m.media-amazon.com/images/I/615gxSGp42L._AC_SL1200_.jpg" }, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow, + WasOpened = false }, new Product() @@ -252,7 +253,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/51v4pgChtLL._AC_SX679_.jpg", "https://m.media-amazon.com/images/I/61mJ0z7uYQL._AC_SX679_.jpg" }, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow, + WasOpened = false }, new Product() @@ -268,7 +270,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/71al70zP7QL._AC_SX466_.jpg", "https://m.media-amazon.com/images/I/71+JXDDY01L._AC_SX466_.jpg" }, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow, + WasOpened = false }, new Product() @@ -284,7 +287,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/6170mJHIsYL._AC_SX466_.jpg", "https://m.media-amazon.com/images/I/71a5As76MDL._AC_SX466_.jpg" }, - CreatedDateUtc = DateTime.UtcNow + CreatedDateUtc = DateTime.UtcNow, + WasOpened = false } }; From ba876b30fe78f2f94614a6fb257394aedc0d2809 Mon Sep 17 00:00:00 2001 From: stasex Date: Sun, 15 Oct 2023 20:08:21 +0300 Subject: [PATCH 17/18] added a method call --- .../PersistanceExtentions/DbInitialaizer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index dbba926..b64f784 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -50,6 +50,7 @@ public class DbInitialaizer await AddRoles(cancellationToken); await AddUsers(cancellationToken); await AddWishlistsWithMessages(cancellationToken); + await AddProducts(cancellationToken); } public async Task AddUsers(CancellationToken cancellationToken) From 250e493fc24a0a782af460deabd9c77b3c49c69f Mon Sep 17 00:00:00 2001 From: stasex Date: Sun, 15 Oct 2023 20:26:34 +0300 Subject: [PATCH 18/18] added a method call --- .../PersistanceExtentions/DbInitialaizer.cs | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index dbba926..f96d491 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -50,6 +50,7 @@ public class DbInitialaizer await AddRoles(cancellationToken); await AddUsers(cancellationToken); await AddWishlistsWithMessages(cancellationToken); + await AddProducts(cancellationToken); } public async Task AddUsers(CancellationToken cancellationToken) @@ -192,11 +193,17 @@ public class DbInitialaizer { Text = "Prompt", Role = MessageRoles.User.ToString(), + WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, new Message { Text = "Answer", Role = MessageRoles.Application.ToString(), + WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, } }, @@ -212,6 +219,9 @@ public class DbInitialaizer { Text = "Prompt", Role = MessageRoles.User.ToString(), + WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow } } } @@ -237,7 +247,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/615gxSGp42L._AC_SL1200_.jpg" }, CreatedDateUtc = DateTime.UtcNow, - WasOpened = false + WasOpened = false, + WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd") }, new Product() @@ -254,7 +265,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/61mJ0z7uYQL._AC_SX679_.jpg" }, CreatedDateUtc = DateTime.UtcNow, - WasOpened = false + WasOpened = false, + WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd") }, new Product() @@ -271,7 +283,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/71+JXDDY01L._AC_SX466_.jpg" }, CreatedDateUtc = DateTime.UtcNow, - WasOpened = false + WasOpened = false, + WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab") }, new Product() @@ -288,7 +301,8 @@ public class DbInitialaizer "https://m.media-amazon.com/images/I/71a5As76MDL._AC_SX466_.jpg" }, CreatedDateUtc = DateTime.UtcNow, - WasOpened = false + WasOpened = false, + WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab") } };