diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index a9068c6..5b66554 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -23,6 +23,8 @@ public class DbInitialaizer private readonly ITokensService _tokensService; + private readonly IMongoCollection _userCollection; + private readonly IMongoCollection _wishlistCollection; public IEnumerable Roles { get; set; } @@ -34,6 +36,7 @@ public class DbInitialaizer _userManager = serviceProvider.GetService(); _tokensService = serviceProvider.GetService(); _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); + _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); } public async Task InitialaizeDb(CancellationToken cancellationToken) @@ -166,35 +169,16 @@ public class DbInitialaizer public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) { - var usersPage = await _usersService.GetUsersPageAsync(1, 2, cancellationToken); - var userList = usersPage.Items.ToList(); + var user = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); var wishlists = new Wishlist[] { new Wishlist { - Name = "Grandma's Birthday Gift", - Type = WishlistTypes.Gift.ToString(), - CreatedById = ObjectId.Parse(userList[0].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("ab79cde6f69abcd3efab65cd"), Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), - CreatedById = ObjectId.Parse(userList[1].Id), + CreatedById = user.Id, Messages = new Message[] { new Message diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index b67ad6a..4dbdcf0 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -13,6 +13,12 @@ public class WishlistsTests : IClassFixture> { private readonly HttpClient _httpClient; + private const string WISHLIST_TESTING_USER_EMAIL = "shopping.assistant.team@gmail.com"; + + private const string WISHLIST_TESTING_USER_PASSWORD = "Yuiop12345"; + + private const string TESTING_WISHLIST_ID = "ab79cde6f69abcd3efab65cd"; + public WishlistsTests(TestingFactory factory) { _httpClient = factory.CreateClient(); @@ -22,7 +28,7 @@ public class WishlistsTests : IClassFixture> [Fact] public async Task StartPersonalWishlistAsync_ValidWishlistModel_ReturnsNewWishlistModels() { - var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + 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); @@ -62,7 +68,7 @@ public class WishlistsTests : IClassFixture> [Fact] public async Task GetPersonalWishlistsPage_ValidPageNumberAndSize_ReturnsPage() { - var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + 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); @@ -71,7 +77,7 @@ public class WishlistsTests : IClassFixture> query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }", variables = new { - pageNumber = 3, + pageNumber = 1, pageSize = 1 } }; @@ -88,6 +94,9 @@ public class WishlistsTests : IClassFixture> var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); var personalWishlistCreatedById = (string) personalWishlistsPageItems[0].createdById; + Console.WriteLine(personalWishlistsPageItems[0].id); + Console.WriteLine(personalWishlistsPageItems[0].name); + Console.WriteLine(personalWishlistsPageItems[0].type); Assert.NotEmpty(personalWishlistsPageItems); Assert.Equal(user.Id, personalWishlistCreatedById); @@ -96,39 +105,10 @@ public class WishlistsTests : IClassFixture> [Fact] public async Task AddMessageToPersonalWishlist_ValidMessageModel_ReturnsNewMessageModel() { - var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + 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); - // Get personal wishlist - - var query = new - { - query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }", - variables = new - { - pageNumber = 3, - pageSize = 1 - } - }; - - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - - using var personalWishlistPageResponse = await _httpClient.PostAsync("graphql", content); - personalWishlistPageResponse.EnsureSuccessStatusCode(); - Assert.Equal(HttpStatusCode.OK, personalWishlistPageResponse.StatusCode); - - var responseString = await personalWishlistPageResponse.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - - var personalWishlistsPageItems = Enumerable.ToList(document.data.personalWishlistsPage.items); - var personalWishlistId = (string) personalWishlistsPageItems[0].id; - - Assert.NotNull(personalWishlistId); - - // Add message to personal wishlist - const string MESSAGE_TEXT = "Second Message"; var mutation = new @@ -136,23 +116,23 @@ public class WishlistsTests : IClassFixture> query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", variables = new { - wishlistId = personalWishlistId, + wishlistId = TESTING_WISHLIST_ID, dto = new { - text = MESSAGE_TEXT, + text = MESSAGE_TEXT } } }; - jsonPayload = JsonConvert.SerializeObject(mutation); - content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - using var addMessageToPersonalWishlistResponse = await _httpClient.PostAsync("graphql", content); - addMessageToPersonalWishlistResponse.EnsureSuccessStatusCode(); - Assert.Equal(HttpStatusCode.OK, addMessageToPersonalWishlistResponse.StatusCode); + using var response = await _httpClient.PostAsync("graphql", content); + response.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); - responseString = await addMessageToPersonalWishlistResponse.Content.ReadAsStringAsync(); - document = JsonConvert.DeserializeObject(responseString); + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); var messageRole = (string) document.data.addMessageToPersonalWishlist.role; var messageText = (string) document.data.addMessageToPersonalWishlist.text; @@ -166,7 +146,7 @@ public class WishlistsTests : IClassFixture> [Fact] public async Task StartPersonalWishlistAsync_InvalidWishlistModel_ReturnsInternalServerError() { - var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + 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); @@ -193,7 +173,7 @@ public class WishlistsTests : IClassFixture> [Fact] public async Task AddMessageToPersonalWishlist_InvalidMessageModel_ReturnsInternalServerError() { - var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + 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);