From ae37f4952e821d0af8d090bd962a9529f9f345dd Mon Sep 17 00:00:00 2001 From: Mykhailo Date: Fri, 22 Sep 2023 23:02:20 +0300 Subject: [PATCH 01/85] SA-7 project created --- .devcontainer/devcontainer.json | 35 ++ .gitignore | 3 + .vscode/launch.json | 33 ++ .vscode/tasks.json | 41 +++ .../ApiExtentions/GlobalUserExtention.cs | 12 + .../ApiExtentions/GraphQlExtention.cs | 24 ++ .../Controllers/WeatherForecastController.cs | 31 ++ .../GlobalUserCustomMiddleware.cs | 30 ++ .../Mutations/AccessMutation.cs | 20 ++ .../Mutations/RolesMutation.cs | 23 ++ .../Mutations/UsersMutation.cs | 20 ++ ShoppingAssistantApi.Api/Program.cs | 49 +++ .../Properties/launchSettings.json | 41 +++ .../Queries/RolesQuery.cs | 15 + .../Queries/UsersQuery.cs | 26 ++ .../ShoppingAssistantApi.Api.csproj | 24 ++ ShoppingAssistantApi.Api/WeatherForecast.cs | 12 + ShoppingAssistantApi.Api/appsettings.json | 9 + .../ApplicationExtensions/MapperExtension.cs | 15 + .../EntityAlreadyExistsException.cs | 14 + .../Exceptions/EntityNotFoundException.cs | 12 + .../Exceptions/InvalidEmailException.cs | 8 + .../Exceptions/InvalidPhoneNumberException.cs | 8 + .../GlobalInstances/GlobalUser.cs | 13 + .../IRepositories/IBaseRepository.cs | 21 ++ .../IRepositories/IRolesRepository.cs | 12 + .../IRepositories/IUsersRepository.cs | 15 + .../IServices/IRolesService.cs | 12 + .../IServices/IUsersService.cs | 15 + .../IServices/Identity/IPasswordHasher.cs | 8 + .../IServices/Identity/ITokensService.cs | 13 + .../IServices/Identity/IUsersManager.cs | 20 ++ .../MappingProfiles/RoleProfile.cs | 15 + .../MappingProfiles/UserProfile.cs | 12 + .../Models/CreateDtos/RoleCreateDto.cs | 6 + .../Models/Dtos/RoleDto.cs | 8 + .../Models/Dtos/UserDto.cs | 20 ++ .../Models/Identity/AccessGuestModel.cs | 6 + .../Models/Identity/AccessUserModel.cs | 10 + .../Models/Identity/TokensModel.cs | 8 + .../Models/Operations/UpdateUserModel.cs | 11 + .../Paging/PageParameters.cs | 8 + .../Paging/PagedList.cs | 30 ++ .../ShoppingAssistantApi.Application.csproj | 19 ++ .../Common/EntityBase.cs | 20 ++ ShoppingAssistantApi.Domain/Entities/Role.cs | 8 + ShoppingAssistantApi.Domain/Entities/User.cs | 20 ++ .../ShoppingAssistantApi.Domain.csproj | 13 + .../JwtTokenAuthenticationExtention.cs | 32 ++ .../ServicesExtention.cs | 20 ++ .../Services/Identity/PasswordHasher.cs | 55 ++++ .../Services/Identity/TokensService.cs | 127 ++++++++ .../Services/Identity/UserManager.cs | 302 ++++++++++++++++++ .../Services/RolesService.cs | 46 +++ .../Services/UsersService.cs | 62 ++++ ...ShoppingAssistantApi.Infrastructure.csproj | 22 ++ .../Database/MongoDbContext.cs | 19 ++ .../PersistanceExtentions/DbInitialaizer.cs | 161 ++++++++++ .../RepositoriesExtention.cs | 19 ++ .../Repositories/BaseRepository.cs | 72 +++++ .../Repositories/RolesRepository.cs | 23 ++ .../Repositories/UsersRepository.cs | 48 +++ .../ShoppingAssistantApi.Persistance.csproj | 19 ++ .../ShoppingAssistantApi.Tests.csproj | 35 ++ .../TestExtentions/AccessExtention.cs | 65 ++++ .../TestExtentions/TestingFactory.cs | 48 +++ .../TestExtentions/UserExtention.cs | 50 +++ .../Tests/AccessTests.cs | 203 ++++++++++++ .../Tests/RolesTests.cs | 184 +++++++++++ .../Tests/UsersTests.cs | 240 ++++++++++++++ ShoppingAssistantApi.sln | 55 ++++ 71 files changed, 2755 insertions(+) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json create mode 100644 ShoppingAssistantApi.Api/ApiExtentions/GlobalUserExtention.cs create mode 100644 ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs create mode 100644 ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs create mode 100644 ShoppingAssistantApi.Api/CustomMiddlewares/GlobalUserCustomMiddleware.cs create mode 100644 ShoppingAssistantApi.Api/Mutations/AccessMutation.cs create mode 100644 ShoppingAssistantApi.Api/Mutations/RolesMutation.cs create mode 100644 ShoppingAssistantApi.Api/Mutations/UsersMutation.cs create mode 100644 ShoppingAssistantApi.Api/Program.cs create mode 100644 ShoppingAssistantApi.Api/Properties/launchSettings.json create mode 100644 ShoppingAssistantApi.Api/Queries/RolesQuery.cs create mode 100644 ShoppingAssistantApi.Api/Queries/UsersQuery.cs create mode 100644 ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj create mode 100644 ShoppingAssistantApi.Api/WeatherForecast.cs create mode 100644 ShoppingAssistantApi.Api/appsettings.json create mode 100644 ShoppingAssistantApi.Application/ApplicationExtensions/MapperExtension.cs create mode 100644 ShoppingAssistantApi.Application/Exceptions/EntityAlreadyExistsException.cs create mode 100644 ShoppingAssistantApi.Application/Exceptions/EntityNotFoundException.cs create mode 100644 ShoppingAssistantApi.Application/Exceptions/InvalidEmailException.cs create mode 100644 ShoppingAssistantApi.Application/Exceptions/InvalidPhoneNumberException.cs create mode 100644 ShoppingAssistantApi.Application/GlobalInstances/GlobalUser.cs create mode 100644 ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs create mode 100644 ShoppingAssistantApi.Application/IRepositories/IRolesRepository.cs create mode 100644 ShoppingAssistantApi.Application/IRepositories/IUsersRepository.cs create mode 100644 ShoppingAssistantApi.Application/IServices/IRolesService.cs create mode 100644 ShoppingAssistantApi.Application/IServices/IUsersService.cs create mode 100644 ShoppingAssistantApi.Application/IServices/Identity/IPasswordHasher.cs create mode 100644 ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs create mode 100644 ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs create mode 100644 ShoppingAssistantApi.Application/MappingProfiles/RoleProfile.cs create mode 100644 ShoppingAssistantApi.Application/MappingProfiles/UserProfile.cs create mode 100644 ShoppingAssistantApi.Application/Models/CreateDtos/RoleCreateDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Dtos/RoleDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Dtos/UserDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Identity/AccessGuestModel.cs create mode 100644 ShoppingAssistantApi.Application/Models/Identity/AccessUserModel.cs create mode 100644 ShoppingAssistantApi.Application/Models/Identity/TokensModel.cs create mode 100644 ShoppingAssistantApi.Application/Models/Operations/UpdateUserModel.cs create mode 100644 ShoppingAssistantApi.Application/Paging/PageParameters.cs create mode 100644 ShoppingAssistantApi.Application/Paging/PagedList.cs create mode 100644 ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj create mode 100644 ShoppingAssistantApi.Domain/Common/EntityBase.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/Role.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/User.cs create mode 100644 ShoppingAssistantApi.Domain/ShoppingAssistantApi.Domain.csproj create mode 100644 ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/JwtTokenAuthenticationExtention.cs create mode 100644 ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/Identity/PasswordHasher.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/RolesService.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/UsersService.cs create mode 100644 ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj create mode 100644 ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs create mode 100644 ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs create mode 100644 ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs create mode 100644 ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj create mode 100644 ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj create mode 100644 ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs create mode 100644 ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs create mode 100644 ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/AccessTests.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/RolesTests.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/UsersTests.cs create mode 100644 ShoppingAssistantApi.sln diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..0e6d68c --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,35 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet +{ + "name": "Shopping Assistant C# (.NET)", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/dotnet:0-7.0", + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [5000, 5001], + // "portsAttributes": { + // "5001": { + // "protocol": "https" + // } + // } + "customizations": { + "vscode": { + "extensions": [ + "kreativ-software.csharpextensions", + "ms-dotnettools.csharp", + "patcx.vscode-nuget-gallery", + "mhutchie.git-graph" + ] + } + } + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "dotnet restore", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.gitignore b/.gitignore index 8a30d25..d20cf74 100644 --- a/.gitignore +++ b/.gitignore @@ -266,6 +266,9 @@ ServiceFabricBackup/ *.ldf *.ndf +# appsettings.Development.json file (ignore it) +appsettings.Development.json + # Business Intelligence projects *.rdl.data *.bim.layout diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..8c2fed8 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (web)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/ShoppingAssistantApi.Api/bin/Debug/net7.0/ShoppingAssistantApi.Api.dll", + "args": [], + "cwd": "${workspaceFolder}/ShoppingAssistantApi.Api", + "stopAtEntry": false, + "serverReadyAction": { + "action": "openExternally", + "pattern": "\\bNow listening on:\\s+(https?://\\S+)" + }, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..6719ec4 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/ApiExtentions/GlobalUserExtention.cs b/ShoppingAssistantApi.Api/ApiExtentions/GlobalUserExtention.cs new file mode 100644 index 0000000..45f0b45 --- /dev/null +++ b/ShoppingAssistantApi.Api/ApiExtentions/GlobalUserExtention.cs @@ -0,0 +1,12 @@ +using ShoppingAssistantApi.Api.CustomMiddlewares; + +namespace ShoppingAssistantApi.Api.ApiExtentions; + +public static class GlobalUserExtention +{ + public static IApplicationBuilder AddGlobalUserMiddleware(this IApplicationBuilder app) + { + app.UseMiddleware(); + return app; + } +} diff --git a/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs new file mode 100644 index 0000000..1d67391 --- /dev/null +++ b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs @@ -0,0 +1,24 @@ +using ShoppingAssistantApi.Api.Queries; +using ShoppingAssistantApi.Api.Mutations; + +namespace ShoppingAssistantApi.Api.ApiExtentions; + +public static class GraphQlExtention +{ + public static IServiceCollection AddGraphQl(this IServiceCollection services) + { + services + .AddGraphQLServer() + .AddQueryType() + .AddTypeExtension() + .AddTypeExtension() + .AddMutationType() + .AddTypeExtension() + .AddTypeExtension() + .AddTypeExtension() + .AddAuthorization() + .InitializeOnStartup(keepWarm: true); + + return services; + } +} diff --git a/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs b/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs new file mode 100644 index 0000000..86d61b0 --- /dev/null +++ b/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs @@ -0,0 +1,31 @@ +using Microsoft.AspNetCore.Mvc; + +namespace ShoppingAssistantApi.Api.Controllers; +[ApiController] +[Route("[controller]")] +public class WeatherForecastController : ControllerBase +{ + private static readonly string[] Summaries = new[] + { + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + }; + + private readonly ILogger _logger; + + public WeatherForecastController(ILogger logger) + { + _logger = logger; + } + + [HttpGet(Name = "GetWeatherForecast")] + public IEnumerable Get() + { + return Enumerable.Range(1, 5).Select(index => new WeatherForecast + { + Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), + TemperatureC = Random.Shared.Next(-20, 55), + Summary = Summaries[Random.Shared.Next(Summaries.Length)] + }) + .ToArray(); + } +} diff --git a/ShoppingAssistantApi.Api/CustomMiddlewares/GlobalUserCustomMiddleware.cs b/ShoppingAssistantApi.Api/CustomMiddlewares/GlobalUserCustomMiddleware.cs new file mode 100644 index 0000000..ee05ac0 --- /dev/null +++ b/ShoppingAssistantApi.Api/CustomMiddlewares/GlobalUserCustomMiddleware.cs @@ -0,0 +1,30 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Application.GlobalInstances; +using System.Security.Claims; + +namespace ShoppingAssistantApi.Api.CustomMiddlewares; + +public class GlobalUserCustomMiddleware +{ + private readonly RequestDelegate _next; + + public GlobalUserCustomMiddleware(RequestDelegate next) + { + this._next = next; + } + + public async Task InvokeAsync(HttpContext httpContext) + { + if (ObjectId.TryParse(httpContext.User.FindFirst(ClaimTypes.NameIdentifier)?.Value, out ObjectId id)) + { + GlobalUser.Id = id; + } + GlobalUser.Email = httpContext.User.FindFirst(ClaimTypes.Email)?.Value; + GlobalUser.Phone = httpContext.User.FindFirst(ClaimTypes.MobilePhone)?.Value; + foreach (var role in httpContext.User.FindAll(ClaimTypes.Role)) + { + GlobalUser.Roles.Add(role.Value); + } + await this._next(httpContext); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs b/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs new file mode 100644 index 0000000..7abc641 --- /dev/null +++ b/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs @@ -0,0 +1,20 @@ +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Api.Mutations; + +[ExtendObjectType(OperationTypeNames.Mutation)] +public class AccessMutation +{ + public Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.LoginAsync(login, cancellationToken); + + public Task AccessGuestAsync(AccessGuestModel guest, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.AccessGuestAsync(guest, cancellationToken); + + public Task RefreshUserTokenAsync(TokensModel model, CancellationToken cancellationToken, + [Service] ITokensService tokensService) + => tokensService.RefreshUserAsync(model, cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs b/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs new file mode 100644 index 0000000..a4c98bb --- /dev/null +++ b/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs @@ -0,0 +1,23 @@ +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Api.Mutations; + +[ExtendObjectType(OperationTypeNames.Mutation)] +public class RolesMutation +{ + public Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.AddToRoleAsync(roleName, id, cancellationToken); + + public Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.RemoveFromRoleAsync(roleName, id, cancellationToken); + + public Task AddRole(RoleCreateDto roleDto, CancellationToken cancellationToken, + [Service] IRolesService rolesService) + => rolesService.AddRoleAsync(roleDto, cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs b/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs new file mode 100644 index 0000000..1185f97 --- /dev/null +++ b/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs @@ -0,0 +1,20 @@ +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Operations; +using HotChocolate.Authorization; + +namespace ShoppingAssistantApi.Api.Mutations; + +[ExtendObjectType(OperationTypeNames.Mutation)] +public class UsersMutation +{ + [Authorize] + public Task UpdateUserAsync(UserDto userDto, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.UpdateAsync(userDto, cancellationToken); + + [Authorize] + public Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.UpdateUserByAdminAsync(id, userDto, cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs new file mode 100644 index 0000000..affb266 --- /dev/null +++ b/ShoppingAssistantApi.Api/Program.cs @@ -0,0 +1,49 @@ +using ShoppingAssistantApi.Application.ApplicationExtentions; +using ShoppingAssistantApi.Persistance.PersistanceExtentions; +using ShoppingAssistantApi.Infrastructure.InfrastructureExtentions; +using ShoppingAssistantApi.Api.ApiExtentions; + +var builder = WebApplication.CreateBuilder(args); + +// Add services to the container. + +// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle +builder.Services.AddJWTTokenAuthentication(builder.Configuration); +builder.Services.AddMapper(); +builder.Services.AddInfrastructure(); +builder.Services.AddServices(); +builder.Services.AddGraphQl(); +builder.Services.AddControllers(); + +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.UseAuthentication(); +app.UseAuthorization(); +app.AddGlobalUserMiddleware(); + +app.MapGraphQL(); + +app.MapControllers(); +/* +using var scope = app.Services.CreateScope(); +var serviceProvider = scope.ServiceProvider; +using var cancellationTokenSource = new CancellationTokenSource(); +var cancellationToken = cancellationTokenSource.Token; +var initializer = new DbInitialaizer(serviceProvider); +initializer.InitialaizeDb(cancellationToken); +*/ +app.Run(); + +public partial class Program { } \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Properties/launchSettings.json b/ShoppingAssistantApi.Api/Properties/launchSettings.json new file mode 100644 index 0000000..9d74749 --- /dev/null +++ b/ShoppingAssistantApi.Api/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8125", + "sslPort": 44361 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5183", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7268;http://localhost:5183", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/ShoppingAssistantApi.Api/Queries/RolesQuery.cs b/ShoppingAssistantApi.Api/Queries/RolesQuery.cs new file mode 100644 index 0000000..a542416 --- /dev/null +++ b/ShoppingAssistantApi.Api/Queries/RolesQuery.cs @@ -0,0 +1,15 @@ +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; +using HotChocolate.Authorization; + +namespace ShoppingAssistantApi.Api.Queries; + +[ExtendObjectType(OperationTypeNames.Query)] +public class RolesQuery +{ + [Authorize] + public Task> GetRolesPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken, + [Service] IRolesService service) + => service.GetRolesPageAsync(pageNumber, pageSize, cancellationToken); +} diff --git a/ShoppingAssistantApi.Api/Queries/UsersQuery.cs b/ShoppingAssistantApi.Api/Queries/UsersQuery.cs new file mode 100644 index 0000000..8fc7139 --- /dev/null +++ b/ShoppingAssistantApi.Api/Queries/UsersQuery.cs @@ -0,0 +1,26 @@ +using HotChocolate.Authorization; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; + +namespace ShoppingAssistantApi.Api.Queries; + +[ExtendObjectType(OperationTypeNames.Query)] +public class UsersQuery +{ + [Authorize] + public Task GetUserAsync(string id, CancellationToken cancellationToken, + [Service] IUsersService usersService) + => usersService.GetUserAsync(id, cancellationToken); + + [Authorize] + public Task GetCurrentUserAsync(CancellationToken cancellationToken, + [Service] IUsersService usersService) + => usersService.GetUserAsync(GlobalUser.Id.ToString(), cancellationToken); + + [Authorize] + public Task> GetUsersPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken, + [Service] IUsersService usersService) + => usersService.GetUsersPageAsync(pageNumber, pageSize, cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj new file mode 100644 index 0000000..33cec29 --- /dev/null +++ b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj @@ -0,0 +1,24 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + diff --git a/ShoppingAssistantApi.Api/WeatherForecast.cs b/ShoppingAssistantApi.Api/WeatherForecast.cs new file mode 100644 index 0000000..360f533 --- /dev/null +++ b/ShoppingAssistantApi.Api/WeatherForecast.cs @@ -0,0 +1,12 @@ +namespace ShoppingAssistantApi.Api; + +public class WeatherForecast +{ + public DateOnly Date { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + + public string? Summary { get; set; } +} diff --git a/ShoppingAssistantApi.Api/appsettings.json b/ShoppingAssistantApi.Api/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/ShoppingAssistantApi.Api/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/ShoppingAssistantApi.Application/ApplicationExtensions/MapperExtension.cs b/ShoppingAssistantApi.Application/ApplicationExtensions/MapperExtension.cs new file mode 100644 index 0000000..2083457 --- /dev/null +++ b/ShoppingAssistantApi.Application/ApplicationExtensions/MapperExtension.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.DependencyInjection; +using ShoppingAssistantApi.Application.MappingProfiles; +using System.Reflection; + +namespace ShoppingAssistantApi.Application.ApplicationExtentions; + +public static class MapperExtension +{ + public static IServiceCollection AddMapper(this IServiceCollection services) + { + services.AddAutoMapper(Assembly.GetAssembly(typeof(UserProfile))); + + return services; + } +} diff --git a/ShoppingAssistantApi.Application/Exceptions/EntityAlreadyExistsException.cs b/ShoppingAssistantApi.Application/Exceptions/EntityAlreadyExistsException.cs new file mode 100644 index 0000000..dad1ea8 --- /dev/null +++ b/ShoppingAssistantApi.Application/Exceptions/EntityAlreadyExistsException.cs @@ -0,0 +1,14 @@ +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Application.Exceptions; +public class EntityAlreadyExistsException : Exception where TEntity : EntityBase +{ + public EntityAlreadyExistsException() + : base($"\"{typeof(TEntity).Name}\" already exists.") { } + + public EntityAlreadyExistsException(string message, Exception innerException) + : base(message, innerException) { } + + public EntityAlreadyExistsException(string paramName, string paramValue) + : base($"\"{typeof(TEntity).Name}\" with {paramName}: \"{paramValue}\" already exists.") { } +} diff --git a/ShoppingAssistantApi.Application/Exceptions/EntityNotFoundException.cs b/ShoppingAssistantApi.Application/Exceptions/EntityNotFoundException.cs new file mode 100644 index 0000000..dd8d58b --- /dev/null +++ b/ShoppingAssistantApi.Application/Exceptions/EntityNotFoundException.cs @@ -0,0 +1,12 @@ +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Application.Exceptions; + +public class EntityNotFoundException : Exception where TEntity : EntityBase +{ + public EntityNotFoundException() + : base($"\"{typeof(TEntity).Name}\" was not found.") { } + + public EntityNotFoundException(string message, Exception innerException) + : base(message, innerException) { } +} diff --git a/ShoppingAssistantApi.Application/Exceptions/InvalidEmailException.cs b/ShoppingAssistantApi.Application/Exceptions/InvalidEmailException.cs new file mode 100644 index 0000000..c0a273f --- /dev/null +++ b/ShoppingAssistantApi.Application/Exceptions/InvalidEmailException.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Exceptions; + +public class InvalidEmailException : Exception +{ + public InvalidEmailException() { } + + public InvalidEmailException(string email) : base(String.Format($"String {email} can not be an email.")) { } +} diff --git a/ShoppingAssistantApi.Application/Exceptions/InvalidPhoneNumberException.cs b/ShoppingAssistantApi.Application/Exceptions/InvalidPhoneNumberException.cs new file mode 100644 index 0000000..14343bd --- /dev/null +++ b/ShoppingAssistantApi.Application/Exceptions/InvalidPhoneNumberException.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Exceptions; + +public class InvalidPhoneNumberException : Exception +{ + public InvalidPhoneNumberException() { } + + public InvalidPhoneNumberException(string phone) : base(String.Format($"String {phone} can not be a phone number.")) { } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/GlobalInstances/GlobalUser.cs b/ShoppingAssistantApi.Application/GlobalInstances/GlobalUser.cs new file mode 100644 index 0000000..6cca7a9 --- /dev/null +++ b/ShoppingAssistantApi.Application/GlobalInstances/GlobalUser.cs @@ -0,0 +1,13 @@ +using MongoDB.Bson; + +namespace ShoppingAssistantApi.Application.GlobalInstances; +public static class GlobalUser +{ + public static ObjectId? Id { get; set; } + + public static string? Email { get; set; } + + public static string? Phone { get; set; } + + public static List? Roles { get; set; } = new List(); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs new file mode 100644 index 0000000..f2a2ceb --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs @@ -0,0 +1,21 @@ +using ShoppingAssistantApi.Domain.Common; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IBaseRepository where TEntity : EntityBase +{ + Task AddAsync(TEntity entity, CancellationToken cancellationToken); + + Task> GetPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); + + Task> GetPageAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken); + + Task ExistsAsync(Expression> predicate, CancellationToken cancellationToken); + + Task GetTotalCountAsync(); + + Task GetCountAsync(Expression> predicate, CancellationToken cancellationToken); + + Task DeleteAsync(TEntity entity, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IRepositories/IRolesRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IRolesRepository.cs new file mode 100644 index 0000000..abdbd4e --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IRolesRepository.cs @@ -0,0 +1,12 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Entities; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IRolesRepository : IBaseRepository +{ + Task GetRoleAsync(ObjectId id, CancellationToken cancellationToken); + + Task GetRoleAsync(Expression> predicate, CancellationToken cancellationToken); +} diff --git a/ShoppingAssistantApi.Application/IRepositories/IUsersRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IUsersRepository.cs new file mode 100644 index 0000000..333ff6c --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IUsersRepository.cs @@ -0,0 +1,15 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Entities; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IUsersRepository : IBaseRepository +{ + Task GetUserAsync(ObjectId id, CancellationToken cancellationToken); + + Task GetUserAsync(Expression> predicate, CancellationToken cancellationToken); + + Task UpdateUserAsync(User user, CancellationToken cancellationToken); +} + diff --git a/ShoppingAssistantApi.Application/IServices/IRolesService.cs b/ShoppingAssistantApi.Application/IServices/IRolesService.cs new file mode 100644 index 0000000..917568f --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/IRolesService.cs @@ -0,0 +1,12 @@ +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IRolesService +{ + Task AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken); + + Task> GetRolesPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/IUsersService.cs b/ShoppingAssistantApi.Application/IServices/IUsersService.cs new file mode 100644 index 0000000..25fcab4 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/IUsersService.cs @@ -0,0 +1,15 @@ +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IUsersService +{ + Task AddUserAsync(UserDto dto, CancellationToken cancellationToken); + + Task> GetUsersPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); + + Task GetUserAsync(string id, CancellationToken cancellationToken); + + Task UpdateUserAsync(UserDto dto, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/Identity/IPasswordHasher.cs b/ShoppingAssistantApi.Application/IServices/Identity/IPasswordHasher.cs new file mode 100644 index 0000000..8a9de27 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/Identity/IPasswordHasher.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.IServices.Identity; + +public interface IPasswordHasher +{ + string Hash(string password); + + bool Check(string password, string passwordHash); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs b/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs new file mode 100644 index 0000000..2dda569 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs @@ -0,0 +1,13 @@ +using ShoppingAssistantApi.Application.Models.Identity; +using System.Security.Claims; + +namespace ShoppingAssistantApi.Application.IServices.Identity; + +public interface ITokensService +{ + string GenerateAccessToken(IEnumerable claims); + + string GenerateRefreshToken(); + + Task RefreshUserAsync(TokensModel tokensModel, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs b/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs new file mode 100644 index 0000000..72c84ae --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs @@ -0,0 +1,20 @@ +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; +using ShoppingAssistantApi.Application.Models.Operations; + +namespace ShoppingAssistantApi.Application.IServices.Identity; + +public interface IUserManager +{ + Task AccessGuestAsync(AccessGuestModel guest, CancellationToken cancellationToken); + + Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken); + + Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken); + + Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken); + + Task UpdateAsync(UserDto userDto, CancellationToken cancellationToken); + + Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/MappingProfiles/RoleProfile.cs b/ShoppingAssistantApi.Application/MappingProfiles/RoleProfile.cs new file mode 100644 index 0000000..54c4d64 --- /dev/null +++ b/ShoppingAssistantApi.Application/MappingProfiles/RoleProfile.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 RoleProfile : Profile +{ + public RoleProfile() + { + CreateMap().ReverseMap(); + + CreateMap().ReverseMap(); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/MappingProfiles/UserProfile.cs b/ShoppingAssistantApi.Application/MappingProfiles/UserProfile.cs new file mode 100644 index 0000000..0cac656 --- /dev/null +++ b/ShoppingAssistantApi.Application/MappingProfiles/UserProfile.cs @@ -0,0 +1,12 @@ +using AutoMapper; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.MappingProfiles; +public class UserProfile : Profile +{ + public UserProfile() + { + CreateMap().ReverseMap(); + } +} diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/RoleCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/RoleCreateDto.cs new file mode 100644 index 0000000..0d8ae55 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/RoleCreateDto.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.CreateDtos; + +public class RoleCreateDto +{ + public string Name { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/RoleDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/RoleDto.cs new file mode 100644 index 0000000..e68b4fd --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Dtos/RoleDto.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Models.Dtos; + +public class RoleDto +{ + public string Id { get; set; } + + public string Name { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/UserDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/UserDto.cs new file mode 100644 index 0000000..d335ef0 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Dtos/UserDto.cs @@ -0,0 +1,20 @@ + namespace ShoppingAssistantApi.Application.Models.Dtos; + +public class UserDto +{ + public string Id { get; set; } + + public Guid? GuestId { get; set; } + + public List Roles { get; set; } + + public string? Phone { get; set; } + + public string? Email { get; set; } + + public string? Password { get; set; } + + public string? RefreshToken { get; set; } + + public DateTime? RefreshTokenExpiryDate { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Identity/AccessGuestModel.cs b/ShoppingAssistantApi.Application/Models/Identity/AccessGuestModel.cs new file mode 100644 index 0000000..2247446 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Identity/AccessGuestModel.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.Identity; + +public class AccessGuestModel +{ + public Guid GuestId { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Identity/AccessUserModel.cs b/ShoppingAssistantApi.Application/Models/Identity/AccessUserModel.cs new file mode 100644 index 0000000..430571f --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Identity/AccessUserModel.cs @@ -0,0 +1,10 @@ +namespace ShoppingAssistantApi.Application.Models.Identity; + +public class AccessUserModel +{ + public string? Email { get; set; } + + public string? Phone { get; set; } + + public string Password { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/Identity/TokensModel.cs b/ShoppingAssistantApi.Application/Models/Identity/TokensModel.cs new file mode 100644 index 0000000..2432e4d --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Identity/TokensModel.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Models.Identity; + +public class TokensModel +{ + public string AccessToken { get; set; } + + public string RefreshToken { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/Operations/UpdateUserModel.cs b/ShoppingAssistantApi.Application/Models/Operations/UpdateUserModel.cs new file mode 100644 index 0000000..12a58b8 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Operations/UpdateUserModel.cs @@ -0,0 +1,11 @@ +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Application.Models.Operations; + +public class UpdateUserModel +{ + public TokensModel Tokens { get; set; } + + public UserDto User { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Paging/PageParameters.cs b/ShoppingAssistantApi.Application/Paging/PageParameters.cs new file mode 100644 index 0000000..c367829 --- /dev/null +++ b/ShoppingAssistantApi.Application/Paging/PageParameters.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Paging; + +public class PageParameters +{ + public int PageSize { get; set; } + + public int PageNumber { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Paging/PagedList.cs b/ShoppingAssistantApi.Application/Paging/PagedList.cs new file mode 100644 index 0000000..124660b --- /dev/null +++ b/ShoppingAssistantApi.Application/Paging/PagedList.cs @@ -0,0 +1,30 @@ +namespace ShoppingAssistantApi.Application.Paging; + +public class PagedList +{ + public IEnumerable Items { get; set; } + + public int PageNumber { get; set; } + + public int PageSize { get; set; } + + public int TotalPages { get; set; } + + public int TotalItems { get; set; } + + public bool HasPreviousPage => PageNumber > 1; + + public bool HasNextPage => PageNumber < TotalPages; + + public PagedList() { } + + public PagedList(IEnumerable items, int pageNumber, int pageSize, int totalItems) + { + this.PageNumber = pageNumber; + this.PageSize = pageSize; + this.TotalItems = totalItems; + this.TotalPages = (int)Math.Ceiling(totalItems / (double)pageSize); + + this.Items = items; + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj b/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj new file mode 100644 index 0000000..46083d4 --- /dev/null +++ b/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj @@ -0,0 +1,19 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + diff --git a/ShoppingAssistantApi.Domain/Common/EntityBase.cs b/ShoppingAssistantApi.Domain/Common/EntityBase.cs new file mode 100644 index 0000000..8616f21 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Common/EntityBase.cs @@ -0,0 +1,20 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace ShoppingAssistantApi.Domain.Common; + +public abstract class EntityBase +{ + [BsonId] + public ObjectId Id { get; set; } + + public ObjectId CreatedById { get; set; } + + public DateTime CreatedDateUtc { get; set; } + + public bool IsDeleted { get; set; } + + public ObjectId? LastModifiedById { get; set; } + + public DateTime? LastModifiedDateUtc { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Domain/Entities/Role.cs b/ShoppingAssistantApi.Domain/Entities/Role.cs new file mode 100644 index 0000000..b91b7ff --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/Role.cs @@ -0,0 +1,8 @@ +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class Role : EntityBase +{ + public string Name { get; set; } +} diff --git a/ShoppingAssistantApi.Domain/Entities/User.cs b/ShoppingAssistantApi.Domain/Entities/User.cs new file mode 100644 index 0000000..7f5a0b1 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/User.cs @@ -0,0 +1,20 @@ +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class User : EntityBase +{ + public Guid GuestId { get; set; } + + public List Roles { get; set; } + + public string? Phone { get; set; } + + public string? Email { get; set; } + + public string? PasswordHash { get; set; } + + public string RefreshToken { get; set; } + + public DateTime RefreshTokenExpiryDate { get; set; } +} diff --git a/ShoppingAssistantApi.Domain/ShoppingAssistantApi.Domain.csproj b/ShoppingAssistantApi.Domain/ShoppingAssistantApi.Domain.csproj new file mode 100644 index 0000000..98d5469 --- /dev/null +++ b/ShoppingAssistantApi.Domain/ShoppingAssistantApi.Domain.csproj @@ -0,0 +1,13 @@ + + + + net7.0 + enable + enable + + + + + + + diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/JwtTokenAuthenticationExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/JwtTokenAuthenticationExtention.cs new file mode 100644 index 0000000..4d99132 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/JwtTokenAuthenticationExtention.cs @@ -0,0 +1,32 @@ +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; +using System.Text; + +namespace ShoppingAssistantApi.Infrastructure.InfrastructureExtentions; + +public static class JwtTokenAuthenticationExtention +{ + public static IServiceCollection AddJWTTokenAuthentication(this IServiceCollection services, + IConfiguration configuration) + { + services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(options => + { + options.TokenValidationParameters = new TokenValidationParameters + { + ValidateIssuer = configuration.GetValue("JsonWebTokenKeys:ValidateIssuer"), + ValidateAudience = configuration.GetValue("JsonWebTokenKeys:ValidateAudience"), + ValidateLifetime = configuration.GetValue("JsonWebTokenKeys:ValidateLifetime"), + ValidateIssuerSigningKey = configuration.GetValue("JsonWebTokenKeys:ValidateIssuerSigningKey"), + ValidIssuer = configuration.GetValue("JsonWebTokenKeys:ValidIssuer"), + ValidAudience = configuration.GetValue("JsonWebTokenKeys:ValidAudience"), + IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetValue("JsonWebTokenKeys:IssuerSigningKey"))), + ClockSkew = TimeSpan.Zero + }; + }); + + return services; + } +} diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs new file mode 100644 index 0000000..a462de4 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -0,0 +1,20 @@ +using Microsoft.Extensions.DependencyInjection; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Infrastructure.Services; +using ShoppingAssistantApi.Infrastructure.Services.Identity; + +namespace ShoppingAssistantApi.Infrastructure.InfrastructureExtentions; +public static class ServicesExtention +{ + public static IServiceCollection AddServices(this IServiceCollection services) + { + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + + return services; + } +} diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/PasswordHasher.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/PasswordHasher.cs new file mode 100644 index 0000000..39002bb --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/PasswordHasher.cs @@ -0,0 +1,55 @@ +using Microsoft.Extensions.Logging; +using ShoppingAssistantApi.Application.IServices.Identity; +using System.Security.Cryptography; + +namespace ShoppingAssistantApi.Infrastructure.Services.Identity; +public class PasswordHasher : IPasswordHasher +{ + private const int SaltSize = 16; + + private const int KeySize = 32; + + private readonly int _iterations; + + private readonly ILogger _logger; + + public PasswordHasher(ILogger logger) + { + var random = new Random(); + this._iterations = random.Next(100, 1000); + this._logger = logger; + } + + public string Hash(string password) + { + using (var algorithm = new Rfc2898DeriveBytes(password, SaltSize, _iterations, + HashAlgorithmName.SHA256)) + { + var key = Convert.ToBase64String(algorithm.GetBytes(KeySize)); + var salt = Convert.ToBase64String(algorithm.Salt); + + this._logger.LogInformation($"Hashed password."); + + return $"{this._iterations}.{salt}.{key}"; + } + } + + public bool Check(string password, string passwordHash) + { + var parts = passwordHash.Split(".", 3); + + var iterations = Convert.ToInt32(parts[0]); + var salt = Convert.FromBase64String(parts[1]); + var userKey = parts[2]; + + using (var algorithm = new Rfc2898DeriveBytes(password, salt, iterations, + HashAlgorithmName.SHA256)) + { + var key = Convert.ToBase64String(algorithm.GetBytes(KeySize)); + + this._logger.LogInformation($"Checked password."); + + return key == userKey; + } + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs new file mode 100644 index 0000000..2ea9728 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs @@ -0,0 +1,127 @@ +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Security.Cryptography; +using System.Text; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.Tokens; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Infrastructure.Services.Identity; + +public class TokensService : ITokensService +{ + private readonly IConfiguration _configuration; + + private readonly IUsersRepository _usersRepository; + + private readonly ILogger _logger; + + public TokensService(IConfiguration configuration, IUsersRepository usersRepository, + ILogger logger) + { + this._configuration = configuration; + this._usersRepository = usersRepository; + this._logger = logger; + } + + public async Task RefreshUserAsync(TokensModel tokensModel, CancellationToken cancellationToken) + { + var principal = this.GetPrincipalFromExpiredToken(tokensModel.AccessToken); + + var userId = principal.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value; + if (!ObjectId.TryParse(userId, out var objectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + if (user == null || user?.RefreshToken != tokensModel.RefreshToken + || user?.RefreshTokenExpiryDate <= DateTime.UtcNow) + { + throw new SecurityTokenExpiredException(); + } + + var newAccessToken = this.GenerateAccessToken(principal.Claims); + var newRefreshToken = this.GenerateRefreshToken(); + user.RefreshToken = newRefreshToken; + user.RefreshTokenExpiryDate = DateTime.UtcNow.AddDays(30); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + + this._logger.LogInformation($"Refreshed user tokens."); + + return new TokensModel + { + AccessToken = newAccessToken, + RefreshToken = newRefreshToken + }; + } + + public string GenerateAccessToken(IEnumerable claims) + { + var tokenOptions = GetTokenOptions(claims); + var tokenString = new JwtSecurityTokenHandler().WriteToken(tokenOptions); + + this._logger.LogInformation($"Generated new access token."); + + return tokenString; + } + + public string GenerateRefreshToken() + { + var randomNumber = new byte[32]; + using (var rng = RandomNumberGenerator.Create()) + { + rng.GetBytes(randomNumber); + var refreshToken = Convert.ToBase64String(randomNumber); + + this._logger.LogInformation($"Generated new refresh token."); + + return refreshToken; + } + } + + private ClaimsPrincipal GetPrincipalFromExpiredToken(string token) + { + var tokenValidationParameters = new TokenValidationParameters + { + ValidateAudience = false, + ValidateIssuer = false, + ValidateIssuerSigningKey = true, + IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes( + _configuration.GetValue("JsonWebTokenKeys:IssuerSigningKey"))), + ValidateLifetime = false + }; + var tokenHandler = new JwtSecurityTokenHandler(); + SecurityToken securityToken; + var principal = tokenHandler.ValidateToken(token, tokenValidationParameters, out securityToken); + var jwtSecurityToken = securityToken as JwtSecurityToken; + if (jwtSecurityToken == null || !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, + StringComparison.InvariantCultureIgnoreCase)) + throw new SecurityTokenException("Invalid token"); + + this._logger.LogInformation($"Returned data from expired access token."); + + return principal; + } + + private JwtSecurityToken GetTokenOptions(IEnumerable claims) + { + var secretKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes( + _configuration.GetValue("JsonWebTokenKeys:IssuerSigningKey"))); + var signinCredentials = new SigningCredentials(secretKey, SecurityAlgorithms.HmacSha256); + + var tokenOptions = new JwtSecurityToken( + issuer: _configuration.GetValue("JsonWebTokenKeys:ValidIssuer"), + audience: _configuration.GetValue("JsonWebTokenKeys:ValidAudience"), + expires: DateTime.UtcNow.AddMinutes(5), + claims: claims, + signingCredentials: signinCredentials + ); + + return tokenOptions; + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs new file mode 100644 index 0000000..571ad9c --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs @@ -0,0 +1,302 @@ +using AutoMapper; +using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.Tokens; +using Microsoft.Win32; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.Exceptions; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; +using ShoppingAssistantApi.Application.Models.Operations; +using ShoppingAssistantApi.Domain.Entities; +using System.Security.Claims; +using System.Text.RegularExpressions; + + +namespace ShoppingAssistantApi.Infrastructure.Services.Identity; +public class UserManager : IUserManager +{ + private readonly IUsersRepository _usersRepository; + + private readonly ILogger _logger; + + private readonly IPasswordHasher _passwordHasher; + + private readonly ITokensService _tokensService; + + private readonly IMapper _mapper; + + private readonly IRolesRepository _rolesRepository; + + public UserManager(IUsersRepository usersRepository, ILogger logger, IPasswordHasher passwordHasher, ITokensService tokensService, IMapper mapper, IRolesRepository rolesRepository) + { + this._usersRepository = usersRepository; + this._logger = logger; + this._passwordHasher = passwordHasher; + this._tokensService = tokensService; + this._mapper = mapper; + this._rolesRepository = rolesRepository; + + } + + public async Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken) + { + var user = login.Email != null + ? await this._usersRepository.GetUserAsync(x => x.Email == login.Email, cancellationToken) + : await this._usersRepository.GetUserAsync(x => x.Phone == login.Phone, cancellationToken); + + if (user == null) + { + throw new EntityNotFoundException(); + } + + if (!this._passwordHasher.Check(login.Password, user.PasswordHash)) + { + throw new InvalidDataException("Invalid password!"); + } + + user.RefreshToken = this.GetRefreshToken(); + user.RefreshTokenExpiryDate = DateTime.UtcNow.AddDays(30); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var tokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Logged in user with email: {login.Email}."); + + return tokens; + } + + public async Task AccessGuestAsync(AccessGuestModel guest, CancellationToken cancellationToken) + { + var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId, cancellationToken); + + if (user != null) + { + user.RefreshToken = this.GetRefreshToken(); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var userTokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Logged in guest with guest id: {guest.GuestId}."); + + return userTokens; + } + + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); + + var newUser = new User + { + GuestId = guest.GuestId, + Roles = new List { role }, + RefreshToken = this.GetRefreshToken(), + RefreshTokenExpiryDate = DateTime.Now.AddDays(30), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedDateUtc = DateTime.UtcNow + }; + + await this._usersRepository.AddAsync(newUser, cancellationToken); + var tokens = this.GetUserTokens(newUser); + + this._logger.LogInformation($"Created guest with guest id: {guest.GuestId}."); + + return tokens; + } + + public async Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken) + { + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); + if (role == null) + { + throw new EntityNotFoundException(); + } + + if (!ObjectId.TryParse(id, out var objectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + if (user == null) + { + throw new EntityNotFoundException(); + } + + user.Roles.Add(role); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var tokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Added role {roleName} to user with id: {id}."); + + return tokens; + } + + public async Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken) + { + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); + if (role == null) + { + throw new EntityNotFoundException(); + } + + if (!ObjectId.TryParse(id, out var objectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + if (user == null) + { + throw new EntityNotFoundException(); + } + + var deletedRole = user.Roles.Find(x => x.Name == role.Name); + + user.Roles.Remove(deletedRole); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var tokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Added role {roleName} to user with id: {id}."); + + return tokens; + } + + public async Task UpdateAsync(UserDto userDto, CancellationToken cancellationToken) + { + if (userDto.Email != null) ValidateEmail(userDto.Email); + if (userDto.Phone != null) ValidateNumber(userDto.Phone); + + if (userDto.Roles.Any(x => x.Name == "Guest") && !userDto.Roles.Any(x => x.Name == "User")) + { + if (userDto.Password != null && (userDto.Email != null || userDto.Phone != null)) + { + var roleEntity = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); + var roleDto = this._mapper.Map(roleEntity); + userDto.Roles.Add(roleDto); + } + } + + var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id, cancellationToken); + + if (user == null) + { + throw new EntityNotFoundException(); + } + + if (userDto.Roles.Any(x => x.Name == "User") && userDto.Email != null) + { + if (await this._usersRepository.GetUserAsync(x => x.Email == userDto.Email, cancellationToken) != null) + { + throw new EntityAlreadyExistsException("email", userDto.Email); + } + } + if (userDto.Roles.Any(x => x.Name == "User") && userDto.Phone != null) + { + if (await this._usersRepository.GetUserAsync(x => x.Phone == userDto.Phone, cancellationToken) != null) + { + throw new EntityAlreadyExistsException("phone", userDto.Phone); + } + } + + this._mapper.Map(userDto, user); + if (!userDto.Password.IsNullOrEmpty()) + { + user.PasswordHash = this._passwordHasher.Hash(userDto.Password); + } + user.RefreshToken = this.GetRefreshToken(); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + + var tokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Update user with id: {GlobalUser.Id.ToString()}."); + + return new UpdateUserModel() { Tokens = tokens, User = this._mapper.Map(user) }; + } + + public async Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(id, out var objectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + + if (user == null) + { + throw new EntityNotFoundException(); + } + + this._mapper.Map(userDto, user); + + user.RefreshToken = this.GetRefreshToken(); + await this._usersRepository.UpdateUserAsync(user, cancellationToken); + + var tokens = this.GetUserTokens(user); + + this._logger.LogInformation($"Update user with id: {id}."); + + return new UpdateUserModel() { Tokens = tokens, User = this._mapper.Map(user) }; + } + + private string GetRefreshToken() + { + var refreshToken = this._tokensService.GenerateRefreshToken(); + + this._logger.LogInformation($"Returned new refresh token."); + + return refreshToken; + } + + private TokensModel GetUserTokens(User user) + { + var claims = this.GetClaims(user); + var accessToken = this._tokensService.GenerateAccessToken(claims); + + this._logger.LogInformation($"Returned new access and refresh tokens."); + + return new TokensModel + { + AccessToken = accessToken, + RefreshToken = user.RefreshToken, + }; + } + + private IEnumerable GetClaims(User user) + { + var claims = new List() + { + new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), + new Claim(ClaimTypes.Email, user.Email ?? string.Empty), + new Claim(ClaimTypes.MobilePhone, user.Phone ?? string.Empty), + }; + + foreach (var role in user.Roles) + { + claims.Add(new Claim(ClaimTypes.Role, role.Name)); + } + + this._logger.LogInformation($"Returned claims for user with id: {user.Id.ToString()}."); + + return claims; + } + + private void ValidateEmail(string email) + { + string regex = @"^[^@\s]+@[^@\s]+\.[^@\s]+$"; + + if (!Regex.IsMatch(email, regex)) + { + throw new InvalidEmailException(email); + } + } + + private void ValidateNumber(string phone) + { + string regex = @"^\+[0-9]{1,15}$"; + + if (!Regex.IsMatch(phone, regex)) + { + throw new InvalidPhoneNumberException(phone); + } + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs new file mode 100644 index 0000000..7881ec4 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs @@ -0,0 +1,46 @@ +using AutoMapper; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.Exceptions; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class RolesService : IRolesService +{ + private readonly IRolesRepository _repository; + + private readonly IMapper _mapper; + + public RolesService(IRolesRepository repository, IMapper mapper) + { + this._repository = repository; + this._mapper = mapper; + } + + public async Task AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken) + { + var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name, cancellationToken); + if (role != null) + { + throw new EntityAlreadyExistsException(); + } + var entity = this._mapper.Map(dto); + entity.CreatedDateUtc = DateTime.UtcNow; + entity.LastModifiedDateUtc = DateTime.UtcNow; + await this._repository.AddAsync(entity, cancellationToken); + return this._mapper.Map(entity); + } + + public async Task> GetRolesPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) + { + var entities = await this._repository.GetPageAsync(pageNumber, pageSize, cancellationToken); + var dtos = this._mapper.Map>(entities); + var count = await this._repository.GetTotalCountAsync(); + return new PagedList(dtos, pageNumber, pageSize, count); + } +} diff --git a/ShoppingAssistantApi.Infrastructure/Services/UsersService.cs b/ShoppingAssistantApi.Infrastructure/Services/UsersService.cs new file mode 100644 index 0000000..b3df02b --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/UsersService.cs @@ -0,0 +1,62 @@ +using AutoMapper; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.Exceptions; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class UsersService : IUsersService +{ + private readonly IUsersRepository _repository; + + private readonly IMapper _mapper; + + public UsersService(IUsersRepository repository, IMapper mapper) + { + _repository = repository; + _mapper = mapper; + } + + public async Task AddUserAsync(UserDto dto, CancellationToken cancellationToken) + { + var entity = _mapper.Map(dto); + await _repository.AddAsync(entity, cancellationToken); + } + + public async Task> GetUsersPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) + { + var entities = await _repository.GetPageAsync(pageNumber, pageSize, cancellationToken); + var dtos = _mapper.Map>(entities); + var count = await _repository.GetTotalCountAsync(); + return new PagedList(dtos, pageNumber, pageSize, count); + } + + public async Task GetUserAsync(string id, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(id, out var objectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var entity = await _repository.GetUserAsync(objectId, cancellationToken); + if (entity == null) + { + throw new EntityNotFoundException(); + } + + return _mapper.Map(entity); + } + + public async Task UpdateUserAsync(UserDto dto, CancellationToken cancellationToken) + { + var entity = _mapper.Map(dto); + entity.LastModifiedById = GlobalUser.Id.Value; + entity.LastModifiedDateUtc = DateTime.UtcNow; + await _repository.UpdateUserAsync(entity, cancellationToken); + } +} diff --git a/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj new file mode 100644 index 0000000..6b6f722 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj @@ -0,0 +1,22 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + + + diff --git a/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs b/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs new file mode 100644 index 0000000..ea3f3a3 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.Configuration; +using MongoDB.Driver; + +namespace ShoppingAssistantApi.Persistance.Database; + +public class MongoDbContext +{ + private readonly MongoClient _client; + + private readonly IMongoDatabase _db; + + public MongoDbContext(IConfiguration configuration) + { + this._client = new MongoClient(configuration.GetConnectionString("MongoDb")); + this._db = this._client.GetDatabase(configuration.GetConnectionString("MongoDatabaseName")); + } + + public IMongoDatabase Db => this._db; +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs new file mode 100644 index 0000000..0753d58 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -0,0 +1,161 @@ +using Microsoft.Extensions.DependencyInjection; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.IServices.Identity; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; + +public class DbInitialaizer +{ + private readonly IUsersService _usersService; + + private readonly IUserManager _userManager; + + private readonly IRolesService _rolesService; + + private readonly ITokensService _tokensService; + + + public IEnumerable Roles { get; set; } + + public DbInitialaizer(IServiceProvider serviceProvider) + { + this._usersService = serviceProvider.GetService(); + this._rolesService = serviceProvider.GetService(); + this._userManager = serviceProvider.GetService(); + this._tokensService = serviceProvider.GetService(); + } + + public async + Task +InitialaizeDb(CancellationToken cancellationToken) + { + await this.AddRoles(cancellationToken); + await this.AddUsers(cancellationToken); + } + + public async Task AddUsers(CancellationToken cancellationToken) + { + var guestModel1 = new AccessGuestModel + { + GuestId = Guid.NewGuid(), + }; + + var guestModel2 = new AccessGuestModel + { + GuestId = Guid.NewGuid(), + }; + + var guestModel3 = new AccessGuestModel + { + GuestId = Guid.NewGuid(), + }; + + var guestModel4 = new AccessGuestModel + { + GuestId = Guid.NewGuid(), + }; + + var guestModel5 = new AccessGuestModel + { + GuestId = Guid.NewGuid(), + }; + + Task.WaitAll( + _userManager.AccessGuestAsync(guestModel1, cancellationToken), + _userManager.AccessGuestAsync(guestModel2, cancellationToken), + _userManager.AccessGuestAsync(guestModel3, cancellationToken), + _userManager.AccessGuestAsync(guestModel4, cancellationToken), + _userManager.AccessGuestAsync(guestModel5, cancellationToken) + ); + + var guests = await this._usersService.GetUsersPageAsync(1, 4, cancellationToken); + var guestsResult = guests.Items.ToList(); + + var user1 = new UserDto + { + Id = guestsResult[0].Id, + GuestId = guestsResult[0].GuestId, + Roles = guestsResult[0].Roles, + Phone = "+380953326869", + Email = "mykhailo.bilodid@nure.ua", + Password = "Yuiop12345", + RefreshToken = _tokensService.GenerateRefreshToken(), + RefreshTokenExpiryDate = DateTime.Now.AddDays(7), + }; + + var user2 = new UserDto + { + Id = guestsResult[1].Id, + GuestId = guestsResult[1].GuestId, + Roles = guestsResult[1].Roles, + Phone = "+380953326888", + Email = "serhii.shchoholiev@nure.ua", + Password = "Yuiop12345", + RefreshToken = _tokensService.GenerateRefreshToken(), + RefreshTokenExpiryDate = DateTime.Now.AddDays(7), + }; + + var user3 = new UserDto + { + Id = guestsResult[2].Id, + GuestId = guestsResult[2].GuestId, + Roles = guestsResult[2].Roles, + Phone = "+380983326869", + Email = "vitalii.krasnorutski@nure.ua", + Password = "Yuiop12345", + RefreshToken = _tokensService.GenerateRefreshToken(), + RefreshTokenExpiryDate = DateTime.Now.AddDays(7), + }; + + var user4 = new UserDto + { + Id = guestsResult[3].Id, + GuestId = guestsResult[3].GuestId, + Roles = guestsResult[3].Roles, + Phone = "+380953826869", + Email = "shopping.assistant.team@gmail.com", + Password = "Yuiop12345", + RefreshToken = _tokensService.GenerateRefreshToken(), + RefreshTokenExpiryDate = DateTime.Now.AddDays(7), + }; + + GlobalUser.Id = ObjectId.Parse(user1.Id); + await _userManager.UpdateAsync(user1, cancellationToken); + + GlobalUser.Id = ObjectId.Parse(user2.Id); + await _userManager.UpdateAsync(user2, cancellationToken); + + GlobalUser.Id = ObjectId.Parse(user3.Id); + await _userManager.UpdateAsync(user3, cancellationToken); + + GlobalUser.Id = ObjectId.Parse(user4.Id); + await _userManager.UpdateAsync(user4, cancellationToken); + } + + public async Task AddRoles(CancellationToken cancellationToken) + { + var role1 = new RoleCreateDto + { + Name = "User" + }; + + var role2 = new RoleCreateDto + { + Name = "Admin" + }; + + var role3 = new RoleCreateDto + { + Name = "Guest" + }; + + var dto1 = await _rolesService.AddRoleAsync(role1, cancellationToken); + var dto2 = await _rolesService.AddRoleAsync(role2, cancellationToken); + var dto3 = await _rolesService.AddRoleAsync(role3, cancellationToken); + } +} diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs new file mode 100644 index 0000000..1ff1855 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.DependencyInjection; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Persistance.Database; +using ShoppingAssistantApi.Persistance.Repositories; + +namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; + +public static class RepositoriesExtention +{ + public static IServiceCollection AddInfrastructure(this IServiceCollection services) + { + services.AddSingleton(); + + services.AddScoped(); + services.AddScoped(); + + return services; + } +} diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs new file mode 100644 index 0000000..565112e --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -0,0 +1,72 @@ +using MongoDB.Driver; +using ShoppingAssistantApi.Domain.Common; +using ShoppingAssistantApi.Persistance.Database; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public abstract class BaseRepository where TEntity : EntityBase +{ + protected MongoDbContext _db; + + protected IMongoCollection _collection; + + public BaseRepository(MongoDbContext db, string collectionName) + { + this._db = db; + this._collection = _db.Db.GetCollection(collectionName); + } + + public async Task AddAsync(TEntity entity, CancellationToken cancellationToken) + { + await this._collection.InsertOneAsync(entity, new InsertOneOptions(), cancellationToken); + return entity; + } + + public async Task> GetPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) + { + return await this._collection.Find(Builders.Filter.Empty) + .Skip((pageNumber - 1) * pageSize) + .Limit(pageSize) + .ToListAsync(cancellationToken); + } + + public async Task> GetPageAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken) + { + return await this._collection.Find(predicate) + .Skip((pageNumber - 1) * pageSize) + .Limit(pageSize) + .ToListAsync(cancellationToken); + } + + public async Task GetTotalCountAsync() + { + return (int)(await this._collection.EstimatedDocumentCountAsync()); + } + + public async Task GetCountAsync(Expression> predicate, CancellationToken cancellationToken) + { + return (int)(await this._collection.CountDocumentsAsync(predicate, cancellationToken: cancellationToken)); + } + + public async Task ExistsAsync(Expression> predicate, CancellationToken cancellationToken) + { + return await this._collection.Find(predicate).AnyAsync(cancellationToken); + } + + public async Task DeleteAsync(TEntity entity, CancellationToken cancellationToken) + { + var updateDefinition = Builders.Update + .Set(e => e.IsDeleted, true) + .Set(e => e.LastModifiedById, entity.LastModifiedById) + .Set(e => e.LastModifiedDateUtc, entity.LastModifiedDateUtc); + + var options = new FindOneAndUpdateOptions + { + ReturnDocument = ReturnDocument.After + }; + + 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/RolesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs new file mode 100644 index 0000000..2c09d63 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs @@ -0,0 +1,23 @@ +using MongoDB.Bson; +using MongoDB.Driver; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class RolesRepository : BaseRepository, IRolesRepository +{ + public RolesRepository(MongoDbContext db) : base(db, "Roles") { } + + public async Task GetRoleAsync(ObjectId id, CancellationToken cancellationToken) + { + return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); + } + + public async Task GetRoleAsync(Expression> predicate, CancellationToken cancellationToken) + { + return await (await this._collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs new file mode 100644 index 0000000..198bc08 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs @@ -0,0 +1,48 @@ +using MongoDB.Bson; +using MongoDB.Driver; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; +using System.Linq.Expressions; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class UsersRepository : BaseRepository, IUsersRepository +{ + public UsersRepository(MongoDbContext db) : base(db, "Users") { } + + public async Task GetUserAsync(ObjectId id, CancellationToken cancellationToken) + { + return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); + } + + public async Task GetUserAsync(Expression> predicate, CancellationToken cancellationToken) + { + return await (await this._collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + } + + public async Task UpdateUserAsync(User user, CancellationToken cancellationToken) + { + var updateDefinition = Builders.Update + .Set(u => u.Email, user.Email) + .Set(u => u.Phone, user.Phone) + .Set(u => u.RefreshToken, user.RefreshToken) + .Set(u => u.RefreshTokenExpiryDate, user.RefreshTokenExpiryDate) + .Set(u => u.GuestId, user.GuestId) + .Set(u => u.Roles, user.Roles) + .Set(u => u.PasswordHash, user.PasswordHash) + .Set(u => u.LastModifiedDateUtc, DateTime.UtcNow) + .Set(u => u.LastModifiedById, GlobalUser.Id); + + var options = new FindOneAndUpdateOptions + { + ReturnDocument = ReturnDocument.After + }; + + return await this._collection.FindOneAndUpdateAsync( + Builders.Filter.Eq(u => u.Id, user.Id), updateDefinition, options, cancellationToken); + + } + +} diff --git a/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj b/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj new file mode 100644 index 0000000..951f76f --- /dev/null +++ b/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj @@ -0,0 +1,19 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + diff --git a/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj new file mode 100644 index 0000000..a7e4074 --- /dev/null +++ b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj @@ -0,0 +1,35 @@ + + + + net7.0 + enable + enable + + false + true + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + diff --git a/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs b/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs new file mode 100644 index 0000000..16e0a03 --- /dev/null +++ b/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs @@ -0,0 +1,65 @@ +using System.Text; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Identity; + +namespace ShoppingAssistantApi.Tests.TestExtentions; + +public static class AccessExtention +{ + public static async Task Login(string email, string password, HttpClient httpClient) + { + var mutation = new + { + query = "mutation Login($login: AccessUserModelInput!) { login(login: $login) { accessToken refreshToken }}", + variables = new + { + login = new + { + email = email, + password = password + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await httpClient.PostAsync("graphql", content); + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + return new TokensModel + { + AccessToken = (string)document.data.login.accessToken, + RefreshToken = (string)document.data.login.refreshToken + }; + } + + public static async Task CreateGuest(string guestId, HttpClient httpClient) + { + var mutation = new + { + query = "mutation AccessGuest($guest: AccessGuestModelInput!) { accessGuest(guest: $guest) { accessToken, refreshToken } }", + variables = new + { + guest = new + { + guestId + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await httpClient.PostAsync("graphql", content); + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + return new TokensModel + { + AccessToken = (string)document.data.accessGuest.accessToken, + RefreshToken = (string)document.data.accessGuest.refreshToken + }; + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs b/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs new file mode 100644 index 0000000..a8407df --- /dev/null +++ b/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs @@ -0,0 +1,48 @@ +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Mongo2Go; +using ShoppingAssistantApi.Persistance.PersistanceExtentions; + +namespace ShoppingAssistantApi.Tests.TestExtentions; + +public class TestingFactory : WebApplicationFactory where TEntryPoint : Program +{ + private readonly MongoDbRunner _runner = MongoDbRunner.Start(); + + private bool _isDataInitialaized = false; + + protected override void ConfigureWebHost(IWebHostBuilder builder) + { + builder.ConfigureAppConfiguration((context, config) => + { + var dbConfig = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary() + { + { "ConnectionStrings:MongoDb", _runner.ConnectionString } + }) + .Build(); + + config.AddConfiguration(dbConfig); + }); + } + + public async Task InitialaizeData() + { + if (!_isDataInitialaized) + { + _isDataInitialaized = true; + using var scope = Services.CreateScope(); + var initialaizer = new DbInitialaizer(scope.ServiceProvider); + using var cancellationTokenSource = new CancellationTokenSource(); + var cancellationToken = cancellationTokenSource.Token; + await initialaizer.InitialaizeDb(cancellationToken); + } + } + + protected override void Dispose(bool disposing) + { + _runner.Dispose(); + base.Dispose(disposing); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs b/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs new file mode 100644 index 0000000..269ff8a --- /dev/null +++ b/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs @@ -0,0 +1,50 @@ +using System.Net.Http.Headers; +using System.Text; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Dtos; + +namespace ShoppingAssistantApi.Tests.TestExtentions; + +public static class UserExtention +{ + public static async Task GetCurrentUser(HttpClient httpClient) + { + var query = new + { + query = "query CurrentUser { currentUser { id, guestId, phone, email, refreshToken, refreshTokenExpiryDate, roles { id, name }}}", + variables = new { } + }; + + var jsonPayload = JsonConvert.SerializeObject(query); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await httpClient.PostAsync("graphql", content); + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + return JsonConvert.DeserializeObject(document.data.currentUser.ToString()); + } + + public static async Task> GetUsers(int amount, HttpClient httpClient) + { + var accessToken = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", httpClient); + httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.AccessToken); + + var query = new + { + query = "query UsersPage($pageNumber: Int!, $pageSize: Int!) { usersPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, email, phone }}}", + variables = new + { + pageNumber = 1, + pageSize = amount + } + }; + + var jsonPayload = JsonConvert.SerializeObject(query); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await httpClient.PostAsync("graphql", content); + var responseString = await response.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + return JsonConvert.DeserializeObject>(document.data.usersPage.items.ToString()); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/AccessTests.cs b/ShoppingAssistantApi.Tests/Tests/AccessTests.cs new file mode 100644 index 0000000..65f29f4 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/AccessTests.cs @@ -0,0 +1,203 @@ +using System.Net; +using System.Text; +using Xunit; +using ShoppingAssistantApi.Tests.TestExtentions; +using Newtonsoft.Json; + +namespace ShoppingAssistantApi.Tests.Tests; + +[Collection("Tests")] + +public class AccessTests : IClassFixture> +{ + private readonly HttpClient _httpClient; + + public AccessTests(TestingFactory factory) + { + _httpClient = factory.CreateClient(); + factory.InitialaizeData().GetAwaiter().GetResult(); + } + + [Fact] + public async Task AccessGuestAsync_ValidGuid_ReturnsTokensModel() + { + var mutation = new + { + query = "mutation AccessGuest($guest: AccessGuestModelInput!) { accessGuest(guest: $guest) { accessToken, refreshToken } }", + variables = new + { + guest = new + { + guestId = Guid.NewGuid(), + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessToken = (string)document.data.accessGuest.accessToken; + var refreshToken = (string)document.data.accessGuest.refreshToken; + + Assert.NotNull(accessToken); + Assert.NotNull(refreshToken); + } + + [Theory] + [InlineData("")] + [InlineData("invalid-guid-format")] + public async Task AccessGuestAsync_InvalidGuid_ReturnsInternalServerError(string guestId) + { + var mutation = new + { + query = "mutation AccessGuest($guest: AccessGuestModelInput!) { accessGuest(guest: $guest) { accessToken, refreshToken } }", + variables = new + { + guest = new + { + guestId + } + } + }; + + 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); + } + + [Theory] + [InlineData("invalid-email-format", null, "Yuiop12345")] + [InlineData(null, null, "Yuiop12345")] + [InlineData(null, null, "")] + [InlineData("mihail.beloded.work@gmail.com", null, "")] + public async Task LoginAsync_InvalidCredentials_ReturnsInternalServerError(string email, string phone, string password) + { + var mutation = new + { + query = "mutation Login($login: AccessUserModelInput!) { login(login: $login) { accessToken refreshToken }}", + variables = new + { + login = new + { + phone = phone, + email = email, + password = password + } + } + }; + + 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); + } + + [Theory] + [InlineData("mykhailo.bilodid@nure.ua", "+380953326869", "Yuiop12345")] + [InlineData(null, "+380953326888", "Yuiop12345")] + [InlineData("mykhailo.bilodid@nure.ua", null, "Yuiop12345")] + public async Task LoginAsync_ValidCredentials_ReturnsTokensModel(string email, string phone, string password) + { + var mutation = new + { + query = "mutation Login($login: AccessUserModelInput!) { login(login: $login) { accessToken refreshToken }}", + variables = new + { + login = new + { + phone = phone, + email = email, + password = password + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessToken = (string)document.data.login.accessToken; + var refreshToken = (string)document.data.login.refreshToken; + + Assert.NotNull(accessToken); + Assert.NotNull(refreshToken); + } + + [Fact] + public async Task RefreshUserTokenAsync_ValidTokensModel_ReturnsTokensModel() + { + var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); + var accessToken = tokensModel.AccessToken; + var refreshToken = tokensModel.RefreshToken; + + var mutation = new + { + query = "mutation RefreshToken($model: TokensModelInput!) { refreshUserToken(model: $model) { accessToken refreshToken }}", + variables = new + { + model = new + { + accessToken, + refreshToken + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessTokenResult = (string)document.data.refreshUserToken.accessToken; + var refreshTokenResult = (string)document.data.refreshUserToken.refreshToken; + + Assert.NotNull(accessTokenResult); + Assert.NotNull(refreshTokenResult); + } + + [Theory] + [InlineData(null, null)] + [InlineData("invalid-access-token", "invalid-refresh-token")] + public async Task RefreshUserTokenAsync_InvalidTokensModel_ReturnsInternalServerError(string refreshToken, string accessToken) + { + var mutation = new + { + query = "mutation RefreshToken($model: TokensModelInput!) { refreshUserToken(model: $model) { accessToken refreshToken }}", + variables = new + { + model = new + { + accessToken, + refreshToken + } + } + }; + + 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); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/RolesTests.cs b/ShoppingAssistantApi.Tests/Tests/RolesTests.cs new file mode 100644 index 0000000..29b3774 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/RolesTests.cs @@ -0,0 +1,184 @@ +using System.Net; +using System.Text; +using Xunit; +using ShoppingAssistantApi.Tests.TestExtentions; +using System.Net.Http.Headers; +using Newtonsoft.Json; +using GreenDonut; + +namespace ShoppingAssistantApi.Tests.Tests; + +[Collection("Tests")] +public class RolesTests : IClassFixture> +{ + private readonly HttpClient _httpClient; + + public RolesTests(TestingFactory factory) + { + _httpClient = factory.CreateClient(); + factory.InitialaizeData().GetAwaiter().GetResult(); + } + + [Fact] + public async Task AddToRoleAsync_ValidRoleName_ReturnsTokensModel() + { + var usersPage = await UserExtention.GetUsers(10, _httpClient); + var mutation = new + { + query = "mutation AddToRole($roleName: String!, $id: String!) { addToRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", + variables = new + { + roleName = "Admin", + id = usersPage[0].Id, + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessToken = (string)document.data.addToRole.accessToken; + var refreshToken = (string)document.data.addToRole.refreshToken; + + Assert.NotNull(accessToken); + Assert.NotNull(refreshToken); + } + + + [Theory] + [InlineData("")] + [InlineData("InvalidRole")] + public async Task AddToRoleAsync_InvalidRoleName_ReturnsInternalServerError(string roleName) + { + var usersPage = await UserExtention.GetUsers(10, _httpClient); + var mutation = new + { + query = "mutation AddToRole($roleName: String!, $id: String!) { addToRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", + variables = new + { + roleName, + id = usersPage[0].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); + } + + + [Fact] + public async Task RemoveFromRoleAsync_ValidRoleName_ReturnsTokensModel() + { + var usersPage = await UserExtention.GetUsers(10, _httpClient); + var mutation = new + { + query = "mutation RemoveFromRole($roleName: String!, $id: String!) { removeFromRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", + variables = new + { + roleName = "Admin", + id = usersPage[0].Id, + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessToken = (string)document.data.removeFromRole.accessToken; + var refreshToken = (string)document.data.removeFromRole.refreshToken; + + Assert.NotNull(accessToken); + Assert.NotNull(refreshToken); + } + + [Theory] + [InlineData("")] + [InlineData("InvalidRole")] + public async Task RemoveFromRoleAsync_InvalidRoleName_ReturnsInternalServerError(string roleName) + { + var usersPage = await UserExtention.GetUsers(10, _httpClient); + var mutation = new + { + query = "mutation RemoveFromRole($roleName: String!, $id: String!) { removeFromRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", + variables = new + { + roleName, + id = usersPage[0].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); + } + + [Theory] + [InlineData("User")] + [InlineData(null)] + public async Task AddRole_InvalidRoleName_ReturnsInternalServerError(string roleName) + { + var mutation = new + { + query = "mutation AddRole ($dto: RoleCreateDtoInput!){ addRole (roleDto: $dto) { id, name }} ", + variables = new + { + dto = new + { + name = roleName + } + } + }; + + 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 GetRolesPageAsync_ValidPageNumberAndSize_ReturnsRolesPagedList() + { + var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var query = new + { + query = "query RolesPage($pageNumber: Int!, $pageSize: Int!) { rolesPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, name } }}", + variables = new + { + pageNumber = 1, + pageSize = 3 + } + }; + + 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 items = document.data.rolesPage.items; + Assert.NotEmpty(items); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/UsersTests.cs b/ShoppingAssistantApi.Tests/Tests/UsersTests.cs new file mode 100644 index 0000000..8c0e7d1 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/UsersTests.cs @@ -0,0 +1,240 @@ +using ShoppingAssistantApi.Tests.TestExtentions; +using System.Net.Http.Headers; +using System.Net; +using System.Text; +using Xunit; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Dtos; + +namespace ShoppingAssistantApi.Tests.Tests; + +[Collection("Tests")] +public class UsersTests : IClassFixture> +{ + private readonly HttpClient _httpClient; + + public UsersTests(TestingFactory factory) + { + _httpClient = factory.CreateClient(); + factory.InitialaizeData().GetAwaiter().GetResult(); + } + + [Fact] + public async Task UpdateUserAsync_ValidUserModel_ReturnsUpdateUserModel() + { + var tokensModel = await AccessExtention.CreateGuest(Guid.NewGuid().ToString(), _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var user = await UserExtention.GetCurrentUser(_httpClient); + + var roles = new object[1]; + + foreach(var role in user.Roles) + { + roles[0] = new + { + id = role.Id, + name = role.Name + }; + } + + var mutation = new + { + query = "mutation UpdateUser($userDto: UserDtoInput!) { updateUser(userDto: $userDto) { tokens { accessToken, refreshToken }, user { email } }}", + variables = new + { + userDto = new + { + id = user.Id, + guestId = user.GuestId, + roles = roles, + email = "testing@gmail.com", + password = "Yuiop12345", + refreshTokenExpiryDate = user.RefreshTokenExpiryDate + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessTokenResult = (string)document.data.updateUser.tokens.accessToken; + var refreshTokenResult = (string)document.data.updateUser.tokens.refreshToken; + var userResult = JsonConvert.DeserializeObject(document.data.updateUser.user.ToString()); + + Assert.NotNull(accessTokenResult); + Assert.NotNull(refreshTokenResult); + Assert.NotNull(userResult.Email); + } + + [Fact] + public async Task UpdateUserByAdminAsync_ValidUserModel_ReturnsUpdateUserModel() + { + var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var user = await UserExtention.GetCurrentUser(_httpClient); + + var roles = new object[1]; + + foreach (var role in user.Roles) + { + roles[0] = new + { + id = role.Id, + name = role.Name, + }; + } + + var mutation = new + { + query = "mutation UpdateUserByAdmin($id: String!, $userDto: UserDtoInput!) { updateUserByAdmin(id: $id, userDto: $userDto) { tokens { accessToken, refreshToken }, user { guestId } }}", + variables = new + { + id = user.Id, + userDto = new + { + id = user.Id, + guestId = Guid.NewGuid().ToString(), + roles = roles, + refreshTokenExpiryDate = user.RefreshTokenExpiryDate + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(mutation); + 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 accessTokenResult = (string)document.data.updateUserByAdmin.tokens.accessToken; + var refreshToken = (string)document.data.updateUserByAdmin.tokens.refreshToken; + var updatedUserGuestId = (Guid)document.data.updateUserByAdmin.user.guestId; + + Assert.NotNull(accessTokenResult); + Assert.NotNull(refreshToken); + Assert.NotEqual(user.GuestId, updatedUserGuestId); + } + + [Fact] + public async Task GetUserAsync_ValidUserId_ReturnsUser() + { + var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var usersPage = await UserExtention.GetUsers(10, _httpClient); + var query = new + { + query = "query User($id: String!) { user(id: $id) { id, email, phone }}", + variables = new + { + id = usersPage[0].Id, + } + }; + + 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 userResult = JsonConvert.DeserializeObject(document.data.user.ToString()); + Assert.Equal(userResult.Id, usersPage[0].Id); + } + + [Fact] + public async Task GetUserAsync_InvalidUserId_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var query = new + { + query = "query User($id: String!) { user(id: $id) { id, email, phone }}", + variables = new + { + id = "error", + } + }; + + 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.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetCurrentUserAsync_ValidCredentials_ReturnsCurrentUser() + { + var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var query = new + { + query = "query CurrentUser { currentUser { id, email, phone }}", + variables = new { } + }; + + 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 user = JsonConvert.DeserializeObject(document.data.currentUser.ToString()); + Assert.NotEmpty(user.Id); + Assert.NotEmpty(user.Email); + Assert.NotEmpty(user.Phone); + Assert.Equal(user.Email, "mykhailo.bilodid@nure.ua"); + } + + [Fact] + public async Task GetUsersPageAsync_ValidPageNumberAndSize_ReturnsUsersPage() + { + var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + + var query = new + { + query = "query UsersPage($pageNumber: Int!, $pageSize: Int!) { usersPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, email, phone }}}", + variables = new + { + pageNumber = 1, + pageSize = 10 + } + }; + + 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 items = document.data.usersPage.items; + Assert.NotEmpty(items); + } +} diff --git a/ShoppingAssistantApi.sln b/ShoppingAssistantApi.sln new file mode 100644 index 0000000..fb54417 --- /dev/null +++ b/ShoppingAssistantApi.sln @@ -0,0 +1,55 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33723.286 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Domain", "ShoppingAssistantApi.Domain\ShoppingAssistantApi.Domain.csproj", "{22D8EA12-362A-4B61-9E03-67A44B0762F3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Application", "ShoppingAssistantApi.Application\ShoppingAssistantApi.Application.csproj", "{9B114C53-F28F-45FE-9724-6A1FFC1C7384}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Infrastructure", "ShoppingAssistantApi.Infrastructure\ShoppingAssistantApi.Infrastructure.csproj", "{6CB12F83-2121-4A3C-ADA2-C6F3A7EDB05F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Persistance", "ShoppingAssistantApi.Persistance\ShoppingAssistantApi.Persistance.csproj", "{4F4A48F4-5989-4C26-B87C-CDF47BDFF239}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoppingAssistantApi.Api", "ShoppingAssistantApi.Api\ShoppingAssistantApi.Api.csproj", "{77578C0F-EBAD-4CF3-A9D5-9AFFD931E629}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShoppingAssistantApi.Tests", "ShoppingAssistantApi.Tests\ShoppingAssistantApi.Tests.csproj", "{297B5378-79D7-406C-80A5-151C6B3EA147}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {22D8EA12-362A-4B61-9E03-67A44B0762F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22D8EA12-362A-4B61-9E03-67A44B0762F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22D8EA12-362A-4B61-9E03-67A44B0762F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22D8EA12-362A-4B61-9E03-67A44B0762F3}.Release|Any CPU.Build.0 = Release|Any CPU + {9B114C53-F28F-45FE-9724-6A1FFC1C7384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B114C53-F28F-45FE-9724-6A1FFC1C7384}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B114C53-F28F-45FE-9724-6A1FFC1C7384}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B114C53-F28F-45FE-9724-6A1FFC1C7384}.Release|Any CPU.Build.0 = Release|Any CPU + {6CB12F83-2121-4A3C-ADA2-C6F3A7EDB05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6CB12F83-2121-4A3C-ADA2-C6F3A7EDB05F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6CB12F83-2121-4A3C-ADA2-C6F3A7EDB05F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6CB12F83-2121-4A3C-ADA2-C6F3A7EDB05F}.Release|Any CPU.Build.0 = Release|Any CPU + {4F4A48F4-5989-4C26-B87C-CDF47BDFF239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F4A48F4-5989-4C26-B87C-CDF47BDFF239}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F4A48F4-5989-4C26-B87C-CDF47BDFF239}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F4A48F4-5989-4C26-B87C-CDF47BDFF239}.Release|Any CPU.Build.0 = Release|Any CPU + {77578C0F-EBAD-4CF3-A9D5-9AFFD931E629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77578C0F-EBAD-4CF3-A9D5-9AFFD931E629}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77578C0F-EBAD-4CF3-A9D5-9AFFD931E629}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77578C0F-EBAD-4CF3-A9D5-9AFFD931E629}.Release|Any CPU.Build.0 = Release|Any CPU + {297B5378-79D7-406C-80A5-151C6B3EA147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AEC96C8E-AD84-48AC-A0F6-742F94B0C3A8} + EndGlobalSection +EndGlobal From 8b78292ce75c8ecb44d1a81ade97f2b6be660564 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 8 Oct 2023 20:20:13 +0300 Subject: [PATCH 02/85] add database models, data transfer objects and mapper profiles --- .../MappingProfiles/MessageProfile.cs | 15 +++++++++++++++ .../MappingProfiles/WishlistProfile.cs | 15 +++++++++++++++ .../Models/CreateDtos/MessageCreateDto.cs | 6 ++++++ .../Models/CreateDtos/WishlistCreateDto.cs | 7 +++++++ .../Models/Dtos/MessageDto.cs | 11 +++++++++++ .../Models/Dtos/WishlistDto.cs | 11 +++++++++++ ShoppingAssistantApi.Domain/Entities/Message.cs | 12 ++++++++++++ ShoppingAssistantApi.Domain/Entities/Wishlist.cs | 13 +++++++++++++ ShoppingAssistantApi.Domain/Enums/MessageRoles.cs | 7 +++++++ .../Enums/WishlistTypes.cs | 7 +++++++ 10 files changed, 104 insertions(+) create mode 100644 ShoppingAssistantApi.Application/MappingProfiles/MessageProfile.cs create mode 100644 ShoppingAssistantApi.Application/MappingProfiles/WishlistProfile.cs create mode 100644 ShoppingAssistantApi.Application/Models/CreateDtos/MessageCreateDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs create mode 100644 ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/Message.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/Wishlist.cs create mode 100644 ShoppingAssistantApi.Domain/Enums/MessageRoles.cs create mode 100644 ShoppingAssistantApi.Domain/Enums/WishlistTypes.cs diff --git a/ShoppingAssistantApi.Application/MappingProfiles/MessageProfile.cs b/ShoppingAssistantApi.Application/MappingProfiles/MessageProfile.cs new file mode 100644 index 0000000..e06161f --- /dev/null +++ b/ShoppingAssistantApi.Application/MappingProfiles/MessageProfile.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 MessageProfile : Profile +{ + public MessageProfile() + { + CreateMap().ReverseMap(); + + CreateMap().ReverseMap(); + } +} diff --git a/ShoppingAssistantApi.Application/MappingProfiles/WishlistProfile.cs b/ShoppingAssistantApi.Application/MappingProfiles/WishlistProfile.cs new file mode 100644 index 0000000..9b65411 --- /dev/null +++ b/ShoppingAssistantApi.Application/MappingProfiles/WishlistProfile.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 WishlistProfile : Profile +{ + public WishlistProfile() + { + CreateMap().ReverseMap(); + + CreateMap().ReverseMap(); + } +} diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/MessageCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/MessageCreateDto.cs new file mode 100644 index 0000000..b124a4f --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/MessageCreateDto.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.CreateDtos; + +public class MessageCreateDto +{ + public required string Text { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs new file mode 100644 index 0000000..375f70d --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs @@ -0,0 +1,7 @@ +namespace ShoppingAssistantApi.Application.Models.CreateDtos; + +public class WishlistCreateDto +{ + public required string Type { get; set; } + public required string FirstMessageText { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs new file mode 100644 index 0000000..d6882a1 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs @@ -0,0 +1,11 @@ +namespace ShoppingAssistantApi.Application.Models.Dtos; + +public class MessageDto +{ + public required string Id { get; set; } + + public required string Text { get; set; } + public required string Role { get; set; } + + public string? CreatedById { get; set; } = null; +} diff --git a/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs new file mode 100644 index 0000000..6e21f8e --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs @@ -0,0 +1,11 @@ +namespace ShoppingAssistantApi.Application.Models.Dtos; + +public class WishlistDto +{ + public required string Id { get; set; } + + public required string Name { get; set; } + public required string Type { get; set; } + + public string CreatedById { get; set; } = null!; +} diff --git a/ShoppingAssistantApi.Domain/Entities/Message.cs b/ShoppingAssistantApi.Domain/Entities/Message.cs new file mode 100644 index 0000000..a2621bf --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/Message.cs @@ -0,0 +1,12 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class Message : EntityBase +{ + public required string Text { get; set; } + public required string Role { get; set; } + + public ObjectId? WishlistId { get; set; } = null; +} diff --git a/ShoppingAssistantApi.Domain/Entities/Wishlist.cs b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs new file mode 100644 index 0000000..0f3d9e6 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs @@ -0,0 +1,13 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class Wishlist : EntityBase +{ + public required string Name { get; set; } + public required string Type { get; set; } + public ICollection? Messages { get; set; } = null; + + public required ObjectId UserId { get; set; } +} diff --git a/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs b/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs new file mode 100644 index 0000000..c33ee4b --- /dev/null +++ b/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs @@ -0,0 +1,7 @@ +namespace ShoppingAssistantApi.Domain.Enums; + +public enum MessageRoles +{ + User = 0, + Application = 0 +} diff --git a/ShoppingAssistantApi.Domain/Enums/WishlistTypes.cs b/ShoppingAssistantApi.Domain/Enums/WishlistTypes.cs new file mode 100644 index 0000000..f846c98 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Enums/WishlistTypes.cs @@ -0,0 +1,7 @@ +namespace ShoppingAssistantApi.Domain.Enums; + +public enum WishlistTypes +{ + Product = 0, + Gift = 1 +} From 7c6d36122dd3559c72b5d151446d738f65207314 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 8 Oct 2023 20:22:53 +0300 Subject: [PATCH 03/85] add wishlist and message repositories and wishlist service --- .../Exceptions/UnAuthorizedException.cs | 11 +++ .../IRepositories/IMessagerepository.cs | 5 ++ .../IRepositories/IWishlistRepository.cs | 5 ++ .../IServices/IWishlistService.cs | 11 +++ .../ServicesExtention.cs | 1 + .../Services/WishlistsService.cs | 74 +++++++++++++++++++ .../RepositoriesExtention.cs | 2 + .../Repositories/MessagesRepository.cs | 10 +++ .../Repositories/WishlistsRepository.cs | 10 +++ 9 files changed, 129 insertions(+) create mode 100644 ShoppingAssistantApi.Application/Exceptions/UnAuthorizedException.cs create mode 100644 ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs create mode 100644 ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs create mode 100644 ShoppingAssistantApi.Application/IServices/IWishlistService.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs diff --git a/ShoppingAssistantApi.Application/Exceptions/UnAuthorizedException.cs b/ShoppingAssistantApi.Application/Exceptions/UnAuthorizedException.cs new file mode 100644 index 0000000..da8a0fa --- /dev/null +++ b/ShoppingAssistantApi.Application/Exceptions/UnAuthorizedException.cs @@ -0,0 +1,11 @@ +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Application.Exceptions; + +public class UnAuthorizedException : Exception where TEntity : EntityBase +{ + public UnAuthorizedException() { } + + public UnAuthorizedException(ObjectId id) : base(String.Format($"Access to object {id} of type {typeof(TEntity).Name} denied.")) { } +} diff --git a/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs b/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs new file mode 100644 index 0000000..5387549 --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IMessagerepository.cs @@ -0,0 +1,5 @@ +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IMessagesRepository : IBaseRepository { } diff --git a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs new file mode 100644 index 0000000..f5789e5 --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs @@ -0,0 +1,5 @@ +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IWishlistsRepository : IBaseRepository { } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs new file mode 100644 index 0000000..5ba8be9 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -0,0 +1,11 @@ +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IWishlistsService +{ + Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken); + + Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken); +} diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs index a462de4..0db9d03 100644 --- a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -14,6 +14,7 @@ public static class ServicesExtention services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); return services; } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs new file mode 100644 index 0000000..f667126 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -0,0 +1,74 @@ +using AutoMapper; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.Exceptions; +using ShoppingAssistantApi.Application.GlobalInstances; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Domain.Enums; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class WishlistsService : IWishlistsService +{ + private readonly IWishlistsRepository _wishlistsRepository; + private readonly IMessagesRepository _messagesRepository; + private readonly IMapper _mapper; + + public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, IMapper mapper) + { + _wishlistsRepository = wishlistRepository; + _messagesRepository = messageRepository; + _mapper = mapper; + } + + public async Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken) + { + var newWishlist = _mapper.Map(dto); + + newWishlist.CreatedById = (ObjectId) GlobalUser.Id; + newWishlist.CreatedDateUtc = DateTime.UtcNow; + newWishlist.Name = $"{newWishlist.Type} Search"; + + var createdWishlist = await _wishlistsRepository.AddAsync(newWishlist, cancellationToken); + + var newMessage = new Message + { + Text = dto.FirstMessageText, + Role = MessageRoles.User.ToString(), + WishlistId = createdWishlist.Id + }; + var createdMessage = await _messagesRepository.AddAsync(newMessage, cancellationToken); + + return _mapper.Map(createdWishlist); + } + + public async Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken) + { + var newMessage = _mapper.Map(dto); + + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + newMessage.WishlistId = wishlistObjectId; + newMessage.Role = MessageRoles.User.ToString(); + newMessage.CreatedById = (ObjectId) GlobalUser.Id; + newMessage.CreatedDateUtc = DateTime.UtcNow; + + var relatedWishlistPage = await _wishlistsRepository.GetPageAsync(1, 1, x => x.Id == wishlistObjectId && x.CreatedById == GlobalUser.Id, cancellationToken); + var relatedWishlist = relatedWishlistPage.FirstOrDefault(); + + if (relatedWishlist == null) + { + throw new UnAuthorizedException(); + } + + var createdMessage = await _messagesRepository.AddAsync(newMessage, cancellationToken); + + return _mapper.Map(createdMessage); + } +} diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs index 1ff1855..e48ae73 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs @@ -13,6 +13,8 @@ public static class RepositoriesExtention services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); return services; } diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs new file mode 100644 index 0000000..06481f6 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class MessagesRepository : BaseRepository, IMessagesRepository +{ + public MessagesRepository(MongoDbContext db) : base(db, "Messages") { } +} diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs new file mode 100644 index 0000000..da92066 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class WishlistsRepository : BaseRepository, IWishlistsRepository +{ + public WishlistsRepository(MongoDbContext db) : base(db, "Wishlists") { } +} From 60bc38ee372e8a2edc741ccaa44947adcc490a6e Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 8 Oct 2023 20:24:59 +0300 Subject: [PATCH 04/85] add wishlist graphql mutations, data seeding and integrational tests --- .../ApiExtentions/GraphQlExtention.cs | 1 + .../Mutations/WishlistsMutation.cs | 17 ++++ .../PersistanceExtentions/DbInitialaizer.cs | 81 +++++++++++++--- .../Tests/WishlistsTests.cs | 95 +++++++++++++++++++ 4 files changed, 179 insertions(+), 15 deletions(-) create mode 100644 ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs diff --git a/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs index 1d67391..9a214e5 100644 --- a/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs +++ b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs @@ -16,6 +16,7 @@ public static class GraphQlExtention .AddTypeExtension() .AddTypeExtension() .AddTypeExtension() + .AddTypeExtension() .AddAuthorization() .InitializeOnStartup(keepWarm: true); diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs new file mode 100644 index 0000000..9c195fb --- /dev/null +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -0,0 +1,17 @@ +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; + +namespace ShoppingAssistantApi.Api.Mutations; + +[ExtendObjectType(OperationTypeNames.Mutation)] +public class WishlistsMutation +{ + public Task StartPersonalWishlist(WishlistCreateDto dto, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.StartPersonalWishlistAsync(dto, cancellationToken); + + public Task AddMessageToPersonalWishlist(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); +} diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 0753d58..5832f7a 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -1,41 +1,42 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; +using MongoDB.Driver; using ShoppingAssistantApi.Application.GlobalInstances; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.IServices.Identity; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.Identity; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Persistance.Database; namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; public class DbInitialaizer { private readonly IUsersService _usersService; - private readonly IUserManager _userManager; - private readonly IRolesService _rolesService; - private readonly ITokensService _tokensService; - + private readonly IMongoCollection _wishlistCollection; public IEnumerable Roles { get; set; } public DbInitialaizer(IServiceProvider serviceProvider) { - this._usersService = serviceProvider.GetService(); - this._rolesService = serviceProvider.GetService(); - this._userManager = serviceProvider.GetService(); - this._tokensService = serviceProvider.GetService(); + _usersService = serviceProvider.GetService(); + _rolesService = serviceProvider.GetService(); + _userManager = serviceProvider.GetService(); + _tokensService = serviceProvider.GetService(); + _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); } - public async - Task -InitialaizeDb(CancellationToken cancellationToken) + public async Task InitialaizeDb(CancellationToken cancellationToken) { - await this.AddRoles(cancellationToken); - await this.AddUsers(cancellationToken); + await AddRoles(cancellationToken); + await AddUsers(cancellationToken); + await AddWishlistsWithMessages(cancellationToken); } public async Task AddUsers(CancellationToken cancellationToken) @@ -73,7 +74,7 @@ InitialaizeDb(CancellationToken cancellationToken) _userManager.AccessGuestAsync(guestModel5, cancellationToken) ); - var guests = await this._usersService.GetUsersPageAsync(1, 4, cancellationToken); + var guests = await _usersService.GetUsersPageAsync(1, 4, cancellationToken); var guestsResult = guests.Items.ToList(); var user1 = new UserDto @@ -123,7 +124,7 @@ InitialaizeDb(CancellationToken cancellationToken) RefreshToken = _tokensService.GenerateRefreshToken(), RefreshTokenExpiryDate = DateTime.Now.AddDays(7), }; - + GlobalUser.Id = ObjectId.Parse(user1.Id); await _userManager.UpdateAsync(user1, cancellationToken); @@ -158,4 +159,54 @@ InitialaizeDb(CancellationToken cancellationToken) var dto2 = await _rolesService.AddRoleAsync(role2, cancellationToken); var dto3 = await _rolesService.AddRoleAsync(role3, cancellationToken); } + + public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) + { + var usersPage = await _usersService.GetUsersPageAsync(1, 2, cancellationToken); + var userList = usersPage.Items.ToList(); + + var wishlists = new Wishlist[] + { + new Wishlist + { + Name = "Grandma's Birthday Gift", + Type = WishlistTypes.Gift.ToString(), + UserId = 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 + { + Name = "Gaming PC", + Type = WishlistTypes.Product.ToString(), + UserId = ObjectId.Parse(userList[1].Id), + Messages = new Message[] + { + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + }, + new Message + { + Text = "Answer", + Role = MessageRoles.Application.ToString(), + }, + } + } + }; + + await _wishlistCollection.InsertManyAsync(wishlists); + } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs new file mode 100644 index 0000000..e513dc5 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -0,0 +1,95 @@ +using ShoppingAssistantApi.Tests.TestExtentions; +using System.Net.Http.Headers; +using System.Net; +using System.Text; +using Xunit; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Domain.Enums; + +namespace ShoppingAssistantApi.Tests.Tests; + +[Collection("Tests")] +public class WishlistsTests : IClassFixture> +{ + private readonly HttpClient _httpClient; + + public WishlistsTests(TestingFactory factory) + { + _httpClient = factory.CreateClient(); + factory.InitialaizeData().GetAwaiter().GetResult(); + } + + [Fact] + public async Task StartPersonalWishlistAndAddMessageAsync_ValidWishlistAndMessageModels_ReturnsNewWishlistAndMessageModels() + { + var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var startPersonalWishlistMutation = new + { + query = "mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { startPersonalWishlist (dto: $dto) { id, name, type, createdById } }", + variables = new + { + dto = new + { + firstMessageText = "First message", + type = WishlistTypes.Product.ToString() + } + } + }; + + var jsonPayload = JsonConvert.SerializeObject(startPersonalWishlistMutation); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var startPersonalWishlistResponse = await _httpClient.PostAsync("graphql", content); + startPersonalWishlistResponse.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, startPersonalWishlistResponse.StatusCode); + + var responseString = await startPersonalWishlistResponse.Content.ReadAsStringAsync(); + var document = JsonConvert.DeserializeObject(responseString); + + var wishlistId = (string) document.data.startPersonalWishlist.id; + var wishlistCreatedById = (string) document.data.startPersonalWishlist.createdById; + var wishlistType = (string) document.data.startPersonalWishlist.type; + var wishlistName = (string) document.data.startPersonalWishlist.name; + + Assert.Equal(user.Id, wishlistCreatedById); + Assert.Equal(WishlistTypes.Product.ToString(), wishlistType); + Assert.Equal($"{WishlistTypes.Product} Search", wishlistName); + + const string MESSAGE_TEXT = "Second Message"; + + var addMessageToPersonalWishlistMutation = new + { + query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", + variables = new + { + wishlistId = wishlistId, + dto = new + { + text = MESSAGE_TEXT, + } + } + }; + + jsonPayload = JsonConvert.SerializeObject(addMessageToPersonalWishlistMutation); + content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var addMessageToPersonalWishlistResponse = await _httpClient.PostAsync("graphql", content); + addMessageToPersonalWishlistResponse.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, addMessageToPersonalWishlistResponse.StatusCode); + + responseString = await addMessageToPersonalWishlistResponse.Content.ReadAsStringAsync(); + document = JsonConvert.DeserializeObject(responseString); + + var messageRole = (string) document.data.addMessageToPersonalWishlist.role; + var messageText = (string) document.data.addMessageToPersonalWishlist.text; + var messageCreatedById = (string) document.data.addMessageToPersonalWishlist.createdById; + + Assert.Equal(MessageRoles.User.ToString(), messageRole); + Assert.Equal(MESSAGE_TEXT, messageText); + Assert.Equal(user.Id, messageCreatedById); + } +} From 5c30fc21e000cbbb42c5ddde474cb65aa73ca1be Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 11 Oct 2023 14:27:05 +0300 Subject: [PATCH 05/85] fix formatting, fix models, add more tests --- .../ApiExtentions/GraphQlExtention.cs | 1 + .../Queries/WishlistsQuery.cs | 15 ++ .../IRepositories/IWishlistRepository.cs | 6 +- .../IServices/IWishlistService.cs | 3 + .../Models/CreateDtos/WishlistCreateDto.cs | 1 + .../Models/Dtos/MessageDto.cs | 1 + .../Models/Dtos/WishlistDto.cs | 1 + .../Entities/Message.cs | 3 +- .../Entities/Wishlist.cs | 7 +- .../Enums/MessageRoles.cs | 2 +- .../Services/WishlistsService.cs | 19 ++- .../PersistanceExtentions/DbInitialaizer.cs | 8 +- .../Repositories/WishlistsRepository.cs | 7 + .../Tests/WishlistsTests.cs | 154 ++++++++++++++++-- 14 files changed, 203 insertions(+), 25 deletions(-) create mode 100644 ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs diff --git a/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs index 9a214e5..c534a56 100644 --- a/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs +++ b/ShoppingAssistantApi.Api/ApiExtentions/GraphQlExtention.cs @@ -12,6 +12,7 @@ public static class GraphQlExtention .AddQueryType() .AddTypeExtension() .AddTypeExtension() + .AddTypeExtension() .AddMutationType() .AddTypeExtension() .AddTypeExtension() diff --git a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs new file mode 100644 index 0000000..896ccd4 --- /dev/null +++ b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs @@ -0,0 +1,15 @@ +using HotChocolate.Authorization; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; + +namespace ShoppingAssistantApi.Api.Queries; + +[ExtendObjectType(OperationTypeNames.Query)] +public class WishlistsQuery +{ + [Authorize] + public Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.GetPersonalWishlistsPageAsync(pageNumber, pageSize, cancellationToken); +} diff --git a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs index f5789e5..b8c6abf 100644 --- a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs +++ b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs @@ -1,5 +1,9 @@ +using System.Linq.Expressions; using ShoppingAssistantApi.Domain.Entities; namespace ShoppingAssistantApi.Application.IRepositories; -public interface IWishlistsRepository : IBaseRepository { } +public interface IWishlistsRepository : IBaseRepository +{ + public Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken); +} diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index 5ba8be9..696909e 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -1,5 +1,6 @@ using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; namespace ShoppingAssistantApi.Application.IServices; @@ -8,4 +9,6 @@ public interface IWishlistsService Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken); Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken); + + Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs index 375f70d..7a5f7a6 100644 --- a/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/WishlistCreateDto.cs @@ -3,5 +3,6 @@ namespace ShoppingAssistantApi.Application.Models.CreateDtos; public class WishlistCreateDto { public required string Type { get; set; } + public required string FirstMessageText { get; set; } } diff --git a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs index d6882a1..a33c92e 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs @@ -5,6 +5,7 @@ public class MessageDto public required string Id { get; set; } public required string Text { get; set; } + public required string Role { get; set; } public string? CreatedById { get; set; } = null; diff --git a/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs index 6e21f8e..9398c26 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/WishlistDto.cs @@ -5,6 +5,7 @@ public class WishlistDto public required string Id { get; set; } public required string Name { get; set; } + public required string Type { get; set; } public string CreatedById { get; set; } = null!; diff --git a/ShoppingAssistantApi.Domain/Entities/Message.cs b/ShoppingAssistantApi.Domain/Entities/Message.cs index a2621bf..8a50457 100644 --- a/ShoppingAssistantApi.Domain/Entities/Message.cs +++ b/ShoppingAssistantApi.Domain/Entities/Message.cs @@ -6,7 +6,8 @@ namespace ShoppingAssistantApi.Domain.Entities; public class Message : EntityBase { public required string Text { get; set; } + public required string Role { get; set; } - public ObjectId? WishlistId { get; set; } = null; + public ObjectId WishlistId { get; set; } } diff --git a/ShoppingAssistantApi.Domain/Entities/Wishlist.cs b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs index 0f3d9e6..11fe978 100644 --- a/ShoppingAssistantApi.Domain/Entities/Wishlist.cs +++ b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs @@ -1,4 +1,3 @@ -using MongoDB.Bson; using ShoppingAssistantApi.Domain.Common; namespace ShoppingAssistantApi.Domain.Entities; @@ -6,8 +5,8 @@ namespace ShoppingAssistantApi.Domain.Entities; public class Wishlist : EntityBase { public required string Name { get; set; } - public required string Type { get; set; } - public ICollection? Messages { get; set; } = null; - public required ObjectId UserId { get; set; } + public required string Type { get; set; } + + public ICollection? Messages { get; set; } } diff --git a/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs b/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs index c33ee4b..8e8cd5d 100644 --- a/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs +++ b/ShoppingAssistantApi.Domain/Enums/MessageRoles.cs @@ -3,5 +3,5 @@ namespace ShoppingAssistantApi.Domain.Enums; public enum MessageRoles { User = 0, - Application = 0 + Application = 1 } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index f667126..f066848 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -15,7 +15,9 @@ namespace ShoppingAssistantApi.Infrastructure.Services; public class WishlistsService : IWishlistsService { private readonly IWishlistsRepository _wishlistsRepository; + private readonly IMessagesRepository _messagesRepository; + private readonly IMapper _mapper; public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, IMapper mapper) @@ -29,6 +31,12 @@ public class WishlistsService : IWishlistsService { var newWishlist = _mapper.Map(dto); + if (!Enum.TryParse(newWishlist.Type, true, out var enumValue) || + !Enum.GetValues().Contains(enumValue)) + { + throw new InvalidDataException("Provided type is invalid."); + } + newWishlist.CreatedById = (ObjectId) GlobalUser.Id; newWishlist.CreatedDateUtc = DateTime.UtcNow; newWishlist.Name = $"{newWishlist.Type} Search"; @@ -59,8 +67,7 @@ public class WishlistsService : IWishlistsService newMessage.CreatedById = (ObjectId) GlobalUser.Id; newMessage.CreatedDateUtc = DateTime.UtcNow; - var relatedWishlistPage = await _wishlistsRepository.GetPageAsync(1, 1, x => x.Id == wishlistObjectId && x.CreatedById == GlobalUser.Id, cancellationToken); - var relatedWishlist = relatedWishlistPage.FirstOrDefault(); + var relatedWishlist = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistObjectId && x.CreatedById == GlobalUser.Id, cancellationToken); if (relatedWishlist == null) { @@ -71,4 +78,12 @@ public class WishlistsService : IWishlistsService return _mapper.Map(createdMessage); } + + public async Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) + { + var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, cancellationToken); + var dtos = _mapper.Map>(entities); + var count = await _wishlistsRepository.GetTotalCountAsync(); + return new PagedList(dtos, pageNumber, pageSize, count); + } } diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 5832f7a..a9068c6 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -16,9 +16,13 @@ namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; public class DbInitialaizer { private readonly IUsersService _usersService; + private readonly IUserManager _userManager; + private readonly IRolesService _rolesService; + private readonly ITokensService _tokensService; + private readonly IMongoCollection _wishlistCollection; public IEnumerable Roles { get; set; } @@ -171,7 +175,7 @@ public class DbInitialaizer { Name = "Grandma's Birthday Gift", Type = WishlistTypes.Gift.ToString(), - UserId = ObjectId.Parse(userList[0].Id), + CreatedById = ObjectId.Parse(userList[0].Id), Messages = new Message[] { new Message @@ -190,7 +194,7 @@ public class DbInitialaizer { Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), - UserId = ObjectId.Parse(userList[1].Id), + CreatedById = ObjectId.Parse(userList[1].Id), Messages = new Message[] { new Message diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs index da92066..04aca96 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.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,9 @@ namespace ShoppingAssistantApi.Persistance.Repositories; public class WishlistsRepository : BaseRepository, IWishlistsRepository { public WishlistsRepository(MongoDbContext db) : base(db, "Wishlists") { } + + public async Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken) + { + return await (await _collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index e513dc5..b67ad6a 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -4,7 +4,6 @@ using System.Net; using System.Text; using Xunit; using Newtonsoft.Json; -using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Domain.Enums; namespace ShoppingAssistantApi.Tests.Tests; @@ -21,13 +20,13 @@ public class WishlistsTests : IClassFixture> } [Fact] - public async Task StartPersonalWishlistAndAddMessageAsync_ValidWishlistAndMessageModels_ReturnsNewWishlistAndMessageModels() + public async Task StartPersonalWishlistAsync_ValidWishlistModel_ReturnsNewWishlistModels() { - var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); + var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); var user = await UserExtention.GetCurrentUser(_httpClient); - var startPersonalWishlistMutation = new + var mutation = new { query = "mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { startPersonalWishlist (dto: $dto) { id, name, type, createdById } }", variables = new @@ -40,33 +39,104 @@ public class WishlistsTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(startPersonalWishlistMutation); + var jsonPayload = JsonConvert.SerializeObject(mutation); var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - using var startPersonalWishlistResponse = await _httpClient.PostAsync("graphql", content); - startPersonalWishlistResponse.EnsureSuccessStatusCode(); - Assert.Equal(HttpStatusCode.OK, startPersonalWishlistResponse.StatusCode); + using var response = await _httpClient.PostAsync("graphql", content); + response.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var responseString = await startPersonalWishlistResponse.Content.ReadAsStringAsync(); + var responseString = await response.Content.ReadAsStringAsync(); var document = JsonConvert.DeserializeObject(responseString); var wishlistId = (string) document.data.startPersonalWishlist.id; var wishlistCreatedById = (string) document.data.startPersonalWishlist.createdById; var wishlistType = (string) document.data.startPersonalWishlist.type; var wishlistName = (string) document.data.startPersonalWishlist.name; - + Assert.Equal(user.Id, wishlistCreatedById); Assert.Equal(WishlistTypes.Product.ToString(), wishlistType); Assert.Equal($"{WishlistTypes.Product} Search", wishlistName); + } + + [Fact] + public async Task GetPersonalWishlistsPage_ValidPageNumberAndSize_ReturnsPage() + { + var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _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 = 3, + pageSize = 1 + } + }; + + 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 AddMessageToPersonalWishlist_ValidMessageModel_ReturnsNewMessageModel() + { + var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _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 addMessageToPersonalWishlistMutation = new + var mutation = new { query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", variables = new { - wishlistId = wishlistId, + wishlistId = personalWishlistId, dto = new { text = MESSAGE_TEXT, @@ -74,7 +144,7 @@ public class WishlistsTests : IClassFixture> } }; - jsonPayload = JsonConvert.SerializeObject(addMessageToPersonalWishlistMutation); + jsonPayload = JsonConvert.SerializeObject(mutation); content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); using var addMessageToPersonalWishlistResponse = await _httpClient.PostAsync("graphql", content); @@ -87,9 +157,65 @@ public class WishlistsTests : IClassFixture> var messageRole = (string) document.data.addMessageToPersonalWishlist.role; var messageText = (string) document.data.addMessageToPersonalWishlist.text; var messageCreatedById = (string) document.data.addMessageToPersonalWishlist.createdById; - + Assert.Equal(MessageRoles.User.ToString(), messageRole); Assert.Equal(MESSAGE_TEXT, messageText); Assert.Equal(user.Id, messageCreatedById); } + + [Fact] + public async Task StartPersonalWishlistAsync_InvalidWishlistModel_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _httpClient); + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + var user = await UserExtention.GetCurrentUser(_httpClient); + + var mutation = new + { + query = "mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { startPersonalWishlist (dto: $dto) { id, name, type, createdById } }", + variables = new + { + dto = new + { + firstMessageText = "First message", + type = "Invalid type" // Invalid Wishlist Type + } + } + }; + + 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 AddMessageToPersonalWishlist_InvalidMessageModel_ReturnsInternalServerError() + { + var tokensModel = await AccessExtention.Login("shopping.assistant.team@gmail.com", "Yuiop12345", _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 = "8125jad7g12", // Invalid wishlistId + 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); + } } From 4e04a86d6a6e8091098556260ad8794028b6ef09 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 11 Oct 2023 16:53:46 +0300 Subject: [PATCH 06/85] remove http data retrieval in WishlistsTests --- .../PersistanceExtentions/DbInitialaizer.cs | 28 ++------ .../Tests/WishlistsTests.cs | 68 +++++++------------ 2 files changed, 30 insertions(+), 66 deletions(-) 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); From 5127290365712ee0149256fd149c09b58151b79e Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 11 Oct 2023 19:57:33 +0300 Subject: [PATCH 07/85] add GetPersonalWishlist GraphQL query covered by integrational tests --- .../Queries/WishlistsQuery.cs | 5 ++ .../IServices/IWishlistService.cs | 2 + .../Services/WishlistsService.cs | 18 ++++ .../PersistanceExtentions/DbInitialaizer.cs | 20 ++++- .../Tests/WishlistsTests.cs | 86 ++++++++++++++++++- 5 files changed, 126 insertions(+), 5 deletions(-) diff --git a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs index 896ccd4..389864f 100644 --- a/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/WishlistsQuery.cs @@ -12,4 +12,9 @@ public class WishlistsQuery 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) + => wishlistsService.GetPersonalWishlistAsync(wishlistId, cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index 696909e..5bfae6a 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -11,4 +11,6 @@ public interface IWishlistsService Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken); Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); + + Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index f066848..7e1fc40 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -86,4 +86,22 @@ public class WishlistsService : IWishlistsService var count = await _wishlistsRepository.GetTotalCountAsync(); return new PagedList(dtos, pageNumber, pageSize, count); } + + public async Task GetPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + 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(); + } + + return _mapper.Map(entity); + } } diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 5b66554..a63c8f7 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -169,7 +169,8 @@ public class DbInitialaizer public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) { - var user = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); + var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); + var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua"))).FirstAsync(); var wishlists = new Wishlist[] { @@ -178,7 +179,7 @@ public class DbInitialaizer Id = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), - CreatedById = user.Id, + CreatedById = user1.Id, Messages = new Message[] { new Message @@ -192,6 +193,21 @@ public class DbInitialaizer Role = MessageRoles.Application.ToString(), }, } + }, + new Wishlist + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Name = "Generic Wishlist Name", + Type = WishlistTypes.Product.ToString(), + CreatedById = user2.Id, + Messages = new Message[] + { + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + } + } } }; diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 4dbdcf0..d153a33 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -94,14 +94,48 @@ 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); } + [Fact] + public async Task GetPersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlistDto() + { + 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 personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = TESTING_WISHLIST_ID + } + }; + + 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 personalWishlistId = (string) document.data.personalWishlist.id; + var personalWishlistName = (string) document.data.personalWishlist.name; + 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(user.Id, personalWishlistCreatedById); + } + [Fact] public async Task AddMessageToPersonalWishlist_ValidMessageModel_ReturnsNewMessageModel() { @@ -170,6 +204,52 @@ public class WishlistsTests : IClassFixture> Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [Fact] + public async Task GetPersonalWishlist_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 query = new + { + query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = "1234567890abcdef12345678" // Invalid wishlistId + } + }; + + 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.InternalServerError, response.StatusCode); + } + + [Fact] + public async Task GetPersonalWishlist_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 query = new + { + query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + variables = new + { + wishlistId = "ab6c2c2d9edf39abcd1ef9ab" // Other user's wishlist + } + }; + + 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.InternalServerError, response.StatusCode); + } + [Fact] public async Task AddMessageToPersonalWishlist_InvalidMessageModel_ReturnsInternalServerError() { From e9c3b57fc4e95efad1903fb75071e8dca37e6e2e Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 12 Oct 2023 20:55:34 +0300 Subject: [PATCH 08/85] 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 09/85] 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 10/85] 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 11/85] 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 12/85] 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 13/85] 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 3a6c72a8be8db53642db16d160f9306064414f3a Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Sat, 14 Oct 2023 21:16:23 +0300 Subject: [PATCH 14/85] SA-29 created openai service --- .../IServices/Identity/IOpenAiService.cs | 10 ++ .../Models/OpenAi/OpenAiChoice.cs | 12 +++ .../Models/OpenAi/OpenAiDelta.cs | 8 ++ .../Models/OpenAi/OpenAiResponse.cs | 16 +++ .../Models/OpenAi/OpenAiUsage.cs | 10 ++ .../Services/Identity/OpenAiService.cs | 101 ++++++++++++++++++ ...ShoppingAssistantApi.Infrastructure.csproj | 1 + 7 files changed, 158 insertions(+) create mode 100644 ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/OpenAiChoice.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/OpenAiDelta.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/OpenAiResponse.cs create mode 100644 ShoppingAssistantApi.Application/Models/OpenAi/OpenAiUsage.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs diff --git a/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs b/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs new file mode 100644 index 0000000..0f5d5d1 --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Application.Models.OpenAi; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IOpenAiService +{ + Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken); + + IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiChoice.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiChoice.cs new file mode 100644 index 0000000..3ce06dc --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiChoice.cs @@ -0,0 +1,12 @@ +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class OpenAiChoice +{ + public OpenAiMessage Message { get; set; } + + public OpenAiDelta Delta { get; set; } + + public string FinishReason { get; set; } + + public int Index { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiDelta.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiDelta.cs new file mode 100644 index 0000000..c9b7dbc --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiDelta.cs @@ -0,0 +1,8 @@ +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class OpenAiDelta +{ + public string Role { get; set; } + + public string Content { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiResponse.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiResponse.cs new file mode 100644 index 0000000..991b854 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiResponse.cs @@ -0,0 +1,16 @@ +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class OpenAiResponse +{ + public string Id { get; set; } + + public string Object { get; set; } + + public int Created { get; set; } + + public string Model { get; set; } + + public OpenAiUsage Usage { get; set; } + + public List Choices { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiUsage.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiUsage.cs new file mode 100644 index 0000000..6789eac --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiUsage.cs @@ -0,0 +1,10 @@ +namespace ShoppingAssistantApi.Application.Models.OpenAi; + +public class OpenAiUsage +{ + public int PromptTokens { get; set; } + + public int CompletionTokens { get; set; } + + public int TotalTokens { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs new file mode 100644 index 0000000..88e4b50 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs @@ -0,0 +1,101 @@ +using System; +using System.Net.Http.Headers; +using System.Text; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.OpenAi; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class OpenaiService : IOpenAiService +{ + private readonly HttpClient _httpClient; + + private readonly JsonSerializerSettings _jsonSettings = new JsonSerializerSettings + { + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new SnakeCaseNamingStrategy() + }, + NullValueHandling = NullValueHandling.Ignore, + }; + + private readonly IConfiguration _configuration; + + //private readonly OpenAIClient _openAiClient; + + private readonly ILogger _logger; + + public OpenaiService( + IConfiguration configuration, + IHttpClientFactory httpClientFactory, + ILogger logger + ) + { + _httpClient = httpClientFactory.CreateClient("OpenAiHttpClient"); + _configuration = configuration; + + //var openAIApiKey = _configuration.GetSection("OpenAi")?.GetValue("ApiKey"); + //_openAiClient = new OpenAIClient(openAIApiKey, new OpenAIClientOptions()); + + _logger = logger; + } + + public async IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) + { + chat.Stream = true; + var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); + _logger.LogInformation(jsonBody); + var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions") + { + Content = body + }; + request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream")); + + using var httpResponse = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); + + var allData = string.Empty; + + using var streamReader = new StreamReader(await httpResponse.Content.ReadAsStringAsync(cancellationToken)); + while(!streamReader.EndOfStream) + { + var line = await streamReader.ReadLineAsync(); + allData += line + "\n\n"; + if (string.IsNullOrEmpty(line)) continue; + + var json = line?.Substring(6, line.Length - 6); + if (json == "[DONE]") yield break; + + var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); + yield return OpenAiResponse; + } + } + + public async Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) + { + chat.Stream = false; + var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); + var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + + _logger.LogInformation(jsonBody); + using var httpResponse = await _httpClient.PostAsync("chat/completions", body, cancellationToken); + + var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken); + + var responses = new List(); + foreach (var line in responseBody.Split(new[] {"\n\n"}, StringSplitOptions.RemoveEmptyEntries)) + { + if (line.Trim() == "[DONE]") break; + + var json = line.Substring(6); + var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); + responses.Add(OpenAiResponse); + } + + return responses.Count > 0 ? responses.Last() : null; + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj index 6b6f722..ab6f623 100644 --- a/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj +++ b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj @@ -11,6 +11,7 @@ + From 534fc3293d0a69e09b5a869d5480d7c0540df089 Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Sat, 14 Oct 2023 22:03:50 +0300 Subject: [PATCH 15/85] SA-29 bugs fixed --- .../IServices/Identity/IOpenAiService.cs | 10 -- .../Services/Identity/OpenAiService.cs | 101 ------------------ .../Services/OpenAiService.cs | 72 ++++++++++++- 3 files changed, 67 insertions(+), 116 deletions(-) delete mode 100644 ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs delete mode 100644 ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs diff --git a/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs b/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs deleted file mode 100644 index 0f5d5d1..0000000 --- a/ShoppingAssistantApi.Application/IServices/Identity/IOpenAiService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using ShoppingAssistantApi.Application.Models.OpenAi; - -namespace ShoppingAssistantApi.Application.IServices; - -public interface IOpenAiService -{ - Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken); - - IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken); -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs deleted file mode 100644 index 88e4b50..0000000 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/OpenAiService.cs +++ /dev/null @@ -1,101 +0,0 @@ -using System; -using System.Net.Http.Headers; -using System.Text; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Application.Models.OpenAi; - -namespace ShoppingAssistantApi.Infrastructure.Services; - -public class OpenaiService : IOpenAiService -{ - private readonly HttpClient _httpClient; - - private readonly JsonSerializerSettings _jsonSettings = new JsonSerializerSettings - { - ContractResolver = new DefaultContractResolver - { - NamingStrategy = new SnakeCaseNamingStrategy() - }, - NullValueHandling = NullValueHandling.Ignore, - }; - - private readonly IConfiguration _configuration; - - //private readonly OpenAIClient _openAiClient; - - private readonly ILogger _logger; - - public OpenaiService( - IConfiguration configuration, - IHttpClientFactory httpClientFactory, - ILogger logger - ) - { - _httpClient = httpClientFactory.CreateClient("OpenAiHttpClient"); - _configuration = configuration; - - //var openAIApiKey = _configuration.GetSection("OpenAi")?.GetValue("ApiKey"); - //_openAiClient = new OpenAIClient(openAIApiKey, new OpenAIClientOptions()); - - _logger = logger; - } - - public async IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) - { - chat.Stream = true; - var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); - _logger.LogInformation(jsonBody); - var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions") - { - Content = body - }; - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream")); - - using var httpResponse = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); - - var allData = string.Empty; - - using var streamReader = new StreamReader(await httpResponse.Content.ReadAsStringAsync(cancellationToken)); - while(!streamReader.EndOfStream) - { - var line = await streamReader.ReadLineAsync(); - allData += line + "\n\n"; - if (string.IsNullOrEmpty(line)) continue; - - var json = line?.Substring(6, line.Length - 6); - if (json == "[DONE]") yield break; - - var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); - yield return OpenAiResponse; - } - } - - public async Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) - { - chat.Stream = false; - var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); - var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - - _logger.LogInformation(jsonBody); - using var httpResponse = await _httpClient.PostAsync("chat/completions", body, cancellationToken); - - var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken); - - var responses = new List(); - foreach (var line in responseBody.Split(new[] {"\n\n"}, StringSplitOptions.RemoveEmptyEntries)) - { - if (line.Trim() == "[DONE]") break; - - var json = line.Substring(6); - var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); - responses.Add(OpenAiResponse); - } - - return responses.Count > 0 ? responses.Last() : null; - } -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs index 9ed750a..1d083e4 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs @@ -1,3 +1,8 @@ +using System; +using System.Net.Http.Headers; +using System.Text; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.OpenAi; @@ -5,6 +10,16 @@ namespace ShoppingAssistantApi.Infrastructure.Services; public class OpenAiService : IOpenAiService { + + private readonly JsonSerializerSettings _jsonSettings = new JsonSerializerSettings + { + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new SnakeCaseNamingStrategy() + }, + NullValueHandling = NullValueHandling.Ignore, + }; + private readonly HttpClient _httpClient; public OpenAiService(HttpClient client) @@ -12,13 +27,60 @@ public class OpenAiService : IOpenAiService _httpClient = client; } - public Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) + + + public async Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) { - throw new NotImplementedException(); + chat.Stream = false; + var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); + var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + + + using var httpResponse = await _httpClient.PostAsync("chat/completions", body, cancellationToken); + + var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken); + + var responses = new List(); + foreach (var line in responseBody.Split(new[] {"\n\n"}, StringSplitOptions.RemoveEmptyEntries)) + { + if (line.Trim() == "[DONE]") break; + + var json = line.Substring(6); + var OpenAiMessage = JsonConvert.DeserializeObject(json, _jsonSettings); + responses.Add(OpenAiMessage); + } + + return responses.Count > 0 ? responses.Last() : null; } - public IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) + public async IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) { - throw new NotImplementedException(); + chat.Stream = true; + var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); + + var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions") + { + Content = body + }; + request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream")); + + using var httpResponse = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); + + var allData = string.Empty; + + using var streamReader = new StreamReader(await httpResponse.Content.ReadAsStringAsync(cancellationToken)); + while(!streamReader.EndOfStream) + { + var line = await streamReader.ReadLineAsync(); + allData += line + "\n\n"; + if (string.IsNullOrEmpty(line)) continue; + + var json = line?.Substring(6, line.Length - 6); + if (json == "[DONE]") yield break; + + var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); + yield return OpenAiResponse; + } } -} +} \ No newline at end of file From 547c23f7c0f53fbb8d3ed13817fcb929102b11e2 Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 19:53:12 +0000 Subject: [PATCH 16/85] SA-14 added extensions to devcontainer --- .devcontainer/devcontainer.json | 5 ++++- .vscode/settings.json | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0e6d68c..8c8e5e0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,7 +20,10 @@ "kreativ-software.csharpextensions", "ms-dotnettools.csharp", "patcx.vscode-nuget-gallery", - "mhutchie.git-graph" + "mhutchie.git-graph", + "fernandoescolar.vscode-solution-explorer", + "formulahendry.dotnet-test-explorer", + "GitHub.copilot" ] } } diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d9821aa --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.exclude": { + "**/bin": true + } +} \ No newline at end of file From 5679b2837dffd90316566e4d14eaa034bdb79e8f Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 19:53:47 +0000 Subject: [PATCH 17/85] SA-14 expanded base repository --- .../IRepositories/IBaseRepository.cs | 7 ++++++- .../Repositories/BaseRepository.cs | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs index f2a2ceb..ebcb860 100644 --- a/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs +++ b/ShoppingAssistantApi.Application/IRepositories/IBaseRepository.cs @@ -1,4 +1,5 @@ -using ShoppingAssistantApi.Domain.Common; +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Common; using System.Linq.Expressions; namespace ShoppingAssistantApi.Application.IRepositories; @@ -7,6 +8,10 @@ public interface IBaseRepository where TEntity : EntityBase { Task AddAsync(TEntity entity, CancellationToken cancellationToken); + Task GetOneAsync(ObjectId id, CancellationToken cancellationToken); + + Task GetOneAsync(Expression> predicate, CancellationToken cancellationToken); + Task> GetPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); Task> GetPageAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index 565112e..dbfba85 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -1,11 +1,13 @@ -using MongoDB.Driver; +using MongoDB.Bson; +using MongoDB.Driver; +using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Common; using ShoppingAssistantApi.Persistance.Database; using System.Linq.Expressions; namespace ShoppingAssistantApi.Persistance.Repositories; -public abstract class BaseRepository where TEntity : EntityBase +public abstract class BaseRepository : IBaseRepository where TEntity : EntityBase { protected MongoDbContext _db; @@ -17,6 +19,16 @@ public abstract class BaseRepository where TEntity : EntityBase this._collection = _db.Db.GetCollection(collectionName); } + public async Task GetOneAsync(ObjectId id, CancellationToken cancellationToken) + { + return await this._collection.Find(x => x.Id == id).FirstOrDefaultAsync(cancellationToken); + } + + public async Task GetOneAsync(Expression> predicate, CancellationToken cancellationToken) + { + return await this._collection.Find(predicate).FirstOrDefaultAsync(cancellationToken); + } + public async Task AddAsync(TEntity entity, CancellationToken cancellationToken) { await this._collection.InsertOneAsync(entity, new InsertOneOptions(), cancellationToken); From 4102312fe96ce85efd97f03c68204827d089113a Mon Sep 17 00:00:00 2001 From: shchoholiev-opflo Date: Sat, 14 Oct 2023 19:55:13 +0000 Subject: [PATCH 18/85] Sa-14 added RefreshTokensRepository --- .../IRepositories/IRefreshTokensRepository.cs | 8 ++++++++ ShoppingAssistantApi.Domain/Entities/RefreshToken.cs | 10 ++++++++++ .../PersistanceExtentions/RepositoriesExtention.cs | 1 + .../Repositories/RefreshTokensRepository.cs | 10 ++++++++++ 4 files changed, 29 insertions(+) create mode 100644 ShoppingAssistantApi.Application/IRepositories/IRefreshTokensRepository.cs create mode 100644 ShoppingAssistantApi.Domain/Entities/RefreshToken.cs create mode 100644 ShoppingAssistantApi.Persistance/Repositories/RefreshTokensRepository.cs diff --git a/ShoppingAssistantApi.Application/IRepositories/IRefreshTokensRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IRefreshTokensRepository.cs new file mode 100644 index 0000000..492e62e --- /dev/null +++ b/ShoppingAssistantApi.Application/IRepositories/IRefreshTokensRepository.cs @@ -0,0 +1,8 @@ +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.IRepositories; + +public interface IRefreshTokensRepository : IBaseRepository +{ + +} diff --git a/ShoppingAssistantApi.Domain/Entities/RefreshToken.cs b/ShoppingAssistantApi.Domain/Entities/RefreshToken.cs new file mode 100644 index 0000000..e36974b --- /dev/null +++ b/ShoppingAssistantApi.Domain/Entities/RefreshToken.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Domain.Common; + +namespace ShoppingAssistantApi.Domain.Entities; + +public class RefreshToken : EntityBase +{ + public string Token { get; set; } + + public DateTime ExpiryDateUTC { get; set; } +} diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs index e48ae73..3d076e3 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/RepositoriesExtention.cs @@ -13,6 +13,7 @@ public static class RepositoriesExtention services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/ShoppingAssistantApi.Persistance/Repositories/RefreshTokensRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/RefreshTokensRepository.cs new file mode 100644 index 0000000..0228cf9 --- /dev/null +++ b/ShoppingAssistantApi.Persistance/Repositories/RefreshTokensRepository.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Persistance.Repositories; + +public class RefreshTokensRepository : BaseRepository, IRefreshTokensRepository +{ + public RefreshTokensRepository(MongoDbContext db) : base(db, "RefreshTokens") { } +} From 4f67175ff7c50b47cc641362816a2f3f3b4ef32c Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 15 Oct 2023 09:44:20 +0300 Subject: [PATCH 19/85] 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 20/85] 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 21/85] 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 22/85] 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 23/85] 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 24/85] 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 25/85] 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 26/85] 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 27/85] 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 28/85] 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 29/85] 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 30/85] 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") } }; From 39bed12f30077ded23b537ea347fd7d471793631 Mon Sep 17 00:00:00 2001 From: shchoholiev Date: Mon, 16 Oct 2023 03:22:49 +0000 Subject: [PATCH 31/85] SA-14 Updated User model structure and Services --- .devcontainer/devcontainer.json | 6 + .../Mutations/AccessMutation.cs | 14 +- .../Mutations/RolesMutation.cs | 12 +- .../Mutations/UsersMutation.cs | 20 +- .../IServices/Identity/ITokensService.cs | 5 +- .../IServices/Identity/IUsersManager.cs | 8 +- ShoppingAssistantApi.Domain/Entities/User.cs | 4 - .../Services/Identity/TokensService.cs | 66 +--- .../Services/Identity/UserManager.cs | 299 +++++++++++------- .../Services/RolesService.cs | 4 +- .../Services/ServiceBase.cs | 15 + .../Repositories/UsersRepository.cs | 4 - 12 files changed, 249 insertions(+), 208 deletions(-) create mode 100644 ShoppingAssistantApi.Infrastructure/Services/ServiceBase.cs diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8c8e5e0..5ad2e4e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,6 +14,12 @@ // "protocol": "https" // } // } + + // Container is not working on M1 Mac + // "runArgs": [ + // "--platform=linux/amd64" + // ], + "customizations": { "vscode": { "extensions": [ diff --git a/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs b/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs index 7abc641..df920c0 100644 --- a/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/AccessMutation.cs @@ -7,14 +7,14 @@ namespace ShoppingAssistantApi.Api.Mutations; public class AccessMutation { public Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.LoginAsync(login, cancellationToken); + [Service] IUserManager userManager) + => userManager.LoginAsync(login, cancellationToken); public Task AccessGuestAsync(AccessGuestModel guest, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.AccessGuestAsync(guest, cancellationToken); + [Service] IUserManager userManager) + => userManager.AccessGuestAsync(guest, cancellationToken); - public Task RefreshUserTokenAsync(TokensModel model, CancellationToken cancellationToken, - [Service] ITokensService tokensService) - => tokensService.RefreshUserAsync(model, cancellationToken); + public Task RefreshAccessTokenAsync(TokensModel model, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.RefreshAccessTokenAsync(model, cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs b/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs index a4c98bb..e8e2138 100644 --- a/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/RolesMutation.cs @@ -1,22 +1,14 @@ -using ShoppingAssistantApi.Application.IServices.Identity; +using HotChocolate.Authorization; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; -using ShoppingAssistantApi.Application.Models.Identity; namespace ShoppingAssistantApi.Api.Mutations; [ExtendObjectType(OperationTypeNames.Mutation)] public class RolesMutation { - public Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.AddToRoleAsync(roleName, id, cancellationToken); - - public Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.RemoveFromRoleAsync(roleName, id, cancellationToken); - + [Authorize] public Task AddRole(RoleCreateDto roleDto, CancellationToken cancellationToken, [Service] IRolesService rolesService) => rolesService.AddRoleAsync(roleDto, cancellationToken); diff --git a/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs b/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs index 1185f97..6beaccf 100644 --- a/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/UsersMutation.cs @@ -10,11 +10,21 @@ public class UsersMutation { [Authorize] public Task UpdateUserAsync(UserDto userDto, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.UpdateAsync(userDto, cancellationToken); + [Service] IUserManager userManager) + => userManager.UpdateAsync(userDto, cancellationToken); [Authorize] - public Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken, - [Service] IUserManager userManager) - => userManager.UpdateUserByAdminAsync(id, userDto, cancellationToken); + public Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.UpdateUserByAdminAsync(id, userDto, cancellationToken); + + [Authorize] + public Task AddToRoleAsync(string roleName, string userId, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.AddToRoleAsync(roleName, userId, cancellationToken); + + [Authorize] + public Task RemoveFromRoleAsync(string roleName, string userId, CancellationToken cancellationToken, + [Service] IUserManager userManager) + => userManager.RemoveFromRoleAsync(roleName, userId, cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs b/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs index 2dda569..a6f14d7 100644 --- a/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs +++ b/ShoppingAssistantApi.Application/IServices/Identity/ITokensService.cs @@ -1,5 +1,4 @@ -using ShoppingAssistantApi.Application.Models.Identity; -using System.Security.Claims; +using System.Security.Claims; namespace ShoppingAssistantApi.Application.IServices.Identity; @@ -9,5 +8,5 @@ public interface ITokensService string GenerateRefreshToken(); - Task RefreshUserAsync(TokensModel tokensModel, CancellationToken cancellationToken); + ClaimsPrincipal GetPrincipalFromExpiredToken(string token); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs b/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs index 72c84ae..4a07f20 100644 --- a/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs +++ b/ShoppingAssistantApi.Application/IServices/Identity/IUsersManager.cs @@ -10,11 +10,13 @@ public interface IUserManager Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken); - Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken); + Task AddToRoleAsync(string roleName, string userId, CancellationToken cancellationToken); - Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken); + Task RemoveFromRoleAsync(string roleName, string userId, CancellationToken cancellationToken); Task UpdateAsync(UserDto userDto, CancellationToken cancellationToken); - Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken); + Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken); + + Task RefreshAccessTokenAsync(TokensModel tokensModel, CancellationToken cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Domain/Entities/User.cs b/ShoppingAssistantApi.Domain/Entities/User.cs index 7f5a0b1..27e928b 100644 --- a/ShoppingAssistantApi.Domain/Entities/User.cs +++ b/ShoppingAssistantApi.Domain/Entities/User.cs @@ -13,8 +13,4 @@ public class User : EntityBase public string? Email { get; set; } public string? PasswordHash { get; set; } - - public string RefreshToken { get; set; } - - public DateTime RefreshTokenExpiryDate { get; set; } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs index 2ea9728..b50f302 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/TokensService.cs @@ -5,10 +5,7 @@ using System.Text; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; -using MongoDB.Bson; -using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices.Identity; -using ShoppingAssistantApi.Application.Models.Identity; namespace ShoppingAssistantApi.Infrastructure.Services.Identity; @@ -16,50 +13,16 @@ public class TokensService : ITokensService { private readonly IConfiguration _configuration; - private readonly IUsersRepository _usersRepository; - private readonly ILogger _logger; - public TokensService(IConfiguration configuration, IUsersRepository usersRepository, - ILogger logger) + public TokensService( + IConfiguration configuration, + ILogger logger) { this._configuration = configuration; - this._usersRepository = usersRepository; this._logger = logger; } - public async Task RefreshUserAsync(TokensModel tokensModel, CancellationToken cancellationToken) - { - var principal = this.GetPrincipalFromExpiredToken(tokensModel.AccessToken); - - var userId = principal.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value; - if (!ObjectId.TryParse(userId, out var objectId)) - { - throw new InvalidDataException("Provided id is invalid."); - } - - var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); - if (user == null || user?.RefreshToken != tokensModel.RefreshToken - || user?.RefreshTokenExpiryDate <= DateTime.UtcNow) - { - throw new SecurityTokenExpiredException(); - } - - var newAccessToken = this.GenerateAccessToken(principal.Claims); - var newRefreshToken = this.GenerateRefreshToken(); - user.RefreshToken = newRefreshToken; - user.RefreshTokenExpiryDate = DateTime.UtcNow.AddDays(30); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); - - this._logger.LogInformation($"Refreshed user tokens."); - - return new TokensModel - { - AccessToken = newAccessToken, - RefreshToken = newRefreshToken - }; - } - public string GenerateAccessToken(IEnumerable claims) { var tokenOptions = GetTokenOptions(claims); @@ -73,18 +36,16 @@ public class TokensService : ITokensService public string GenerateRefreshToken() { var randomNumber = new byte[32]; - using (var rng = RandomNumberGenerator.Create()) - { - rng.GetBytes(randomNumber); - var refreshToken = Convert.ToBase64String(randomNumber); + using var rng = RandomNumberGenerator.Create(); + rng.GetBytes(randomNumber); + var refreshToken = Convert.ToBase64String(randomNumber); - this._logger.LogInformation($"Generated new refresh token."); + this._logger.LogInformation($"Generated new refresh token."); - return refreshToken; - } + return refreshToken; } - private ClaimsPrincipal GetPrincipalFromExpiredToken(string token) + public ClaimsPrincipal GetPrincipalFromExpiredToken(string token) { var tokenValidationParameters = new TokenValidationParameters { @@ -96,11 +57,10 @@ public class TokensService : ITokensService ValidateLifetime = false }; var tokenHandler = new JwtSecurityTokenHandler(); - SecurityToken securityToken; - var principal = tokenHandler.ValidateToken(token, tokenValidationParameters, out securityToken); + var principal = tokenHandler.ValidateToken(token, tokenValidationParameters, out var securityToken); var jwtSecurityToken = securityToken as JwtSecurityToken; - if (jwtSecurityToken == null || !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, - StringComparison.InvariantCultureIgnoreCase)) + if (jwtSecurityToken == null + || !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase)) throw new SecurityTokenException("Invalid token"); this._logger.LogInformation($"Returned data from expired access token."); @@ -117,7 +77,7 @@ public class TokensService : ITokensService var tokenOptions = new JwtSecurityToken( issuer: _configuration.GetValue("JsonWebTokenKeys:ValidIssuer"), audience: _configuration.GetValue("JsonWebTokenKeys:ValidAudience"), - expires: DateTime.UtcNow.AddMinutes(5), + expires: DateTime.UtcNow.AddMinutes(15), claims: claims, signingCredentials: signinCredentials ); diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs index 571ad9c..7720477 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs @@ -1,7 +1,6 @@ using AutoMapper; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; -using Microsoft.Win32; using MongoDB.Bson; using ShoppingAssistantApi.Application.Exceptions; using ShoppingAssistantApi.Application.GlobalInstances; @@ -14,23 +13,32 @@ using ShoppingAssistantApi.Domain.Entities; using System.Security.Claims; using System.Text.RegularExpressions; - namespace ShoppingAssistantApi.Infrastructure.Services.Identity; -public class UserManager : IUserManager + +public class UserManager : ServiceBase, IUserManager { private readonly IUsersRepository _usersRepository; - private readonly ILogger _logger; - private readonly IPasswordHasher _passwordHasher; private readonly ITokensService _tokensService; + private readonly IRolesRepository _rolesRepository; + + private readonly IRefreshTokensRepository _refreshTokensRepository; + private readonly IMapper _mapper; - private readonly IRolesRepository _rolesRepository; + private readonly ILogger _logger; - public UserManager(IUsersRepository usersRepository, ILogger logger, IPasswordHasher passwordHasher, ITokensService tokensService, IMapper mapper, IRolesRepository rolesRepository) + public UserManager( + IUsersRepository usersRepository, + IPasswordHasher passwordHasher, + ITokensService tokensService, + IRolesRepository rolesRepository, + IRefreshTokensRepository refreshTokensRepository, + IMapper mapper, + ILogger logger) { this._usersRepository = usersRepository; this._logger = logger; @@ -38,15 +46,16 @@ public class UserManager : IUserManager this._tokensService = tokensService; this._mapper = mapper; this._rolesRepository = rolesRepository; - + this._refreshTokensRepository = refreshTokensRepository; } public async Task LoginAsync(AccessUserModel login, CancellationToken cancellationToken) { - var user = login.Email != null - ? await this._usersRepository.GetUserAsync(x => x.Email == login.Email, cancellationToken) - : await this._usersRepository.GetUserAsync(x => x.Phone == login.Phone, cancellationToken); + _logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}."); + var user = string.IsNullOrEmpty(login.Phone) + ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email, cancellationToken) + : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -57,197 +66,216 @@ public class UserManager : IUserManager throw new InvalidDataException("Invalid password!"); } - user.RefreshToken = this.GetRefreshToken(); - user.RefreshTokenExpiryDate = DateTime.UtcNow.AddDays(30); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); - var tokens = this.GetUserTokens(user); + var refreshToken = await AddRefreshToken(user.Id, cancellationToken); - this._logger.LogInformation($"Logged in user with email: {login.Email}."); + var tokens = this.GetUserTokens(user, refreshToken); + + this._logger.LogInformation($"Logged in user with email: {login.Email} and phone: {login.Phone}."); return tokens; } public async Task AccessGuestAsync(AccessGuestModel guest, CancellationToken cancellationToken) { + _logger.LogInformation($"Logging in / Registering guest with guest id: {guest.GuestId}."); + var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId, cancellationToken); - if (user != null) + if (user == null) { - user.RefreshToken = this.GetRefreshToken(); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); - var userTokens = this.GetUserTokens(user); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); + user = new User + { + GuestId = guest.GuestId, + Roles = new List { role }, + CreatedDateUtc = DateTime.UtcNow, + CreatedById = ObjectId.Empty // Default value for all new users + }; - this._logger.LogInformation($"Logged in guest with guest id: {guest.GuestId}."); + await this._usersRepository.AddAsync(user, cancellationToken); - return userTokens; + this._logger.LogInformation($"Created guest with guest id: {guest.GuestId}."); } - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); + var refreshToken = await AddRefreshToken(user.Id, cancellationToken); + var tokens = this.GetUserTokens(user, refreshToken); - var newUser = new User - { - GuestId = guest.GuestId, - Roles = new List { role }, - RefreshToken = this.GetRefreshToken(), - RefreshTokenExpiryDate = DateTime.Now.AddDays(30), - CreatedDateUtc = DateTime.UtcNow, - LastModifiedDateUtc = DateTime.UtcNow - }; - - await this._usersRepository.AddAsync(newUser, cancellationToken); - var tokens = this.GetUserTokens(newUser); - - this._logger.LogInformation($"Created guest with guest id: {guest.GuestId}."); + this._logger.LogInformation($"Logged in guest with guest id: {guest.GuestId}."); return tokens; } - public async Task AddToRoleAsync(string roleName, string id, CancellationToken cancellationToken) + public async Task RefreshAccessTokenAsync(TokensModel tokensModel, CancellationToken cancellationToken) { + _logger.LogInformation($"Refreshing access token."); + + var principal = _tokensService.GetPrincipalFromExpiredToken(tokensModel.AccessToken); + var userId = ParseObjectId(principal.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value); + + var refreshTokenModel = await this._refreshTokensRepository + .GetOneAsync(r => + r.Token == tokensModel.RefreshToken + && r.CreatedById == userId + && r.IsDeleted == false, cancellationToken); + if (refreshTokenModel == null || refreshTokenModel.ExpiryDateUTC < DateTime.UtcNow) + { + throw new SecurityTokenExpiredException(); + } + + var refreshToken = refreshTokenModel.Token; + + // Update Refresh token if it expires in less than 7 days to keep user constantly logged in if he uses the app + if (refreshTokenModel.ExpiryDateUTC.AddDays(-7) < DateTime.UtcNow) + { + await _refreshTokensRepository.DeleteAsync(refreshTokenModel, cancellationToken); + + var newRefreshToken = await AddRefreshToken(userId, cancellationToken); + refreshToken = newRefreshToken.Token; + } + + var tokens = new TokensModel + { + AccessToken = _tokensService.GenerateAccessToken(principal.Claims), + RefreshToken = refreshToken + }; + + this._logger.LogInformation($"Refreshed access token."); + + return tokens; + } + + public async Task AddToRoleAsync(string roleName, string userId, CancellationToken cancellationToken) + { + _logger.LogInformation($"Adding Role: {roleName} to User with Id: {userId}."); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); if (role == null) { throw new EntityNotFoundException(); } - if (!ObjectId.TryParse(id, out var objectId)) - { - throw new InvalidDataException("Provided id is invalid."); - } - - var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + var userObjectId = ParseObjectId(userId); + var user = await this._usersRepository.GetUserAsync(userObjectId, cancellationToken); if (user == null) { throw new EntityNotFoundException(); } user.Roles.Add(role); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); - var tokens = this.GetUserTokens(user); + var updatedUser = await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var userDto = this._mapper.Map(updatedUser); - this._logger.LogInformation($"Added role {roleName} to user with id: {id}."); + this._logger.LogInformation($"Added Role: {roleName} to User with Id: {userId}."); - return tokens; + return userDto; } - public async Task RemoveFromRoleAsync(string roleName, string id, CancellationToken cancellationToken) + public async Task RemoveFromRoleAsync(string roleName, string userId, CancellationToken cancellationToken) { + _logger.LogInformation($"Removing Role: {roleName} from User with Id: {userId}."); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); if (role == null) { throw new EntityNotFoundException(); } - if (!ObjectId.TryParse(id, out var objectId)) - { - throw new InvalidDataException("Provided id is invalid."); - } - - var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + var userObjectId = ParseObjectId(userId); + var user = await this._usersRepository.GetUserAsync(userObjectId, cancellationToken); if (user == null) { throw new EntityNotFoundException(); } var deletedRole = user.Roles.Find(x => x.Name == role.Name); - user.Roles.Remove(deletedRole); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); - var tokens = this.GetUserTokens(user); - this._logger.LogInformation($"Added role {roleName} to user with id: {id}."); + var updatedUser = await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var userDto = this._mapper.Map(updatedUser); - return tokens; + this._logger.LogInformation($"Removed Role: {roleName} from User with Id: {userId}."); + + return userDto; } public async Task UpdateAsync(UserDto userDto, CancellationToken cancellationToken) { - if (userDto.Email != null) ValidateEmail(userDto.Email); - if (userDto.Phone != null) ValidateNumber(userDto.Phone); - - if (userDto.Roles.Any(x => x.Name == "Guest") && !userDto.Roles.Any(x => x.Name == "User")) - { - if (userDto.Password != null && (userDto.Email != null || userDto.Phone != null)) - { - var roleEntity = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); - var roleDto = this._mapper.Map(roleEntity); - userDto.Roles.Add(roleDto); - } - } + _logger.LogInformation($"Updating user with id: {GlobalUser.Id}."); var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id, cancellationToken); - if (user == null) { throw new EntityNotFoundException(); } - if (userDto.Roles.Any(x => x.Name == "User") && userDto.Email != null) - { - if (await this._usersRepository.GetUserAsync(x => x.Email == userDto.Email, cancellationToken) != null) - { - throw new EntityAlreadyExistsException("email", userDto.Email); - } - } - if (userDto.Roles.Any(x => x.Name == "User") && userDto.Phone != null) - { - if (await this._usersRepository.GetUserAsync(x => x.Phone == userDto.Phone, cancellationToken) != null) - { - throw new EntityAlreadyExistsException("phone", userDto.Phone); - } - } + await ValidateUserAsync(userDto, user, cancellationToken); this._mapper.Map(userDto, user); - if (!userDto.Password.IsNullOrEmpty()) + if (!string.IsNullOrEmpty(userDto.Password)) { user.PasswordHash = this._passwordHasher.Hash(userDto.Password); } - user.RefreshToken = this.GetRefreshToken(); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); + await CheckAndUpgradeToUserAsync(user, cancellationToken); - var tokens = this.GetUserTokens(user); + var updatedUser = await this._usersRepository.UpdateUserAsync(user, cancellationToken); - this._logger.LogInformation($"Update user with id: {GlobalUser.Id.ToString()}."); + var refreshToken = await AddRefreshToken(user.Id, cancellationToken); + var tokens = this.GetUserTokens(user, refreshToken); - return new UpdateUserModel() { Tokens = tokens, User = this._mapper.Map(user) }; + var updatedUserDto = this._mapper.Map(updatedUser); + + this._logger.LogInformation($"Update user with id: {GlobalUser.Id}."); + + return new UpdateUserModel() + { + Tokens = tokens, + User = updatedUserDto + }; } - public async Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken) + public async Task UpdateUserByAdminAsync(string id, UserDto userDto, CancellationToken cancellationToken) { - if (!ObjectId.TryParse(id, out var objectId)) - { - throw new InvalidDataException("Provided id is invalid."); - } - - var user = await this._usersRepository.GetUserAsync(objectId, cancellationToken); + _logger.LogInformation($"Admin updating User with Id: {id}."); + var userObjectId = ParseObjectId(id); + var user = await this._usersRepository.GetUserAsync(userObjectId, cancellationToken); if (user == null) { throw new EntityNotFoundException(); } + await ValidateUserAsync(userDto, user, cancellationToken); + this._mapper.Map(userDto, user); + var updatedUser = await this._usersRepository.UpdateUserAsync(user, cancellationToken); - user.RefreshToken = this.GetRefreshToken(); - await this._usersRepository.UpdateUserAsync(user, cancellationToken); + var updatedUserDto = this._mapper.Map(updatedUser); + + this._logger.LogInformation($"Admin updated User with Id: {id}."); - var tokens = this.GetUserTokens(user); - - this._logger.LogInformation($"Update user with id: {id}."); - - return new UpdateUserModel() { Tokens = tokens, User = this._mapper.Map(user) }; + return updatedUserDto; } - private string GetRefreshToken() + private async Task AddRefreshToken(ObjectId userId, CancellationToken cancellationToken) { - var refreshToken = this._tokensService.GenerateRefreshToken(); + _logger.LogInformation($"Adding new refresh token for user with Id : {userId}."); - this._logger.LogInformation($"Returned new refresh token."); + var refreshToken = new RefreshToken + { + Token = _tokensService.GenerateRefreshToken(), + ExpiryDateUTC = DateTime.UtcNow.AddDays(30), + CreatedById = userId, + CreatedDateUtc = DateTime.UtcNow + }; + + await this._refreshTokensRepository.AddAsync(refreshToken, cancellationToken); + + this._logger.LogInformation($"Added new refresh token."); return refreshToken; } - private TokensModel GetUserTokens(User user) + private TokensModel GetUserTokens(User user, RefreshToken refreshToken) { var claims = this.GetClaims(user); var accessToken = this._tokensService.GenerateAccessToken(claims); @@ -257,7 +285,7 @@ public class UserManager : IUserManager return new TokensModel { AccessToken = accessToken, - RefreshToken = user.RefreshToken, + RefreshToken = refreshToken.Token, }; } @@ -265,21 +293,56 @@ public class UserManager : IUserManager { var claims = new List() { - new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), - new Claim(ClaimTypes.Email, user.Email ?? string.Empty), - new Claim(ClaimTypes.MobilePhone, user.Phone ?? string.Empty), + new (ClaimTypes.NameIdentifier, user.Id.ToString()), + new (ClaimTypes.Email, user.Email ?? string.Empty), + new (ClaimTypes.MobilePhone, user.Phone ?? string.Empty), }; foreach (var role in user.Roles) { - claims.Add(new Claim(ClaimTypes.Role, role.Name)); + claims.Add(new (ClaimTypes.Role, role.Name)); } - this._logger.LogInformation($"Returned claims for user with id: {user.Id.ToString()}."); + this._logger.LogInformation($"Returned claims for User with Id: {user.Id}."); return claims; } + private async Task CheckAndUpgradeToUserAsync(User user, CancellationToken cancellationToken) + { + if (user.Roles.Any(x => x.Name == "Guest") && !user.Roles.Any(x => x.Name == "User")) + { + if (!string.IsNullOrEmpty(user.PasswordHash) && (!string.IsNullOrEmpty(user.Email) || !string.IsNullOrEmpty(user.Phone))) + { + var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); + user.Roles.Add(role); + } + } + } + + private async Task ValidateUserAsync(UserDto userDto, User user, CancellationToken cancellationToken) + { + if (!string.IsNullOrEmpty(userDto.Email)) + { + ValidateEmail(userDto.Email); + if (userDto.Email != user.Email + && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email, cancellationToken)) + { + throw new EntityAlreadyExistsException("email", userDto.Email); + } + } + + if (!string.IsNullOrEmpty(userDto.Phone)) + { + ValidatePhone(userDto.Phone); + if (userDto.Phone != user.Phone + && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone, cancellationToken)) + { + throw new EntityAlreadyExistsException("phone", userDto.Phone); + } + } + } + private void ValidateEmail(string email) { string regex = @"^[^@\s]+@[^@\s]+\.[^@\s]+$"; @@ -290,7 +353,7 @@ public class UserManager : IUserManager } } - private void ValidateNumber(string phone) + private void ValidatePhone(string phone) { string regex = @"^\+[0-9]{1,15}$"; diff --git a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs index 7881ec4..d30bc3b 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs @@ -33,14 +33,16 @@ public class RolesService : IRolesService entity.CreatedDateUtc = DateTime.UtcNow; entity.LastModifiedDateUtc = DateTime.UtcNow; await this._repository.AddAsync(entity, cancellationToken); + return this._mapper.Map(entity); } public async Task> GetRolesPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) { var entities = await this._repository.GetPageAsync(pageNumber, pageSize, cancellationToken); - var dtos = this._mapper.Map>(entities); var count = await this._repository.GetTotalCountAsync(); + var dtos = this._mapper.Map>(entities); + return new PagedList(dtos, pageNumber, pageSize, count); } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ServiceBase.cs b/ShoppingAssistantApi.Infrastructure/Services/ServiceBase.cs new file mode 100644 index 0000000..3e1381f --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/ServiceBase.cs @@ -0,0 +1,15 @@ +namespace ShoppingAssistantApi.Infrastructure.Services; +using MongoDB.Bson; + +public abstract class ServiceBase +{ + public ObjectId ParseObjectId(string? id) + { + if (ObjectId.TryParse(id, out ObjectId objectId)) + { + return objectId; + } + + throw new InvalidDataException("Provided id cannot be parsed to a MongoDb ObjectId."); + } +} diff --git a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs index 198bc08..39b4ab5 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs @@ -27,8 +27,6 @@ public class UsersRepository : BaseRepository, IUsersRepository var updateDefinition = Builders.Update .Set(u => u.Email, user.Email) .Set(u => u.Phone, user.Phone) - .Set(u => u.RefreshToken, user.RefreshToken) - .Set(u => u.RefreshTokenExpiryDate, user.RefreshTokenExpiryDate) .Set(u => u.GuestId, user.GuestId) .Set(u => u.Roles, user.Roles) .Set(u => u.PasswordHash, user.PasswordHash) @@ -42,7 +40,5 @@ public class UsersRepository : BaseRepository, IUsersRepository return await this._collection.FindOneAndUpdateAsync( Builders.Filter.Eq(u => u.Id, user.Id), updateDefinition, options, cancellationToken); - } - } From 6b8154e4743c2749da36ae8dfc77161ab6309dba Mon Sep 17 00:00:00 2001 From: shchoholiev Date: Mon, 16 Oct 2023 03:23:07 +0000 Subject: [PATCH 32/85] SA-14 fixed and refactored integration tests --- .../Database/MongoDbContext.cs | 2 + .../ShoppingAssistantApi.Tests.csproj | 1 - .../TestExtentions/AccessExtention.cs | 65 ---- .../TestExtentions/DbInitializer.cs | 140 +++++++ .../TestExtentions/TestingFactory.cs | 54 ++- .../TestExtentions/UserExtention.cs | 50 --- .../Tests/AccessTests.cs | 176 +++++---- .../Tests/RolesTests.cs | 209 ++++------- ShoppingAssistantApi.Tests/Tests/TestsBase.cs | 66 ++++ .../Tests/UsersTests.cs | 349 ++++++++++-------- .../Tests/WishlistsTests.cs | 267 ++++++-------- ShoppingAssistantApi.Tests/Usings.cs | 4 + 12 files changed, 716 insertions(+), 667 deletions(-) delete mode 100644 ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs create mode 100644 ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs delete mode 100644 ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/TestsBase.cs create mode 100644 ShoppingAssistantApi.Tests/Usings.cs diff --git a/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs b/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs index ea3f3a3..ac3876e 100644 --- a/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs +++ b/ShoppingAssistantApi.Persistance/Database/MongoDbContext.cs @@ -16,4 +16,6 @@ public class MongoDbContext } public IMongoDatabase Db => this._db; + + public MongoClient Client => this._client; } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj index a7e4074..c36f3b4 100644 --- a/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj +++ b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj @@ -10,7 +10,6 @@ - diff --git a/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs b/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs deleted file mode 100644 index 16e0a03..0000000 --- a/ShoppingAssistantApi.Tests/TestExtentions/AccessExtention.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Text; -using Newtonsoft.Json; -using ShoppingAssistantApi.Application.Models.Identity; - -namespace ShoppingAssistantApi.Tests.TestExtentions; - -public static class AccessExtention -{ - public static async Task Login(string email, string password, HttpClient httpClient) - { - var mutation = new - { - query = "mutation Login($login: AccessUserModelInput!) { login(login: $login) { accessToken refreshToken }}", - variables = new - { - login = new - { - email = email, - password = password - } - } - }; - - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - - using var response = await httpClient.PostAsync("graphql", content); - var responseString = await response.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - - return new TokensModel - { - AccessToken = (string)document.data.login.accessToken, - RefreshToken = (string)document.data.login.refreshToken - }; - } - - public static async Task CreateGuest(string guestId, HttpClient httpClient) - { - var mutation = new - { - query = "mutation AccessGuest($guest: AccessGuestModelInput!) { accessGuest(guest: $guest) { accessToken, refreshToken } }", - variables = new - { - guest = new - { - guestId - } - } - }; - - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - - using var response = await httpClient.PostAsync("graphql", content); - var responseString = await response.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - - return new TokensModel - { - AccessToken = (string)document.data.accessGuest.accessToken, - RefreshToken = (string)document.data.accessGuest.refreshToken - }; - } -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs new file mode 100644 index 0000000..ae2ed20 --- /dev/null +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -0,0 +1,140 @@ +using Microsoft.Extensions.Logging; +using MongoDB.Bson; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Infrastructure.Services.Identity; +using ShoppingAssistantApi.Persistance.Database; + +namespace ShoppingAssistantApi.Tests.TestExtentions; + +public class DbInitializer +{ + private readonly MongoDbContext _dbContext; + + public DbInitializer(MongoDbContext dbContext) + { + _dbContext = dbContext; + } + + public void InitializeDb() + { + _dbContext.Client.DropDatabase(_dbContext.Db.DatabaseNamespace.DatabaseName); + + InitializeUsersAsync().Wait(); + InitializeWishlistsAsync().Wait(); + } + + public async Task InitializeUsersAsync() + { + #region Roles + + var rolesCollection = _dbContext.Db.GetCollection("Roles"); + + var questRole = new Role + { + Name = "Guest" + }; + await rolesCollection.InsertOneAsync(questRole); + + var userRole = new Role + { + Name = "User" + }; + await rolesCollection.InsertOneAsync(userRole); + + var adminRole = new Role + { + Name = "Admin" + }; + await rolesCollection.InsertOneAsync(adminRole); + + #endregion + + #region Users + + var passwordHasher = new PasswordHasher(new Logger(new LoggerFactory())); + var usersCollection = _dbContext.Db.GetCollection("Users"); + + var testUser = new User + { + Id = ObjectId.Parse("652c3b89ae02a3135d6409fc"), + Email = "test@gmail.com", + Phone = "+380953326869", + Roles = new List { questRole, userRole }, + PasswordHash = passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Empty, + CreatedDateUtc = DateTime.UtcNow + }; + await usersCollection.InsertOneAsync(testUser); + + var adminUser = new User + { + Id = ObjectId.Parse("652c3b89ae02a3135d6408fc"), + Email = "admin@gmail.com", + Phone = "+12345678901", + Roles = new List { questRole, userRole, adminRole }, + PasswordHash = passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Empty, + CreatedDateUtc = DateTime.UtcNow + }; + await usersCollection.InsertOneAsync(adminUser); + + var wishlistsUser = new User + { + Id = ObjectId.Parse("652c3b89ae02a3135d6418fc"), + Email = "wishlists@gmail.com", + Phone = "+12234567890", + Roles = new List { questRole }, + PasswordHash = passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Empty, + CreatedDateUtc = DateTime.UtcNow + }; + await usersCollection.InsertOneAsync(wishlistsUser); + + #endregion + } + + public async Task InitializeWishlistsAsync() + { + var wishlistsCollection = _dbContext.Db.GetCollection("Wishlists"); + + var gamingPcWishlist = new Wishlist + { + Id = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), + Name = "Gaming PC", + Type = WishlistTypes.Product.ToString(), + CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc"), + Messages = new Message[] + { + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + }, + new Message + { + Text = "Answer", + Role = MessageRoles.Application.ToString(), + }, + } + }; + await wishlistsCollection.InsertOneAsync(gamingPcWishlist); + + var genericWishlist = new Wishlist + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Name = "Generic Wishlist Name", + Type = WishlistTypes.Product.ToString(), + CreatedById = ObjectId.Parse("652c3b89ae02a3135d6409fc"), + Messages = new Message[] + { + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + } + } + }; + await wishlistsCollection.InsertOneAsync(genericWishlist); + } +} diff --git a/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs b/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs index a8407df..a63a957 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/TestingFactory.cs @@ -1,48 +1,64 @@ -using Microsoft.AspNetCore.Hosting; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Mongo2Go; -using ShoppingAssistantApi.Persistance.PersistanceExtentions; +using ShoppingAssistantApi.Persistance.Database; namespace ShoppingAssistantApi.Tests.TestExtentions; public class TestingFactory : WebApplicationFactory where TEntryPoint : Program { - private readonly MongoDbRunner _runner = MongoDbRunner.Start(); + private MongoDbRunner? _runner; private bool _isDataInitialaized = false; protected override void ConfigureWebHost(IWebHostBuilder builder) { + // Mongo2Go is not supported on ARM64 so we need to use a real MongoDB instance + Console.WriteLine($"[ARCH]: {RuntimeInformation.ProcessArchitecture}"); + + var connectionString = string.Empty; + if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + { + connectionString = "mongodb+srv://api:pUe2dLT8llwEgwzq@cluster0.3q6mxmw.mongodb.net/?retryWrites=true&w=majority"; + } + else + { + _runner = MongoDbRunner.Start(); + connectionString = _runner.ConnectionString; + } + builder.ConfigureAppConfiguration((context, config) => { - var dbConfig = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary() - { - { "ConnectionStrings:MongoDb", _runner.ConnectionString } - }) - .Build(); + var dbConfig = new ConfigurationBuilder() + .AddInMemoryCollection(new Dictionary() + { + { "ConnectionStrings:MongoDb", connectionString } + }) + .Build(); config.AddConfiguration(dbConfig); }); } - public async Task InitialaizeData() + public void InitialaizeDatabase() { - if (!_isDataInitialaized) - { - _isDataInitialaized = true; - using var scope = Services.CreateScope(); - var initialaizer = new DbInitialaizer(scope.ServiceProvider); - using var cancellationTokenSource = new CancellationTokenSource(); - var cancellationToken = cancellationTokenSource.Token; - await initialaizer.InitialaizeDb(cancellationToken); - } + if (_isDataInitialaized) return; + + using var scope = Services.CreateScope(); + var mongodbContext = scope.ServiceProvider.GetRequiredService(); + + var initialaizer = new DbInitializer(mongodbContext); + initialaizer.InitializeDb(); + + _isDataInitialaized = true; } protected override void Dispose(bool disposing) { - _runner.Dispose(); + _runner?.Dispose(); base.Dispose(disposing); } } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs b/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs deleted file mode 100644 index 269ff8a..0000000 --- a/ShoppingAssistantApi.Tests/TestExtentions/UserExtention.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Net.Http.Headers; -using System.Text; -using Newtonsoft.Json; -using ShoppingAssistantApi.Application.Models.Dtos; - -namespace ShoppingAssistantApi.Tests.TestExtentions; - -public static class UserExtention -{ - public static async Task GetCurrentUser(HttpClient httpClient) - { - var query = new - { - query = "query CurrentUser { currentUser { id, guestId, phone, email, refreshToken, refreshTokenExpiryDate, roles { id, name }}}", - variables = new { } - }; - - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - - using var response = await httpClient.PostAsync("graphql", content); - var responseString = await response.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - return JsonConvert.DeserializeObject(document.data.currentUser.ToString()); - } - - public static async Task> GetUsers(int amount, HttpClient httpClient) - { - var accessToken = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", httpClient); - httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.AccessToken); - - var query = new - { - query = "query UsersPage($pageNumber: Int!, $pageSize: Int!) { usersPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, email, phone }}}", - variables = new - { - pageNumber = 1, - pageSize = amount - } - }; - - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); - - using var response = await httpClient.PostAsync("graphql", content); - var responseString = await response.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - return JsonConvert.DeserializeObject>(document.data.usersPage.items.ToString()); - } -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/AccessTests.cs b/ShoppingAssistantApi.Tests/Tests/AccessTests.cs index 65f29f4..74f6cc1 100644 --- a/ShoppingAssistantApi.Tests/Tests/AccessTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/AccessTests.cs @@ -1,26 +1,21 @@ -using System.Net; -using System.Text; -using Xunit; +using Newtonsoft.Json.Linq; +using ShoppingAssistantApi.Application.Models.Identity; using ShoppingAssistantApi.Tests.TestExtentions; -using Newtonsoft.Json; +using Xunit; namespace ShoppingAssistantApi.Tests.Tests; -[Collection("Tests")] - -public class AccessTests : IClassFixture> +// TODO: make errors test more descrptive +public class AccessTests : TestsBase { - private readonly HttpClient _httpClient; - public AccessTests(TestingFactory factory) - { - _httpClient = factory.CreateClient(); - factory.InitialaizeData().GetAwaiter().GetResult(); - } + : base(factory) + { } [Fact] public async Task AccessGuestAsync_ValidGuid_ReturnsTokensModel() { + // Arrange var mutation = new { query = "mutation AccessGuest($guest: AccessGuestModelInput!) { accessGuest(guest: $guest) { accessToken, refreshToken } }", @@ -33,27 +28,20 @@ public class AccessTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + // Act + var jsonObject = await SendGraphQlRequestAsync(mutation); + var tokens = (TokensModel?) jsonObject?.data?.accessGuest?.ToObject(); - 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 accessToken = (string)document.data.accessGuest.accessToken; - var refreshToken = (string)document.data.accessGuest.refreshToken; - - Assert.NotNull(accessToken); - Assert.NotNull(refreshToken); - } + // Assert + Assert.NotNull(tokens); + Assert.NotNull(tokens.AccessToken); + Assert.NotNull(tokens.RefreshToken); + } [Theory] - [InlineData("")] + [InlineData(null)] [InlineData("invalid-guid-format")] - public async Task AccessGuestAsync_InvalidGuid_ReturnsInternalServerError(string guestId) + public async Task AccessGuestAsync_InvalidGuid_ReturnsErrors(string guestId) { var mutation = new { @@ -67,19 +55,19 @@ public class AccessTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Theory] [InlineData("invalid-email-format", null, "Yuiop12345")] + [InlineData(null, "invalid-phone", "Yuiop12345")] + [InlineData("test@gmail.com", null, "random-password")] [InlineData(null, null, "Yuiop12345")] - [InlineData(null, null, "")] - [InlineData("mihail.beloded.work@gmail.com", null, "")] - public async Task LoginAsync_InvalidCredentials_ReturnsInternalServerError(string email, string phone, string password) + public async Task LoginAsync_InvalidCredentials_ReturnsErrors(string email, string phone, string password) { var mutation = new { @@ -95,17 +83,17 @@ public class AccessTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } - + [Theory] - [InlineData("mykhailo.bilodid@nure.ua", "+380953326869", "Yuiop12345")] - [InlineData(null, "+380953326888", "Yuiop12345")] - [InlineData("mykhailo.bilodid@nure.ua", null, "Yuiop12345")] + [InlineData("test@gmail.com", "+380953326869", "Yuiop12345")] + [InlineData(null, "+380953326869", "Yuiop12345")] + [InlineData("test@gmail.com", null, "Yuiop12345")] public async Task LoginAsync_ValidCredentials_ReturnsTokensModel(string email, string phone, string password) { var mutation = new @@ -121,83 +109,85 @@ public class AccessTests : IClassFixture> } } }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var tokens = (TokensModel?) jsonObject?.data?.login?.ToObject(); - var jsonPayload = JsonConvert.SerializeObject(mutation); - 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 accessToken = (string)document.data.login.accessToken; - var refreshToken = (string)document.data.login.refreshToken; - - Assert.NotNull(accessToken); - Assert.NotNull(refreshToken); + Assert.NotNull(tokens); + Assert.NotNull(tokens.AccessToken); + Assert.NotNull(tokens.RefreshToken); } [Fact] public async Task RefreshUserTokenAsync_ValidTokensModel_ReturnsTokensModel() { - var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); - var accessToken = tokensModel.AccessToken; - var refreshToken = tokensModel.RefreshToken; - + var tokensModel = await CreateGuestAsync(); var mutation = new { - query = "mutation RefreshToken($model: TokensModelInput!) { refreshUserToken(model: $model) { accessToken refreshToken }}", + query = "mutation RefreshToken($model: TokensModelInput!) { refreshAccessToken(model: $model) { accessToken refreshToken }}", variables = new { model = new { - accessToken, - refreshToken + accessToken = tokensModel.AccessToken, + refreshToken = tokensModel.RefreshToken } } }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var tokens = (TokensModel?) jsonObject?.data?.refreshAccessToken?.ToObject(); - var jsonPayload = JsonConvert.SerializeObject(mutation); - 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 accessTokenResult = (string)document.data.refreshUserToken.accessToken; - var refreshTokenResult = (string)document.data.refreshUserToken.refreshToken; - - Assert.NotNull(accessTokenResult); - Assert.NotNull(refreshTokenResult); + Assert.NotNull(tokens); + Assert.NotNull(tokens.AccessToken); + Assert.NotNull(tokens.RefreshToken); } - [Theory] - [InlineData(null, null)] - [InlineData("invalid-access-token", "invalid-refresh-token")] - public async Task RefreshUserTokenAsync_InvalidTokensModel_ReturnsInternalServerError(string refreshToken, string accessToken) + [Fact] + public async Task RefreshAccessTokenAsync_NonExistingRefreshToken_ReturnsErrors() { var mutation = new { - query = "mutation RefreshToken($model: TokensModelInput!) { refreshUserToken(model: $model) { accessToken refreshToken }}", + query = "mutation RefreshToken($model: TokensModelInput!) { refreshAccessToken(model: $model) { accessToken refreshToken }}", variables = new { model = new { - accessToken, - refreshToken + accessToken = "random-access-token", + refreshToken = "random-refresh-token" } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + private async Task CreateGuestAsync() + { + var mutation = new + { + query = @" + mutation AccessGuest($guest: AccessGuestModelInput!) { + accessGuest(guest: $guest) { + accessToken, refreshToken + } + }", + variables = new + { + guest = new + { + guestId = Guid.NewGuid() + } + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var tokens = (TokensModel?) jsonObject?.data?.accessGuest?.ToObject(); + + return tokens; } } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/RolesTests.cs b/ShoppingAssistantApi.Tests/Tests/RolesTests.cs index 29b3774..2e52ef1 100644 --- a/ShoppingAssistantApi.Tests/Tests/RolesTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/RolesTests.cs @@ -1,138 +1,42 @@ -using System.Net; -using System.Text; -using Xunit; -using ShoppingAssistantApi.Tests.TestExtentions; -using System.Net.Http.Headers; -using Newtonsoft.Json; -using GreenDonut; +using ShoppingAssistantApi.Tests.TestExtentions; +using Newtonsoft.Json.Linq; +using ShoppingAssistantApi.Application.Paging; +using ShoppingAssistantApi.Application.Models.Dtos; namespace ShoppingAssistantApi.Tests.Tests; -[Collection("Tests")] -public class RolesTests : IClassFixture> +// TODO: make errors test more descrptive +public class RolesTests : TestsBase { - private readonly HttpClient _httpClient; - public RolesTests(TestingFactory factory) + : base(factory) + { } + + [Fact] + public async Task AddRole_ValidName_ReturnsCreatedRole() { - _httpClient = factory.CreateClient(); - factory.InitialaizeData().GetAwaiter().GetResult(); + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = "mutation AddRole ($dto: RoleCreateDtoInput!){ addRole (roleDto: $dto) { id, name }} ", + variables = new + { + dto = new + { + name = "NewRole" + } + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var role = jsonObject?.data?.addRole?.ToObject(); + + Assert.NotNull(role); + Assert.Equal("NewRole", role.Name); } [Fact] - public async Task AddToRoleAsync_ValidRoleName_ReturnsTokensModel() - { - var usersPage = await UserExtention.GetUsers(10, _httpClient); - var mutation = new - { - query = "mutation AddToRole($roleName: String!, $id: String!) { addToRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", - variables = new - { - roleName = "Admin", - id = usersPage[0].Id, - } - }; - - var jsonPayload = JsonConvert.SerializeObject(mutation); - 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 accessToken = (string)document.data.addToRole.accessToken; - var refreshToken = (string)document.data.addToRole.refreshToken; - - Assert.NotNull(accessToken); - Assert.NotNull(refreshToken); - } - - - [Theory] - [InlineData("")] - [InlineData("InvalidRole")] - public async Task AddToRoleAsync_InvalidRoleName_ReturnsInternalServerError(string roleName) - { - var usersPage = await UserExtention.GetUsers(10, _httpClient); - var mutation = new - { - query = "mutation AddToRole($roleName: String!, $id: String!) { addToRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", - variables = new - { - roleName, - id = usersPage[0].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); - } - - - [Fact] - public async Task RemoveFromRoleAsync_ValidRoleName_ReturnsTokensModel() - { - var usersPage = await UserExtention.GetUsers(10, _httpClient); - var mutation = new - { - query = "mutation RemoveFromRole($roleName: String!, $id: String!) { removeFromRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", - variables = new - { - roleName = "Admin", - id = usersPage[0].Id, - } - }; - - var jsonPayload = JsonConvert.SerializeObject(mutation); - 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 accessToken = (string)document.data.removeFromRole.accessToken; - var refreshToken = (string)document.data.removeFromRole.refreshToken; - - Assert.NotNull(accessToken); - Assert.NotNull(refreshToken); - } - - [Theory] - [InlineData("")] - [InlineData("InvalidRole")] - public async Task RemoveFromRoleAsync_InvalidRoleName_ReturnsInternalServerError(string roleName) - { - var usersPage = await UserExtention.GetUsers(10, _httpClient); - var mutation = new - { - query = "mutation RemoveFromRole($roleName: String!, $id: String!) { removeFromRole(roleName: $roleName, id: $id) { accessToken, refreshToken }}", - variables = new - { - roleName, - id = usersPage[0].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); - } - - [Theory] - [InlineData("User")] - [InlineData(null)] - public async Task AddRole_InvalidRoleName_ReturnsInternalServerError(string roleName) + public async Task AddRole_Unauthorized_ReturnsErrors() { var mutation = new { @@ -141,23 +45,45 @@ public class RolesTests : IClassFixture> { dto = new { - name = roleName + name = "NewRole" + } + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task AddRole_ExistingRoleName_ReturnsErrors() + { + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = "mutation AddRole ($dto: RoleCreateDtoInput!){ addRole (roleDto: $dto) { id, name }} ", + variables = new + { + dto = new + { + name = "User" } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Fact] public async Task GetRolesPageAsync_ValidPageNumberAndSize_ReturnsRolesPagedList() { - var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); + await LoginAsync("admin@gmail.com", "Yuiop12345"); var query = new { query = "query RolesPage($pageNumber: Int!, $pageSize: Int!) { rolesPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, name } }}", @@ -167,18 +93,11 @@ public class RolesTests : IClassFixture> pageSize = 3 } }; + + var jsonObject = await SendGraphQlRequestAsync(query); + var pagedList = (PagedList?) jsonObject?.data?.rolesPage?.ToObject>(); - 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 items = document.data.rolesPage.items; - Assert.NotEmpty(items); + Assert.NotNull(pagedList); + Assert.NotEmpty(pagedList.Items); } } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/TestsBase.cs b/ShoppingAssistantApi.Tests/Tests/TestsBase.cs new file mode 100644 index 0000000..d5d7962 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/TestsBase.cs @@ -0,0 +1,66 @@ +using System.Net.Http.Headers; +using System.Text; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Tests.TestExtentions; + +namespace ShoppingAssistantApi.Tests.Tests; + +public class TestsBase: IClassFixture> +{ + private protected HttpClient _httpClient; + + public TestsBase(TestingFactory factory) + { + _httpClient = factory.CreateClient(); + factory.InitialaizeDatabase(); + } + + public async Task LoginAsync(string email, string password) + { + var mutation = new + { + query = "mutation Login($login: AccessUserModelInput!) { login(login: $login) { accessToken refreshToken }}", + variables = new + { + login = new + { + email = email, + password = password + } + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + + _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", (string?) jsonObject?.data?.login?.accessToken); + } + + public async Task SendGraphQlRequestAsync(object request) + { + var jsonPayload = JsonConvert.SerializeObject(request); + var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + + using var response = await _httpClient.PostAsync("graphql", content); + var responseString = await response.Content.ReadAsStringAsync(); + Console.WriteLine(responseString); + + var jsonObject = JsonConvert.DeserializeObject(responseString); + + return jsonObject; + } + + public async Task GetCurrentUserAsync() + { + var query = new + { + query = "query CurrentUser { currentUser { id, guestId, phone, email, roles { id, name }}}", + variables = new { } + }; + + var jsonObject = await SendGraphQlRequestAsync(query); + var user = (UserDto?) jsonObject?.data?.currentUser?.ToObject(); + + return user; + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/UsersTests.cs b/ShoppingAssistantApi.Tests/Tests/UsersTests.cs index 8c0e7d1..1d34597 100644 --- a/ShoppingAssistantApi.Tests/Tests/UsersTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/UsersTests.cs @@ -1,222 +1,172 @@ using ShoppingAssistantApi.Tests.TestExtentions; -using System.Net.Http.Headers; -using System.Net; -using System.Text; -using Xunit; -using Newtonsoft.Json; using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.Identity; +using Newtonsoft.Json.Linq; +using ShoppingAssistantApi.Application.Paging; namespace ShoppingAssistantApi.Tests.Tests; -[Collection("Tests")] -public class UsersTests : IClassFixture> +// TODO: make errors test more descrptive +public class UsersTests : TestsBase { - private readonly HttpClient _httpClient; - public UsersTests(TestingFactory factory) - { - _httpClient = factory.CreateClient(); - factory.InitialaizeData().GetAwaiter().GetResult(); - } + : base(factory) + { } [Fact] public async Task UpdateUserAsync_ValidUserModel_ReturnsUpdateUserModel() { - var tokensModel = await AccessExtention.CreateGuest(Guid.NewGuid().ToString(), _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - - var user = await UserExtention.GetCurrentUser(_httpClient); - - var roles = new object[1]; - - foreach(var role in user.Roles) - { - roles[0] = new - { - id = role.Id, - name = role.Name - }; - } - + await LoginAsync("test@gmail.com", "Yuiop12345"); + var user = await GetCurrentUserAsync(); var mutation = new { - query = "mutation UpdateUser($userDto: UserDtoInput!) { updateUser(userDto: $userDto) { tokens { accessToken, refreshToken }, user { email } }}", + query = @" + mutation UpdateUser($userDto: UserDtoInput!) { + updateUser(userDto: $userDto) { + tokens { accessToken, refreshToken }, + user { email, phone } + } + }", variables = new { userDto = new { id = user.Id, guestId = user.GuestId, - roles = roles, - email = "testing@gmail.com", - password = "Yuiop12345", - refreshTokenExpiryDate = user.RefreshTokenExpiryDate + roles = user.Roles.Select(r => new { id = r.Id, name = r.Name }), + email = user.Email, + phone = "+12345678902", } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var tokens = (TokensModel?) jsonObject?.data?.updateUser?.tokens?.ToObject(); + var updatedUser = (UserDto?) jsonObject?.data?.updateUser?.user?.ToObject(); - 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 accessTokenResult = (string)document.data.updateUser.tokens.accessToken; - var refreshTokenResult = (string)document.data.updateUser.tokens.refreshToken; - var userResult = JsonConvert.DeserializeObject(document.data.updateUser.user.ToString()); - - Assert.NotNull(accessTokenResult); - Assert.NotNull(refreshTokenResult); - Assert.NotNull(userResult.Email); + Assert.NotNull(tokens); + Assert.NotNull(tokens.AccessToken); + Assert.NotNull(tokens.RefreshToken); + Assert.NotNull(updatedUser); + Assert.NotNull(updatedUser.Email); + Assert.Equal(user.Email, updatedUser.Email); + Assert.Equal("+12345678902", updatedUser.Phone); } [Fact] public async Task UpdateUserByAdminAsync_ValidUserModel_ReturnsUpdateUserModel() { - var tokensModel = await AccessExtention.CreateGuest(new Guid().ToString(), _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - - var user = await UserExtention.GetCurrentUser(_httpClient); - - var roles = new object[1]; - - foreach (var role in user.Roles) - { - roles[0] = new - { - id = role.Id, - name = role.Name, - }; - } - + await LoginAsync("test@gmail.com", "Yuiop12345"); + var user = await GetCurrentUserAsync(); var mutation = new { - query = "mutation UpdateUserByAdmin($id: String!, $userDto: UserDtoInput!) { updateUserByAdmin(id: $id, userDto: $userDto) { tokens { accessToken, refreshToken }, user { guestId } }}", + query = @" + mutation UpdateUserByAdmin($id: String!, $userDto: UserDtoInput!) { + updateUserByAdmin(id: $id, userDto: $userDto) { + email, + phone + } + }", variables = new { id = user.Id, userDto = new { id = user.Id, - guestId = Guid.NewGuid().ToString(), - roles = roles, - refreshTokenExpiryDate = user.RefreshTokenExpiryDate + guestId = user.GuestId, + roles = user.Roles.Select(r => new { id = r.Id, name = r.Name }), + email = user.Email, + phone = "+12345678903", } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var updatedUser = (UserDto?) jsonObject?.data?.updateUserByAdmin?.ToObject(); - 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 accessTokenResult = (string)document.data.updateUserByAdmin.tokens.accessToken; - var refreshToken = (string)document.data.updateUserByAdmin.tokens.refreshToken; - var updatedUserGuestId = (Guid)document.data.updateUserByAdmin.user.guestId; - - Assert.NotNull(accessTokenResult); - Assert.NotNull(refreshToken); - Assert.NotEqual(user.GuestId, updatedUserGuestId); + Assert.NotNull(updatedUser); + Assert.NotNull(updatedUser.Email); + Assert.Equal(user.Email, updatedUser.Email); + Assert.Equal("+12345678903", updatedUser.Phone); } [Fact] public async Task GetUserAsync_ValidUserId_ReturnsUser() { - var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - - var usersPage = await UserExtention.GetUsers(10, _httpClient); + await LoginAsync("admin@gmail.com", "Yuiop12345"); var query = new { - query = "query User($id: String!) { user(id: $id) { id, email, phone }}", + query = @" + query User($id: String!) { + user(id: $id) { + id, + email + } + }", variables = new { - id = usersPage[0].Id, + id = "652c3b89ae02a3135d6409fc", } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var user = (UserDto?) jsonObject?.data?.user?.ToObject(); - 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 userResult = JsonConvert.DeserializeObject(document.data.user.ToString()); - Assert.Equal(userResult.Id, usersPage[0].Id); + Assert.NotNull(user); + Assert.Equal("652c3b89ae02a3135d6409fc", user.Id); + Assert.Equal("test@gmail.com", user.Email); } [Fact] public async Task GetUserAsync_InvalidUserId_ReturnsInternalServerError() { - var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - + await LoginAsync("admin@gmail.com", "Yuiop12345"); var query = new { - query = "query User($id: String!) { user(id: $id) { id, email, phone }}", + query = "query User($id: String!) { user(id: $id) { id }}", variables = new { - id = "error", + id = "invalid", } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Fact] - public async Task GetCurrentUserAsync_ValidCredentials_ReturnsCurrentUser() + public async Task GetCurrentUserAsync_Authorized_ReturnsCurrentUser() { - var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - + await LoginAsync("admin@gmail.com", "Yuiop12345"); var query = new { - query = "query CurrentUser { currentUser { id, email, phone }}", - variables = new { } + query = "query CurrentUser { currentUser { id, email, phone }}" }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var user = (UserDto?) jsonObject?.data?.currentUser?.ToObject(); - 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 user = JsonConvert.DeserializeObject(document.data.currentUser.ToString()); - Assert.NotEmpty(user.Id); - Assert.NotEmpty(user.Email); - Assert.NotEmpty(user.Phone); - Assert.Equal(user.Email, "mykhailo.bilodid@nure.ua"); + Assert.NotNull(user); + Assert.Equal("652c3b89ae02a3135d6408fc", user.Id); + Assert.Equal("admin@gmail.com", user.Email); + Assert.Equal("+12345678901", user.Phone); } [Fact] public async Task GetUsersPageAsync_ValidPageNumberAndSize_ReturnsUsersPage() { - var tokensModel = await AccessExtention.Login("mykhailo.bilodid@nure.ua", "Yuiop12345", _httpClient); - _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokensModel.AccessToken); - + await LoginAsync("admin@gmail.com", "Yuiop12345"); var query = new { - query = "query UsersPage($pageNumber: Int!, $pageSize: Int!) { usersPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { id, email, phone }}}", + query = @" + query UsersPage($pageNumber: Int!, $pageSize: Int!) { + usersPage(pageNumber: $pageNumber, pageSize: $pageSize) { + items { id, email, phone } + } + }", variables = new { pageNumber = 1, @@ -224,17 +174,128 @@ public class UsersTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var pagedList = (PagedList?) jsonObject?.data?.usersPage?.ToObject>(); - using var response = await _httpClient.PostAsync("graphql", content); - response.EnsureSuccessStatusCode(); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotNull(pagedList); + Assert.NotEmpty(pagedList.Items); + } - var responseString = await response.Content.ReadAsStringAsync(); - var document = JsonConvert.DeserializeObject(responseString); - var items = document.data.usersPage.items; - Assert.NotEmpty(items); + [Fact] + public async Task AddToRoleAsync_ValidRoleName_ReturnsTokensModel() + { + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = @" + mutation AddToRole($roleName: String!, $userId: String!) { + addToRole(roleName: $roleName, userId: $userId) { + id, email, roles { + name + } + } + }", + variables = new + { + roleName = "Admin", + userId = "652c3b89ae02a3135d6409fc", + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var user = (UserDto?) jsonObject?.data?.addToRole?.ToObject(); + + Assert.NotNull(user); + Assert.Equal("652c3b89ae02a3135d6409fc", user.Id); + Assert.Equal("test@gmail.com", user.Email); + Assert.Contains(user.Roles, r => r.Name == "Admin"); + } + + [Fact] + public async Task AddToRoleAsync_NonExistingRole_ReturnsErrors() + { + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = @" + mutation AddToRole($roleName: String!, $userId: String!) { + addToRole(roleName: $roleName, userId: $userId) { + id, email, roles { + name + } + } + }", + variables = new + { + roleName = "NonExistingRole", + id = "652c3b89ae02a3135d6409fc", + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + + [Fact] + public async Task RemoveFromRoleAsync_ValidRoleName_ReturnsTokensModel() + { + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = @" + mutation RemoveFromRole($roleName: String!, $userId: String!) { + removeFromRole(roleName: $roleName, userId: $userId) { + id, email, roles { + name + } + } + }", + variables = new + { + roleName = "User", + userId = "652c3b89ae02a3135d6409fc", + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var user = (UserDto?) jsonObject?.data?.removeFromRole?.ToObject(); + + Assert.NotNull(user); + Assert.Equal("652c3b89ae02a3135d6409fc", user.Id); + Assert.Equal("test@gmail.com", user.Email); + Assert.DoesNotContain(user.Roles, r => r.Name == "User"); + } + + [Fact] + public async Task RemoveFromRoleAsync_NonExistingRole_ReturnsErrors() + { + await LoginAsync("admin@gmail.com", "Yuiop12345"); + var mutation = new + { + query = @" + mutation RemoveFromRole($roleName: String!, $userId: String!) { + removeFromRole(roleName: $roleName, userId: $userId) { + id, email, roles { + name + } + } + }", + variables = new + { + roleName = "NonExistingRole", + userId = "652c3b89ae02a3135d6409fc", + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index d153a33..0f5b723 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -1,40 +1,39 @@ using ShoppingAssistantApi.Tests.TestExtentions; -using System.Net.Http.Headers; -using System.Net; -using System.Text; -using Xunit; -using Newtonsoft.Json; using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Paging; +using Newtonsoft.Json.Linq; namespace ShoppingAssistantApi.Tests.Tests; -[Collection("Tests")] -public class WishlistsTests : IClassFixture> +// TODO: make errors test more descrptive +public class WishlistsTests : TestsBase { - private readonly HttpClient _httpClient; + // From DbInitializer + private const string TestingUserId = "652c3b89ae02a3135d6418fc"; - private const string WISHLIST_TESTING_USER_EMAIL = "shopping.assistant.team@gmail.com"; + private const string TestingUserEmail = "wishlists@gmail.com"; - private const string WISHLIST_TESTING_USER_PASSWORD = "Yuiop12345"; + private const string TestingUserPassword = "Yuiop12345"; - private const string TESTING_WISHLIST_ID = "ab79cde6f69abcd3efab65cd"; + private const string TestingWishlistId = "ab79cde6f69abcd3efab65cd"; public WishlistsTests(TestingFactory factory) - { - _httpClient = factory.CreateClient(); - factory.InitialaizeData().GetAwaiter().GetResult(); - } + : base(factory) + { } [Fact] - public async Task StartPersonalWishlistAsync_ValidWishlistModel_ReturnsNewWishlistModels() + public async Task StartPersonalWishlistAsync_ValidWishlist_ReturnsNewWishlist() { - 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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new { - query = "mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { startPersonalWishlist (dto: $dto) { id, name, type, createdById } }", + query = @" + mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { + startPersonalWishlist (dto: $dto) { + id, name, type, createdById + } + }", variables = new { dto = new @@ -45,36 +44,27 @@ public class WishlistsTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var wishlist = (WishlistDto?) jsonObject?.data?.startPersonalWishlist?.ToObject(); - 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 wishlistId = (string) document.data.startPersonalWishlist.id; - var wishlistCreatedById = (string) document.data.startPersonalWishlist.createdById; - var wishlistType = (string) document.data.startPersonalWishlist.type; - var wishlistName = (string) document.data.startPersonalWishlist.name; - - Assert.Equal(user.Id, wishlistCreatedById); - Assert.Equal(WishlistTypes.Product.ToString(), wishlistType); - Assert.Equal($"{WishlistTypes.Product} Search", wishlistName); + Assert.NotNull(wishlist); + Assert.Equal(TestingUserId, wishlist.CreatedById); + Assert.Equal(WishlistTypes.Product.ToString(), wishlist.Type); + Assert.Equal($"{WishlistTypes.Product} Search", wishlist.Name); } [Fact] public async Task GetPersonalWishlistsPage_ValidPageNumberAndSize_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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new { - query = "query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { items { createdById, id, name, type } } }", + query = @" + query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { + personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { + items { createdById, id, name, type } + } + }", variables = new { pageNumber = 1, @@ -82,111 +72,84 @@ public class WishlistsTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var pagedList = (PagedList?) jsonObject?.data?.personalWishlistsPage?.ToObject>(); - 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); + Assert.NotNull(pagedList); + Assert.NotEmpty(pagedList.Items); } [Fact] - public async Task GetPersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlistDto() + public async Task GetPersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlist() { - 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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new { - query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + query = @" + query personalWishlist($wishlistId: String!) { + personalWishlist(wishlistId: $wishlistId) { + createdById, id, name, type + } + }", variables = new { - wishlistId = TESTING_WISHLIST_ID + wishlistId = TestingWishlistId } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var wishlist = (WishlistDto?) jsonObject?.data?.personalWishlist?.ToObject(); - 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 personalWishlistId = (string) document.data.personalWishlist.id; - var personalWishlistName = (string) document.data.personalWishlist.name; - 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(user.Id, personalWishlistCreatedById); + Assert.NotNull(wishlist); + Assert.Equal("Gaming PC", wishlist.Name); + Assert.Equal(WishlistTypes.Product.ToString(), wishlist.Type); + Assert.Equal(TestingUserId, wishlist.CreatedById); } [Fact] public async Task AddMessageToPersonalWishlist_ValidMessageModel_ReturnsNewMessageModel() { - 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"; - + await LoginAsync(TestingUserEmail, TestingUserPassword); + const string MessageText = "Second Message"; var mutation = new { - query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", + query = @" + mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { + addMessageToPersonalWishlist(wishlistId: $wishlistId, dto: $dto) { + role, text, createdById + } + }", variables = new { - wishlistId = TESTING_WISHLIST_ID, + wishlistId = TestingWishlistId, dto = new { - text = MESSAGE_TEXT + text = MessageText } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var message = (MessageDto?) jsonObject?.data?.addMessageToPersonalWishlist?.ToObject(); - 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 messageRole = (string) document.data.addMessageToPersonalWishlist.role; - var messageText = (string) document.data.addMessageToPersonalWishlist.text; - var messageCreatedById = (string) document.data.addMessageToPersonalWishlist.createdById; - - Assert.Equal(MessageRoles.User.ToString(), messageRole); - Assert.Equal(MESSAGE_TEXT, messageText); - Assert.Equal(user.Id, messageCreatedById); + Assert.NotNull(message); + Assert.Equal(MessageRoles.User.ToString(), message.Role); + Assert.Equal(MessageText, message.Text); + Assert.Equal(TestingUserId, message.CreatedById); } [Fact] - public async Task StartPersonalWishlistAsync_InvalidWishlistModel_ReturnsInternalServerError() + public async Task StartPersonalWishlistAsync_InvalidWishlist_ReturnsErrors() { - 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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new { - query = "mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { startPersonalWishlist (dto: $dto) { id, name, type, createdById } }", + query = @" + mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { + startPersonalWishlist (dto: $dto) { + id, name, type, createdById + } + }", variables = new { dto = new @@ -197,85 +160,89 @@ public class WishlistsTests : IClassFixture> } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Fact] - public async Task GetPersonalWishlist_InvalidWishlistId_ReturnsInternalServerError() + public async Task GetPersonalWishlist_InvalidWishlistId_ReturnsErrors() { - 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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new { - query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + query = @" + query personalWishlist($wishlistId: String!) { + personalWishlist(wishlistId: $wishlistId) { + createdById, id, name, type + } + }", variables = new { wishlistId = "1234567890abcdef12345678" // Invalid wishlistId } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Fact] - public async Task GetPersonalWishlist_UnAuthorizedAccess_ReturnsInternalServerError() + public async Task GetPersonalWishlist_UnauthorizedAccess_ReturnsErrors() { - 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); - + await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new { - query = "query personalWishlist($wishlistId: String!) { personalWishlist(wishlistId: $wishlistId) { createdById, id, name, type } }", + query = @" + query personalWishlist($wishlistId: String!) { + personalWishlist(wishlistId: $wishlistId) { + createdById, id, name, type + } + }", variables = new { wishlistId = "ab6c2c2d9edf39abcd1ef9ab" // Other user's wishlist } }; - var jsonPayload = JsonConvert.SerializeObject(query); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(query); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } [Fact] - public async Task AddMessageToPersonalWishlist_InvalidMessageModel_ReturnsInternalServerError() + public async Task AddMessageToPersonalWishlist_InvalidMessage_ReturnsErrors() { - 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"; - + await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new { - query = "mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { role, text, createdById } }", + query = @" + mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { + addMessageToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { + role, text, createdById + } + }", variables = new { wishlistId = "8125jad7g12", // Invalid wishlistId dto = new { - text = MESSAGE_TEXT, + text = "random text", } } }; - var jsonPayload = JsonConvert.SerializeObject(mutation); - var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json"); + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; - using var response = await _httpClient.PostAsync("graphql", content); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.NotNull(errors); + Assert.True(errors.Count > 0); } } diff --git a/ShoppingAssistantApi.Tests/Usings.cs b/ShoppingAssistantApi.Tests/Usings.cs new file mode 100644 index 0000000..4f1bf08 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Usings.cs @@ -0,0 +1,4 @@ +global using Xunit; + +// Parallel running was disabled because it causes errors with the database access +[assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file From 424acaf451a1b0d855b7170dacecc7fa92340383 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Mon, 16 Oct 2023 13:29:30 +0300 Subject: [PATCH 33/85] add lost wishlist integrational tests --- .../TestExtentions/DbInitializer.cs | 213 +++-- .../Tests/WishlistsTests.cs | 760 +++++++++++++++++- 2 files changed, 881 insertions(+), 92 deletions(-) diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index 6877b07..811cce6 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Logging; using MongoDB.Bson; +using MongoDB.Driver; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Infrastructure.Services.Identity; @@ -22,6 +23,8 @@ public class DbInitializer InitializeUsersAsync().Wait(); InitializeWishlistsAsync().Wait(); + InitializeMessagesAsync().Wait(); + InitializeProductsAsync().Wait(); } public async Task InitializeUsersAsync() @@ -97,94 +100,156 @@ public class DbInitializer public async Task InitializeWishlistsAsync() { var wishlistsCollection = _dbContext.Db.GetCollection("Wishlists"); - var messagesCollection = _dbContext.Db.GetCollection("Messages"); + var usersCollection = _dbContext.Db.GetCollection("Users"); - var gamingPcWishlist = new Wishlist - { - Id = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), - Name = "Gaming PC", - Type = WishlistTypes.Product.ToString(), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc") - }; - await wishlistsCollection.InsertOneAsync(gamingPcWishlist); + var user1 = await (await usersCollection.FindAsync(x => x.Email!.Equals("wishlists@gmail.com"))).FirstAsync(); + var user2 = await (await usersCollection.FindAsync(x => x.Email!.Equals("test@gmail.com"))).FirstAsync(); - await messagesCollection.InsertManyAsync(new Message[] - { - new() { - WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), - Text = "Prompt", - Role = MessageRoles.User.ToString(), - CreatedDateUtc = DateTime.UtcNow.AddMinutes(-1), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc") - }, - new() { - WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd"), - Text = "Answer", - Role = MessageRoles.Application.ToString(), - CreatedDateUtc = DateTime.UtcNow, - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc") - }, - }); + var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); + var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); - var genericWishlist = new Wishlist + var wishlists = new Wishlist[] { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Name = "Generic Wishlist Name", - Type = WishlistTypes.Product.ToString(), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6409fc"), - Messages = new Message[] + new Wishlist { - new Message - { - Text = "One Message", - Role = MessageRoles.User.ToString(), - CreatedDateUtc = DateTime.UtcNow.AddMinutes(-1), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6409fc") - } + Id = wishlistId1, + Name = "Gaming PC", + Type = WishlistTypes.Product.ToString(), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Wishlist + { + Id = wishlistId2, + Name = "Generic Wishlist Name", + Type = WishlistTypes.Product.ToString(), + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow } }; - await wishlistsCollection.InsertOneAsync(genericWishlist); - await messagesCollection.InsertOneAsync(new Message - { - WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Text = "One Message", - Role = MessageRoles.User.ToString(), - CreatedDateUtc = DateTime.UtcNow.AddMinutes(-1), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6409fc") - }); - - var mouseWishlist = new Wishlist - { - Id = ObjectId.Parse("ab79cde6f69abcd3efab95cd"), - Name = "Mouse", - Type = WishlistTypes.Product.ToString(), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc"), - }; - await wishlistsCollection.InsertOneAsync(mouseWishlist); - await messagesCollection.InsertManyAsync(new List + await wishlistsCollection.InsertManyAsync(wishlists); + } + + + public async Task InitializeMessagesAsync() + { + var messagesCollection = _dbContext.Db.GetCollection("Messages"); + var usersCollection = _dbContext.Db.GetCollection("Users"); + + var user1 = await (await usersCollection.FindAsync(x => x.Email!.Equals("wishlists@gmail.com"))).FirstAsync(); + var user2 = await (await usersCollection.FindAsync(x => x.Email!.Equals("test@gmail.com"))).FirstAsync(); + + var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); + var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + + var messages = new Message[] { - new() { - WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab95cd"), - Text = "First Message", + new Message + { + Text = "Message 1", Role = MessageRoles.User.ToString(), - CreatedDateUtc = DateTime.UtcNow.AddMinutes(-2), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc"), + WishlistId = wishlistId1, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, - new() { - WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab95cd"), - Text = "Second Message", + new Message + { + Text = "Message 2", Role = MessageRoles.Application.ToString(), - CreatedDateUtc = DateTime.UtcNow.AddMinutes(-1), - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc"), + WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(5) }, - new() { - WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab95cd"), - Text = "Third Message", + new Message + { + Text = "Message 3", Role = MessageRoles.User.ToString(), - CreatedDateUtc = DateTime.UtcNow, - CreatedById = ObjectId.Parse("652c3b89ae02a3135d6418fc"), + WishlistId = wishlistId1, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(20) }, - }); + new Message + { + Text = "Message 4", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(25) + }, + new Message + { + Text = "Message 5", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId1, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(45) + }, + new Message + { + Text = "Message 6", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId1, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(50) + }, + new Message + { + Text = "Prompt", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId2, + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow + } + }; + + await messagesCollection.InsertManyAsync(messages); + } + + public async Task InitializeProductsAsync() + { + var productsCollection = _dbContext.Db.GetCollection("Products"); + var usersCollection = _dbContext.Db.GetCollection("Users"); + + var user1 = await (await usersCollection.FindAsync(x => x.Email!.Equals("wishlists@gmail.com"))).FirstAsync(); + var user2 = await (await usersCollection.FindAsync(x => x.Email!.Equals("test@gmail.com"))).FirstAsync(); + + var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); + var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + + 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 productsCollection.InsertManyAsync(products); } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index ac89a96..5d989b7 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -6,7 +6,6 @@ using Newtonsoft.Json.Linq; namespace ShoppingAssistantApi.Tests.Tests; -// TODO: make errors test more descrptive public class WishlistsTests : TestsBase { // From DbInitializer @@ -16,14 +15,23 @@ public class WishlistsTests : TestsBase private const string TestingUserPassword = "Yuiop12345"; - private const string TestingWishlistId = "ab79cde6f69abcd3efab65cd"; + private const string TestingNotExistingWishlistId = "1234567890abcdef12345678"; + + private const string TestingValidWishlistName = "Gaming PC"; + + private const WishlistTypes TestingValidWishlistType = WishlistTypes.Product; + + private const string TestingUnauthorizedWishlistId = "ab6c2c2d9edf39abcd1ef9ab"; + + private const string TestingValidWishlistId = "ab79cde6f69abcd3efab65cd"; + public WishlistsTests(TestingFactory factory) : base(factory) { } [Fact] - public async Task StartPersonalWishlistAsync_ValidWishlist_ReturnsNewWishlist() + public async Task StartPersonalWishlist_ValidWishlist_ReturnsNewWishlist() { await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new @@ -93,7 +101,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = TestingWishlistId + wishlistId = TestingValidWishlistId } }; @@ -101,8 +109,8 @@ public class WishlistsTests : TestsBase var wishlist = (WishlistDto?) jsonObject?.data?.personalWishlist?.ToObject(); Assert.NotNull(wishlist); - Assert.Equal("Gaming PC", wishlist.Name); - Assert.Equal(WishlistTypes.Product.ToString(), wishlist.Type); + Assert.Equal(TestingValidWishlistName, wishlist.Name); + Assert.Equal(TestingValidWishlistType.ToString(), wishlist.Type); Assert.Equal(TestingUserId, wishlist.CreatedById); } @@ -121,7 +129,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = TestingWishlistId, + wishlistId = TestingValidWishlistId, dto = new { text = MessageText @@ -139,7 +147,7 @@ public class WishlistsTests : TestsBase } [Fact] - public async Task GetMessagesPageFromPersonalWishlist_ValidPageNumberAndSize_ReturnsPage() + public async Task GetMessagesPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsPage() { await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new @@ -158,7 +166,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = "ab79cde6f69abcd3efab95cd", // From DbInitializer + wishlistId = TestingValidWishlistId, pageNumber = 1, pageSize = 2 } @@ -169,12 +177,116 @@ public class WishlistsTests : TestsBase Assert.NotNull(pagedList); Assert.NotEmpty(pagedList.Items); - Assert.Equal("Third Message", pagedList.Items.FirstOrDefault()?.Text); - Assert.Equal(MessageRoles.User.ToString(), pagedList.Items.FirstOrDefault()?.Role); + Assert.Equal("Message 6", pagedList.Items.FirstOrDefault()?.Text); + Assert.Equal(MessageRoles.Application.ToString(), pagedList.Items.FirstOrDefault()?.Role); } [Fact] - public async Task StartPersonalWishlistAsync_InvalidWishlist_ReturnsErrors() + public async Task AddProductToPersonalWishlist_ValidProduct_ReturnsNewProduct() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { + addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { + url, name, description, rating, imagesUrls, wasOpened + } + }", + variables = new + { + wishlistId = TestingValidWishlistId, + 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 jsonObject = await SendGraphQlRequestAsync(mutation); + var product = (ProductDto?) jsonObject?.data?.addProductToPersonalWishlist?.ToObject(); + + Assert.NotNull(product); + Assert.Equal("https://www.amazon.com/url", product.Url); + Assert.Equal("Generic name", product.Name); + Assert.Equal("Generic description", product.Description); + Assert.Equal(4.8, product.Rating); + Assert.Equal("https://www.amazon.com/image-url-1", product.ImagesUrls[0]); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_ValidPageNumberAndSizeValidWishlistIdOrAuthorizedAccess_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.productsPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + 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 ", pagedList.Items.LastOrDefault()?.Name); + Assert.Equal(TestingValidWishlistId, pagedList.Items.LastOrDefault()?.WishlistId); + } + + [Fact] + public async Task DeletePersonalWishlist_ValidWishlistIdOrAuthorizedAccess_ReturnsWishlist() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation deletePersonalWishlist($wishlistId: String!) { + deletePersonalWishlist (wishlistId: $wishlistId) { + createdById, id, name, type + } + }", + variables = new + { + wishlistId = TestingValidWishlistId + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var wishlist = (WishlistDto?) jsonObject?.data?.deletePersonalWishlist?.ToObject(); + + Assert.NotNull(wishlist); + Assert.Equal(TestingValidWishlistId, wishlist.Id); + Assert.Equal(TestingValidWishlistName, wishlist.Name); + Assert.Equal(TestingValidWishlistType.ToString(), wishlist.Type); + Assert.Equal(TestingUserId, wishlist.CreatedById); + } + + [Fact] + public async Task StartPersonalWishlist_InvalidWishlist_ReturnsErrors() { await LoginAsync(TestingUserEmail, TestingUserPassword); var mutation = new @@ -203,7 +315,113 @@ public class WishlistsTests : TestsBase } [Fact] - public async Task GetPersonalWishlist_InvalidWishlistId_ReturnsErrors() + public async Task GetPersonalWishlistsPage_PageNumberGreaterThanAvailablePages_ReturnsEmptyList() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { + personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { + items { createdById, id, name, type } + } + }", + variables = new + { + pageNumber = 100, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.personalWishlistsPage?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.Empty(pagedList.Items); + } + + [Fact] + public async Task GetPersonalWishlistsPage_PageNumberLessThan1_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { + personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { + items { createdById, id, name, type } + } + }", + variables = new + { + pageNumber = 0, + pageSize = 1 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetPersonalWishlistsPage_PageSizeGreaterThanAvailableEntities_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = 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 jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.personalWishlistsPage?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.NotEmpty(pagedList.Items); + Assert.Equal(TestingUserId, pagedList.Items.FirstOrDefault()?.CreatedById); + } + + [Fact] + public async Task GetPersonalWishlistsPage_PageSizeLessThan0_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + query personalWishlistsPage($pageNumber: Int!, $pageSize: Int!) { + personalWishlistsPage(pageNumber: $pageNumber, pageSize: $pageSize) { + items { createdById, id, name, type } + } + }", + variables = new + { + pageNumber = 1, + pageSize = -1 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.personalWishlistsPage?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.NotEmpty(pagedList.Items); + Assert.Equal(TestingUserId, pagedList.Items.FirstOrDefault()?.CreatedById); + } + + [Fact] + public async Task GetPersonalWishlist_NotExistingWishlistId_ReturnsErrors() { await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new @@ -216,7 +434,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = "1234567890abcdef12345678" // Invalid wishlistId + wishlistId = TestingNotExistingWishlistId } }; @@ -228,7 +446,397 @@ public class WishlistsTests : TestsBase } [Fact] - public async Task GetPersonalWishlist_UnauthorizedAccess_ReturnsErrors() + public async Task GetMessagesPageFromPersonalWishlist_PageNumberGreaterThanAvailablePages_ReturnsEmptyList() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 100, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.messagesPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.Empty(pagedList.Items); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_PageNumberLessThan1_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_PageSizeGreaterThanAvailableEntities_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 1, + pageSize = 10 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.messagesPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.Equal("Message 6", pagedList.Items.FirstOrDefault()?.Text); + Assert.Equal(MessageRoles.Application.ToString(), pagedList.Items.FirstOrDefault()?.Role); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_PageSizeLessThan0_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 1, + pageSize = -2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.messagesPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.Equal("Message 6", pagedList.Items.FirstOrDefault()?.Text); + Assert.Equal(MessageRoles.Application.ToString(), pagedList.Items.FirstOrDefault()?.Role); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_NotExistingWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingNotExistingWishlistId, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetMessagesPageFromPersonalWishlist_OtherUserWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingUnauthorizedWishlistId, + pageNumber = 1, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task AddProductToPersonalWishlist_NotExistingWishlistId_RturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { + addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { + url, name, description, rating, imagesUrls, wasOpened + } + }", + variables = new + { + wishlistId = TestingNotExistingWishlistId, + 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 jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task AddProductToPersonalWishlist_OtherUserWishlistId_RturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { + addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { + url, name, description, rating, imagesUrls, wasOpened + } + }", + variables = new + { + wishlistId = TestingUnauthorizedWishlistId, + 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 jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_PageNumberGreaterThanAvailablePages_ReturnsEmptyList() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 100, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.productsPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + Assert.Empty(pagedList.Items); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_PageNumberLessThan1_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_PageSizeGreaterThanAvailableEntities_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 1, + pageSize = 100 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.productsPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + + 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 ", pagedList.Items.ToList()[1].Name); + Assert.Equal(TestingValidWishlistId, pagedList.Items.ToList()[1].WishlistId); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_PageSizeLessThan0_ReturnsPage() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingValidWishlistId, + pageNumber = 1, + pageSize = -2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var pagedList = (PagedList?) jsonObject?.data?.productsPageFromPersonalWishlist?.ToObject>(); + + Assert.NotNull(pagedList); + + 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 ", pagedList.Items.ToList()[1].Name); + Assert.Equal(TestingValidWishlistId, pagedList.Items.ToList()[1].WishlistId); + } + + [Fact] + public async Task GetPersonalWishlist_OtherUserWishlistId_ReturnsErrors() { await LoginAsync(TestingUserEmail, TestingUserPassword); var query = new @@ -241,7 +849,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = "ab6c2c2d9edf39abcd1ef9ab" // Other user's wishlist + wishlistId = TestingUnauthorizedWishlistId } }; @@ -252,6 +860,122 @@ public class WishlistsTests : TestsBase Assert.True(errors.Count > 0); } + [Fact] + public async Task GetProductsPageFromPersonalWishlist_NotExistingWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingNotExistingWishlistId, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task GetProductsPageFromPersonalWishlist_OtherUserWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + 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 = TestingUnauthorizedWishlistId, + pageNumber = 0, + pageSize = 2 + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task DeletePersonalWishlist_NotExistingWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation deletePersonalWishlist($wishlistId: String!) { + deletePersonalWishlist (wishlistId: $wishlistId) { + createdById, id, name, type + } + }", + variables = new + { + wishlistId = TestingNotExistingWishlistId + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + + [Fact] + public async Task DeletePersonalWishlist_OtherUserWishlistId_ReturnsError() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var mutation = new + { + query = @" + mutation deletePersonalWishlist($wishlistId: String!) { + deletePersonalWishlist (wishlistId: $wishlistId) { + createdById, id, name, type + } + }", + variables = new + { + wishlistId = TestingUnauthorizedWishlistId + } + }; + + var jsonObject = await SendGraphQlRequestAsync(mutation); + var errors = (JArray?) jsonObject?.errors; + + Assert.NotNull(errors); + Assert.True(errors.Count > 0); + } + [Fact] public async Task AddMessageToPersonalWishlist_InvalidMessage_ReturnsErrors() { @@ -266,7 +990,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = "8125jad7g12", // Invalid wishlistId + wishlistId = TestingNotExistingWishlistId, dto = new { text = "random text", @@ -280,4 +1004,4 @@ public class WishlistsTests : TestsBase Assert.NotNull(errors); Assert.True(errors.Count > 0); } -} \ No newline at end of file +} From 2b9453b09f3a36e02b8639bd76ae94ef71962882 Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Thu, 19 Oct 2023 12:56:40 +0300 Subject: [PATCH 34/85] SA-29 working GetChatCompletion --- .../Services/OpenAiService.cs | 25 +++---- .../OpenAiServiceTests.cs | 70 +++++++++++++++++-- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs index 1d083e4..a141bbe 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs @@ -1,6 +1,7 @@ using System; using System.Net.Http.Headers; using System.Text; +using MongoDB.Bson; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using ShoppingAssistantApi.Application.IServices; @@ -25,32 +26,24 @@ public class OpenAiService : IOpenAiService public OpenAiService(HttpClient client) { _httpClient = client; + _httpClient.DefaultRequestHeaders.Authorization = + new AuthenticationHeaderValue("Bearer", "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"); + _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); } - - public async Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) { chat.Stream = false; var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); - var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + var body = new StringContent(jsonBody, Encoding.UTF8, /*change file appsettings.Develop.json*/"application/json"); - - using var httpResponse = await _httpClient.PostAsync("chat/completions", body, cancellationToken); + using var httpResponse = await _httpClient.PostAsync(/*api url*/"https://api.openai.com/v1/completions", body, cancellationToken); var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken); - var responses = new List(); - foreach (var line in responseBody.Split(new[] {"\n\n"}, StringSplitOptions.RemoveEmptyEntries)) - { - if (line.Trim() == "[DONE]") break; + var data = JsonConvert.DeserializeObject(responseBody); - var json = line.Substring(6); - var OpenAiMessage = JsonConvert.DeserializeObject(json, _jsonSettings); - responses.Add(OpenAiMessage); - } - - return responses.Count > 0 ? responses.Last() : null; + return data.Choices[0].Message; } public async IAsyncEnumerable GetChatCompletionStream(ChatCompletionRequest chat, CancellationToken cancellationToken) @@ -59,7 +52,7 @@ public class OpenAiService : IOpenAiService var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions") + var request = new HttpRequestMessage(HttpMethod.Post, "https://api.openai.com/v1/completions") { Content = body }; diff --git a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs index 7ec9de8..ac32b4a 100644 --- a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs +++ b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs @@ -24,8 +24,68 @@ public class OpenAiServiceTests _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 + [Fact] - public async Task GetChatCompletion_ValidChat_ReturnsNewMessage() + public async Task GetChatCompletionStream_ValidChat_ReturnsNewMessage() { // Arrange _mockHttpMessageHandler @@ -61,7 +121,7 @@ public class OpenAiServiceTests } }"), }); - + var chat = new ChatCompletionRequest { Messages = new List @@ -75,12 +135,10 @@ public class OpenAiServiceTests }; // Act - var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None); + var newMessage = _openAiService.GetChatCompletionStream(chat, CancellationToken.None); // Assert Assert.NotNull(newMessage); - Assert.Equal("Hello, World!", newMessage.Content); + Assert.Equal("Hello World!", newMessage.ToString()); } - - // TODO: Add more tests } \ No newline at end of file From f9dfb34e43ff334abc02fb3394624520615de9e3 Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 19 Oct 2023 14:09:35 +0300 Subject: [PATCH 35/85] added new unit test and new model for search product name --- .../Models/ProductSearch/ProductName.cs | 6 ++ .../ShoppingAssistantApi.Tests.csproj | 1 + .../Tests/ProductTests.cs | 61 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 ShoppingAssistantApi.Application/Models/ProductSearch/ProductName.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/ProductTests.cs diff --git a/ShoppingAssistantApi.Application/Models/ProductSearch/ProductName.cs b/ShoppingAssistantApi.Application/Models/ProductSearch/ProductName.cs new file mode 100644 index 0000000..559ab3d --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/ProductSearch/ProductName.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.ProductSearch; + +public class ProductName +{ + public string Name { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj index c36f3b4..85fc768 100644 --- a/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj +++ b/ShoppingAssistantApi.Tests/ShoppingAssistantApi.Tests.csproj @@ -13,6 +13,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ShoppingAssistantApi.Tests/Tests/ProductTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductTests.cs new file mode 100644 index 0000000..d5b786c --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/ProductTests.cs @@ -0,0 +1,61 @@ +using System.Collections.ObjectModel; +using Microsoft.VisualBasic; +using MongoDB.Bson; +using Moq; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Application.Models.ProductSearch; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Tests.TestExtentions; +using ShoppingAssistantApi.Infrastructure.Services; + +namespace ShoppingAssistantApi.Tests.Tests; + +public class ProductTests : TestsBase +{ + private Mock _openAiServiceMock; + + private Mock _productServiceMock; + + public ProductTests(TestingFactory factory) : base(factory) + { + _openAiServiceMock = new Mock(); + _productServiceMock = new Mock(); + } + + + [Fact] + public async Task GetProductFromSearch_ReturnsProductList() + { + var message = new Message + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Text = "what are the best graphics cards you know?", + CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Role = "user" + }; + var cancellationToken = CancellationToken.None; + + var productServiceMock = new Mock(); + var expectedProductList = new List { "NVIDIA GeForce RTX 3080", "AMD Radeon RX 6900 XT" }; + productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) + .ReturnsAsync(expectedProductList); + + var openAiServiceMock = new Mock(); + var expectedOpenAiMessage = new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "[\n { \"Name\": \"NVIDIA GeForce RTX 3080\" },\n { \"Name\": \"AMD Radeon RX 6900 XT\" }\n]" + }; + openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) + .ReturnsAsync(expectedOpenAiMessage); + + var productList = JsonConvert.DeserializeObject>(expectedOpenAiMessage.Content).Select(info => info.Name).ToList(); + + Assert.Equal(expectedProductList, productList); + } + +} \ No newline at end of file From 504e67546665ecef35775d33d7e71bd25862550f Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 19 Oct 2023 14:13:57 +0300 Subject: [PATCH 36/85] added file for services --- .../IServices/IProductService.cs | 12 +++++++ .../Services/ProductServices.cs | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ShoppingAssistantApi.Application/IServices/IProductService.cs create mode 100644 ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs new file mode 100644 index 0000000..6be1f0d --- /dev/null +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -0,0 +1,12 @@ +using System.Collections.ObjectModel; +using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Application.IServices; + +public interface IProductService +{ + Task> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); + + Task> GetProductFromSearch(Message message, CancellationToken cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs new file mode 100644 index 0000000..a193be9 --- /dev/null +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs @@ -0,0 +1,31 @@ +using System.Collections.ObjectModel; +using ShoppingAssistantApi.Application.IRepositories; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Infrastructure.Services; + +public class ProductServices +{ + /*private readonly IWishlistsRepository _wishlistsRepository; + + private readonly IOpenAiService _openAiService; + private readonly IProductService _productService; + + public ProductServices(IOpenAiService openAiService, IProductService productService) + { + _openAiService = openAiService; + _productService = productService; + } + + public async Task> StartNewSearchAndReturnWishlist(Message message, + CancellationToken cancellationToken) + { + return null; + } + + public async Task> GetProductFromSearch(Message message, CancellationToken cancellationToken) + { + return null; + }*/ +} \ No newline at end of file From dd9fdc04f0b4804ea46ff1d4ce15ae93439fb006 Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 19 Oct 2023 14:16:02 +0300 Subject: [PATCH 37/85] changed file name --- .../Services/{ProductServices.cs => ProductService.cs} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename ShoppingAssistantApi.Infrastructure/Services/{ProductServices.cs => ProductService.cs} (97%) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs similarity index 97% rename from ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs rename to ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index a193be9..af4e45a 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductServices.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -5,7 +5,7 @@ using ShoppingAssistantApi.Domain.Entities; namespace ShoppingAssistantApi.Infrastructure.Services; -public class ProductServices +public class ProductService { /*private readonly IWishlistsRepository _wishlistsRepository; From 7b2e8d1645fb44a6753faa8dca0a2eb35f3e304e Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 19 Oct 2023 15:58:05 +0300 Subject: [PATCH 38/85] added new tests for product search, namely for checking recommendations and creating a wishlist --- .../IServices/IProductService.cs | 2 + .../Tests/ProductTests.cs | 102 +++++++++++++++--- 2 files changed, 89 insertions(+), 15 deletions(-) diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 6be1f0d..89ce557 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -9,4 +9,6 @@ public interface IProductService Task> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); Task> GetProductFromSearch(Message message, CancellationToken cancellationToken); + + Task> GetRecommendationsForProductFromSearch(Message message, CancellationToken cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/ProductTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductTests.cs index d5b786c..458169a 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductTests.cs @@ -1,16 +1,12 @@ -using System.Collections.ObjectModel; -using Microsoft.VisualBasic; -using MongoDB.Bson; +using MongoDB.Bson; using Moq; -using Newtonsoft.Json; -using ShoppingAssistantApi.Application.Models.Dtos; +using Newtonsoft.Json.Linq; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Tests.TestExtentions; -using ShoppingAssistantApi.Infrastructure.Services; namespace ShoppingAssistantApi.Tests.Tests; @@ -26,6 +22,54 @@ public class ProductTests : TestsBase _productServiceMock = new Mock(); } + [Fact] + public async Task StartNewSearchAndReturnWishlist_CreatesWishlistObject() + { + var message = new Message + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Text = "what are the best graphics cards you know?", + CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Role = "user" + }; + var cancellationToken = CancellationToken.None; + + var expectedProductList = new List { "NVIDIA GeForce RTX 3080", "AMD Radeon RX 6900 XT" }; + _productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) + .ReturnsAsync(expectedProductList); + + Wishlist createdWishList = null; + var expectedOpenAiMessage = new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" + }; + _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) + .ReturnsAsync(expectedOpenAiMessage); + _productServiceMock + .Setup(x => x.StartNewSearchAndReturnWishlist(It.IsAny(), cancellationToken)) + .ReturnsAsync(() => + { + createdWishList = new Wishlist + { + Name = "Test Wishlist", + CreatedById = ObjectId.GenerateNewId(), + Id = ObjectId.GenerateNewId(), + Type = "Test Type" + }; + return new List(); + }); + + await _productServiceMock.Object.StartNewSearchAndReturnWishlist(message, cancellationToken); + + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); + var productNames = openAiContent["Name"].ToObject>(); + var productList = productNames.Select(info => info.Name).ToList(); + + Assert.Equal(expectedProductList, productList); + Assert.True(openAiContent.ContainsKey("Name")); + Assert.NotNull(createdWishList); + } [Fact] public async Task GetProductFromSearch_ReturnsProductList() @@ -38,24 +82,52 @@ public class ProductTests : TestsBase Role = "user" }; var cancellationToken = CancellationToken.None; - - var productServiceMock = new Mock(); + var expectedProductList = new List { "NVIDIA GeForce RTX 3080", "AMD Radeon RX 6900 XT" }; - productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) + _productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) .ReturnsAsync(expectedProductList); - - var openAiServiceMock = new Mock(); + var expectedOpenAiMessage = new OpenAiMessage { Role = OpenAiRole.User, - Content = "[\n { \"Name\": \"NVIDIA GeForce RTX 3080\" },\n { \"Name\": \"AMD Radeon RX 6900 XT\" }\n]" + Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; - openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) + _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) .ReturnsAsync(expectedOpenAiMessage); - var productList = JsonConvert.DeserializeObject>(expectedOpenAiMessage.Content).Select(info => info.Name).ToList(); - + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); + var productNames = openAiContent["Name"].ToObject>(); + var productList = productNames.Select(info => info.Name).ToList(); + Assert.Equal(expectedProductList, productList); + Assert.True(openAiContent.ContainsKey("Name")); } + [Fact] + public async Task GetRecommendationsForProductFromSearch_ReturnsRecommendations() + { + var message = new Message + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Text = "get recommendations for this product", + CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Role = "user" + }; + var cancellationToken = CancellationToken.None; + + var expectedOpenAiMessage = new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "{ \"Recommendation\": [\"Recommendation 1\", \"Recommendation 2\"] }" + }; + _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) + .ReturnsAsync(expectedOpenAiMessage); + + var recommendations = await _productServiceMock.Object.GetRecommendationsForProductFromSearch(message, cancellationToken); + + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); + Assert.NotNull(openAiContent); + Assert.True(openAiContent.ContainsKey("Recommendation")); + + } } \ No newline at end of file From 1f865a318fe116d830230f0bf8623c35f7c738a1 Mon Sep 17 00:00:00 2001 From: stasex Date: Fri, 20 Oct 2023 02:28:22 +0300 Subject: [PATCH 39/85] implemented the interface in ProductService.cs --- .../ShoppingAssistantApi.Application.csproj | 1 + .../Services/ProductService.cs | 134 ++++++++++++++++-- 2 files changed, 121 insertions(+), 14 deletions(-) diff --git a/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj b/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj index 46083d4..e7b7e9f 100644 --- a/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj +++ b/ShoppingAssistantApi.Application/ShoppingAssistantApi.Application.csproj @@ -16,4 +16,5 @@ + diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index af4e45a..7753a8d 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -1,31 +1,137 @@ using System.Collections.ObjectModel; +using System.Linq.Expressions; +using Newtonsoft.Json.Linq; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Domain.Enums; namespace ShoppingAssistantApi.Infrastructure.Services; -public class ProductService +public class ProductService : IProductService { - /*private readonly IWishlistsRepository _wishlistsRepository; + private readonly IWishlistsRepository _wishlistsRepository; + + private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; - private readonly IProductService _productService; - public ProductServices(IOpenAiService openAiService, IProductService productService) + public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService, IWishlistsRepository wishlistsRepository) { _openAiService = openAiService; - _productService = productService; - } - - public async Task> StartNewSearchAndReturnWishlist(Message message, - CancellationToken cancellationToken) - { - return null; + _wishlistsService = wishlistsService; + _wishlistsRepository = wishlistsRepository; } - public async Task> GetProductFromSearch(Message message, CancellationToken cancellationToken) + public async Task> StartNewSearchAndReturnWishlist(Message message, + CancellationToken cancellationToken) { - return null; - }*/ + List messages = new List() + { + new OpenAiMessage() + { + Role = OpenAiRole.User, + Content = PromptForProductSearch(message.Text) + } + }; + + var chatRequest = new ChatCompletionRequest + { + Messages = messages + }; + + var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); + + var openAiContent = JObject.Parse(openAiMessage.Content); + var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); + + + WishlistCreateDto newWishlist = new WishlistCreateDto() + { + Type = "Product", + FirstMessageText = message.Text + }; + + var resultWishList = _wishlistsService.StartPersonalWishlistAsync(newWishlist, cancellationToken); + + return productNames.Select(productName => productName.Name).ToList(); + } + + public async Task> GetProductFromSearch(Message message, CancellationToken cancellationToken) + { + List messages = new List() + { + new OpenAiMessage() + { + Role = OpenAiRole.User, + Content = PromptForProductSearch(message.Text) + } + }; + + var chatRequest = new ChatCompletionRequest + { + Messages = messages + }; + + var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); + + var openAiContent = JObject.Parse(openAiMessage.Content); + var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); + + return productNames.Select(productName => productName.Name).ToList(); + } + + public async Task> GetRecommendationsForProductFromSearch(Message message, CancellationToken cancellationToken) + { + List messages = new List() + { + new OpenAiMessage() + { + Role = OpenAiRole.User, + Content = PromptForRecommendationsForProductSearch(message.Text) + } + }; + + var chatRequest = new ChatCompletionRequest + { + Messages = messages + }; + + var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); + + var openAiContent = JObject.Parse(openAiMessage.Content); + var recommendations = openAiContent["Recommendation"]?.ToObject>() ?? new List(); + + return recommendations; + } + + public string PromptForProductSearch(string message) + { + string promptForSearch = "Return information in JSON. " + + "\nProvide information, only that indicated in the type of answer, namely only the name. " + + "\nAsk additional questions to the user if there is not enough information. " + + "\nIf there are several answer options, list them. " + + "\nYou don't need to display questions and products together! " + + "\nDo not output any text other than JSON!!! " + + $"\n\nQuestion: {message} " + + $"\nType of answer: Question:[] " + + $"\n\nif there are no questions, then just display the products " + + $"\nType of answer: Name:"; + return promptForSearch; + } + + public string PromptForRecommendationsForProductSearch(string message) + { + string promptForSearch = "Return information in JSON. " + + "\nProvide only information indicated in the type of answer, namely only the recommendation. " + + "\nIf there are several answer options, list them. " + + "\nDo not output any text other than JSON." + + $"\n\nGive recommendations for this question: {message} " + + "\nType of answer: " + + "\n\nRecommendation :"; + return promptForSearch; + } } \ No newline at end of file From 6ce15d15ae527dc94f856a482a3274d40567dd0b Mon Sep 17 00:00:00 2001 From: stasex Date: Fri, 20 Oct 2023 02:29:10 +0300 Subject: [PATCH 40/85] commit with the required nuget package --- .../ShoppingAssistantApi.Infrastructure.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj index 6b6f722..ab6f623 100644 --- a/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj +++ b/ShoppingAssistantApi.Infrastructure/ShoppingAssistantApi.Infrastructure.csproj @@ -11,6 +11,7 @@ + From fc6ce2e6a9037c13e58bcd39d88879e4ad6c18e3 Mon Sep 17 00:00:00 2001 From: stasex Date: Fri, 20 Oct 2023 23:30:09 +0300 Subject: [PATCH 41/85] made an implementation to start the search and tested it --- .../Mutations/ProductMutation.cs | 15 ++++ .../Queries/ProductQuery.cs | 7 ++ .../IServices/IProductService.cs | 4 +- .../Services/ProductService.cs | 39 +++++----- .../ProductTests.cs | 74 +++++++++++-------- .../ShoppingAssistantApi.UnitTests.csproj | 7 +- 6 files changed, 92 insertions(+), 54 deletions(-) create mode 100644 ShoppingAssistantApi.Api/Mutations/ProductMutation.cs create mode 100644 ShoppingAssistantApi.Api/Queries/ProductQuery.cs rename {ShoppingAssistantApi.Tests/Tests => ShoppingAssistantApi.UnitTests}/ProductTests.cs (70%) diff --git a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs new file mode 100644 index 0000000..24ad5e3 --- /dev/null +++ b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs @@ -0,0 +1,15 @@ +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.ProductSearch; +using ShoppingAssistantApi.Domain.Entities; +using ShoppingAssistantApi.Infrastructure.Services; + +namespace ShoppingAssistantApi.Api.Mutations; + +[ExtendObjectType(OperationTypeNames.Mutation)] +public class ProductMutation +{ + public IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist( + Message message, CancellationToken cancellationToken, [Service] IProductService productService) + => productService.StartNewSearchAndReturnWishlist(message, cancellationToken); +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs new file mode 100644 index 0000000..11f9fc1 --- /dev/null +++ b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs @@ -0,0 +1,7 @@ +namespace ShoppingAssistantApi.Api.Queries; + +[ExtendObjectType(OperationTypeNames.Query)] +public class ProductQuery +{ + +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 89ce557..7bd64d6 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -1,12 +1,14 @@ using System.Collections.ObjectModel; +using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; namespace ShoppingAssistantApi.Application.IServices; public interface IProductService { - Task> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); + IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); Task> GetProductFromSearch(Message message, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 7753a8d..3f230ff 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -1,9 +1,11 @@ using System.Collections.ObjectModel; using System.Linq.Expressions; +using System.Runtime.CompilerServices; using Newtonsoft.Json.Linq; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; @@ -13,21 +15,17 @@ namespace ShoppingAssistantApi.Infrastructure.Services; public class ProductService : IProductService { - private readonly IWishlistsRepository _wishlistsRepository; - private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; - public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService, IWishlistsRepository wishlistsRepository) + public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService) { _openAiService = openAiService; _wishlistsService = wishlistsService; - _wishlistsRepository = wishlistsRepository; } - public async Task> StartNewSearchAndReturnWishlist(Message message, - CancellationToken cancellationToken) + public async IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken) { List messages = new List() { @@ -37,27 +35,28 @@ public class ProductService : IProductService Content = PromptForProductSearch(message.Text) } }; - + var chatRequest = new ChatCompletionRequest { Messages = messages }; - var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); - - var openAiContent = JObject.Parse(openAiMessage.Content); - var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); - - - WishlistCreateDto newWishlist = new WishlistCreateDto() + await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) { - Type = "Product", - FirstMessageText = message.Text - }; + var openAiContent = JObject.Parse(response); + var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); - var resultWishList = _wishlistsService.StartPersonalWishlistAsync(newWishlist, cancellationToken); - - return productNames.Select(productName => productName.Name).ToList(); + WishlistCreateDto newWishlist = new WishlistCreateDto() + { + Type = "Product", + FirstMessageText = message.Text + }; + + var resultWishlistTask = _wishlistsService.StartPersonalWishlistAsync(newWishlist, cancellationToken); + var resultWishlist = await resultWishlistTask; + + yield return (productNames, resultWishlist); + } } public async Task> GetProductFromSearch(Message message, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Tests/Tests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs similarity index 70% rename from ShoppingAssistantApi.Tests/Tests/ProductTests.cs rename to ShoppingAssistantApi.UnitTests/ProductTests.cs index 458169a..57fa61b 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -1,25 +1,31 @@ -using MongoDB.Bson; +using Microsoft.Extensions.DependencyInjection; +using MongoDB.Bson; using Moq; using Newtonsoft.Json.Linq; using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; -using ShoppingAssistantApi.Tests.TestExtentions; +using ShoppingAssistantApi.Infrastructure.Services; namespace ShoppingAssistantApi.Tests.Tests; -public class ProductTests : TestsBase +public class ProductTests { private Mock _openAiServiceMock; - + private Mock _productServiceMock; - - public ProductTests(TestingFactory factory) : base(factory) + + public Mock _wishListServiceMock; + + public ProductTests() { _openAiServiceMock = new Mock(); _productServiceMock = new Mock(); + _wishListServiceMock = new Mock(); } [Fact] @@ -33,42 +39,50 @@ public class ProductTests : TestsBase Role = "user" }; var cancellationToken = CancellationToken.None; - - var expectedProductList = new List { "NVIDIA GeForce RTX 3080", "AMD Radeon RX 6900 XT" }; - _productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) - .ReturnsAsync(expectedProductList); - Wishlist createdWishList = null; var expectedOpenAiMessage = new OpenAiMessage { Role = OpenAiRole.User, Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; - _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) - .ReturnsAsync(expectedOpenAiMessage); - _productServiceMock - .Setup(x => x.StartNewSearchAndReturnWishlist(It.IsAny(), cancellationToken)) - .ReturnsAsync(() => + + var openAiServiceMock = new Mock(); + var wishlistsServiceMock = new Mock(); + + openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns((ChatCompletionRequest request, CancellationToken token) => { - createdWishList = new Wishlist - { - Name = "Test Wishlist", - CreatedById = ObjectId.GenerateNewId(), - Id = ObjectId.GenerateNewId(), - Type = "Test Type" - }; - return new List(); + var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); + return asyncEnumerable; }); - await _productServiceMock.Object.StartNewSearchAndReturnWishlist(message, cancellationToken); - - var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - var productNames = openAiContent["Name"].ToObject>(); - var productList = productNames.Select(info => info.Name).ToList(); + wishlistsServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), cancellationToken)) + .ReturnsAsync(new WishlistDto + { + Id = "someID", + Name = "MacBook", + Type = "Product", + CreatedById = "someId" + }); + + var productService = new ProductService(openAiServiceMock.Object, wishlistsServiceMock.Object); + + List productNames = null; + WishlistDto createdWishList = null; + + var result = productService.StartNewSearchAndReturnWishlist(message, cancellationToken); + + await foreach (var (productList, wishlist) in result) + { + productNames = productList; + createdWishList = wishlist; + } + + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - Assert.Equal(expectedProductList, productList); Assert.True(openAiContent.ContainsKey("Name")); Assert.NotNull(createdWishList); + Assert.NotNull(productNames); } [Fact] diff --git a/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj index 9274a65..e5361a9 100644 --- a/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj +++ b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj @@ -12,6 +12,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -23,9 +24,9 @@ - - - + + + From 60484e4a6e1bae0301bd63c1e34045097ae50a7a Mon Sep 17 00:00:00 2001 From: stasex Date: Fri, 20 Oct 2023 23:46:55 +0300 Subject: [PATCH 42/85] made an implementation for request for recommendations and tested it --- .../IServices/IProductService.cs | 5 ++-- .../Services/ProductService.cs | 18 ++++++----- .../ProductTests.cs | 30 ++++++++++++------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 7bd64d6..c2fddd2 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -11,6 +11,7 @@ public interface IProductService IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); Task> GetProductFromSearch(Message message, CancellationToken cancellationToken); - - Task> GetRecommendationsForProductFromSearch(Message message, CancellationToken cancellationToken); + + IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, + CancellationToken cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 3f230ff..5a11d68 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -83,7 +83,7 @@ public class ProductService : IProductService return productNames.Select(productName => productName.Name).ToList(); } - public async Task> GetRecommendationsForProductFromSearch(Message message, CancellationToken cancellationToken) + public async IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken) { List messages = new List() { @@ -93,18 +93,22 @@ public class ProductService : IProductService Content = PromptForRecommendationsForProductSearch(message.Text) } }; - + var chatRequest = new ChatCompletionRequest { Messages = messages }; - var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); + await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) + { + var openAiContent = JObject.Parse(response); + var recommendations = openAiContent["Recommendation"]?.ToObject>() ?? new List(); - var openAiContent = JObject.Parse(openAiMessage.Content); - var recommendations = openAiContent["Recommendation"]?.ToObject>() ?? new List(); - - return recommendations; + foreach (var recommendation in recommendations) + { + yield return recommendation; + } + } } public string PromptForProductSearch(string message) diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 57fa61b..86fe6da 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -46,17 +46,14 @@ public class ProductTests Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; - var openAiServiceMock = new Mock(); - var wishlistsServiceMock = new Mock(); - - openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) .Returns((ChatCompletionRequest request, CancellationToken token) => { var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); return asyncEnumerable; }); - wishlistsServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), cancellationToken)) + _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), cancellationToken)) .ReturnsAsync(new WishlistDto { Id = "someID", @@ -65,7 +62,7 @@ public class ProductTests CreatedById = "someId" }); - var productService = new ProductService(openAiServiceMock.Object, wishlistsServiceMock.Object); + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); List productNames = null; WishlistDto createdWishList = null; @@ -128,20 +125,31 @@ public class ProductTests Role = "user" }; var cancellationToken = CancellationToken.None; - + var expectedOpenAiMessage = new OpenAiMessage { Role = OpenAiRole.User, Content = "{ \"Recommendation\": [\"Recommendation 1\", \"Recommendation 2\"] }" }; - _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) - .ReturnsAsync(expectedOpenAiMessage); - var recommendations = await _productServiceMock.Object.GetRecommendationsForProductFromSearch(message, cancellationToken); + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns((ChatCompletionRequest request, CancellationToken token) => + { + var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); + return asyncEnumerable; + }); + + var recommendations = new List(); + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + await foreach (var recommendation in productService.GetRecommendationsForProductFromSearchStream(message, cancellationToken)) + { + recommendations.Add(recommendation); + } + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); Assert.NotNull(openAiContent); Assert.True(openAiContent.ContainsKey("Recommendation")); - + Assert.Equal(new List { "Recommendation 1", "Recommendation 2" }, recommendations); } } \ No newline at end of file From 9db3baca89043a9ef5e080c3db94493293884ac1 Mon Sep 17 00:00:00 2001 From: stasex Date: Sat, 21 Oct 2023 01:15:30 +0300 Subject: [PATCH 43/85] made an implementation for a request that may contain questions and tested it --- .../Queries/ProductQuery.cs | 15 +++- .../IServices/IProductService.cs | 4 +- .../Models/ProductSearch/Question.cs | 6 ++ .../Services/ProductService.cs | 50 +++++++++++--- .../ProductTests.cs | 68 +++++++++++++++---- 5 files changed, 120 insertions(+), 23 deletions(-) create mode 100644 ShoppingAssistantApi.Application/Models/ProductSearch/Question.cs diff --git a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs index 11f9fc1..cbaa775 100644 --- a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs @@ -1,7 +1,20 @@ -namespace ShoppingAssistantApi.Api.Queries; +using HotChocolate.Authorization; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Domain.Entities; + +namespace ShoppingAssistantApi.Api.Queries; [ExtendObjectType(OperationTypeNames.Query)] public class ProductQuery { + [Authorize] + public IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken, + [Service] IProductService productService) + => productService.GetProductFromSearch(message, cancellationToken); + [Authorize] + public IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken, + [Service] IProductService productService) + => productService.GetRecommendationsForProductFromSearchStream(message, cancellationToken); + } \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index c2fddd2..8f929f4 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -9,8 +9,8 @@ namespace ShoppingAssistantApi.Application.IServices; public interface IProductService { IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); - - Task> GetProductFromSearch(Message message, CancellationToken cancellationToken); + + IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken); IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Application/Models/ProductSearch/Question.cs b/ShoppingAssistantApi.Application/Models/ProductSearch/Question.cs new file mode 100644 index 0000000..e1f0c46 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/ProductSearch/Question.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.ProductSearch; + +public class Question +{ + public string QuestionText { get; set; } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 5a11d68..ecaf0fb 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -59,30 +59,47 @@ public class ProductService : IProductService } } - public async Task> GetProductFromSearch(Message message, CancellationToken cancellationToken) + public async IAsyncEnumerable GetProductFromSearch(Message message, [EnumeratorCancellation] CancellationToken cancellationToken) { List messages = new List() { new OpenAiMessage() { Role = OpenAiRole.User, - Content = PromptForProductSearch(message.Text) + Content = PromptForProductSearchWithQuestion(message.Text) } }; - + var chatRequest = new ChatCompletionRequest { Messages = messages }; - var openAiMessage = await _openAiService.GetChatCompletion(chatRequest, cancellationToken); + await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) + { + var openAiContent = JObject.Parse(response); + var productNames = openAiContent["Name"]?.ToObject>(); - var openAiContent = JObject.Parse(openAiMessage.Content); - var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); - - return productNames.Select(productName => productName.Name).ToList(); + if (productNames != null && productNames.Any()) + { + foreach (var productName in productNames) + { + yield return productName.Name; + } + } + else + { + var questions = openAiContent["AdditionalQuestion"]?.ToObject>() ?? new List(); + + foreach (var question in questions) + { + yield return question.QuestionText; + } + } + } } + public async IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken) { List messages = new List() @@ -137,4 +154,21 @@ public class ProductService : IProductService "\n\nRecommendation :"; return promptForSearch; } + + public string PromptForProductSearchWithQuestion(string message) + { + string promptForSearch = "Return information in JSON. " + + "\nAsk additional questions to the user if there is not enough information." + + "\nIf there are several answer options, list them. " + + "\nYou don't need to display questions and products together!" + + "\nDo not output any text other than JSON!!!" + + $"\n\nQuestion: {message}" + + "\n\nif you can ask questions to clarify the choice, then ask them" + + "\nType of answer:" + + "\nAdditionalQuestion:[]" + + "\n\nif there are no questions, then just display the products" + + "\nType of answer:" + + "\nName:"; + return promptForSearch; + } } \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 86fe6da..1ddee69 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -76,14 +76,13 @@ public class ProductTests } var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - - Assert.True(openAiContent.ContainsKey("Name")); + Assert.NotNull(createdWishList); Assert.NotNull(productNames); } [Fact] - public async Task GetProductFromSearch_ReturnsProductList() + public async Task GetProductFromSearch_ReturnsProductListWithName() { var message = new Message { @@ -93,27 +92,72 @@ public class ProductTests Role = "user" }; var cancellationToken = CancellationToken.None; - - var expectedProductList = new List { "NVIDIA GeForce RTX 3080", "AMD Radeon RX 6900 XT" }; - _productServiceMock.Setup(x => x.GetProductFromSearch(message, cancellationToken)) - .ReturnsAsync(expectedProductList); - + var expectedOpenAiMessage = new OpenAiMessage { Role = OpenAiRole.User, Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; - _openAiServiceMock.Setup(x => x.GetChatCompletion(It.IsAny(), cancellationToken)) - .ReturnsAsync(expectedOpenAiMessage); + + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable()); + + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + + var productList = new List(); + + await foreach (var product in productService.GetProductFromSearch(message, cancellationToken)) + { + productList.Add(product); + } var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); var productNames = openAiContent["Name"].ToObject>(); - var productList = productNames.Select(info => info.Name).ToList(); - + var expectedProductList = productNames.Select(info => info.Name).ToList(); + Assert.Equal(expectedProductList, productList); + Assert.NotNull(openAiContent); Assert.True(openAiContent.ContainsKey("Name")); } + [Fact] + public async Task GetProductFromSearch_ReturnsProductListWithQuestion() + { + var message = new Message + { + Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Text = "what are the best graphics cards you know?", + CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), + Role = "user" + }; + var cancellationToken = CancellationToken.None; + + var expectedOpenAiMessage = new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "{ \"AdditionalQuestion\": [{ \"QuestionText\": \"What specific MacBook model are you using?\" }," + + " { \"QuestionText\": \"Do you have any preferences for brand or capacity?\" }] }" + }; + + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable()); + + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + + var productList = new List(); + + await foreach (var product in productService.GetProductFromSearch(message, cancellationToken)) + { + productList.Add(product); + } + + var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); + var productNames = openAiContent["AdditionalQuestion"].ToObject>(); + + Assert.NotNull(openAiContent); + Assert.True(openAiContent.ContainsKey("AdditionalQuestion")); + } + [Fact] public async Task GetRecommendationsForProductFromSearch_ReturnsRecommendations() { From fcc5f02c48c150d26534875b977a5758bd23697a Mon Sep 17 00:00:00 2001 From: shchoholiev Date: Sat, 21 Oct 2023 13:40:10 +0000 Subject: [PATCH 44/85] Added models for product search. --- .../IServices/IProductService.cs | 5 +- .../Models/ProductSearch/MessagePart.cs | 6 ++ .../Models/ProductSearch/ServerSentEvent.cs | 10 ++++ .../Models/ProductSearch/Suggestion.cs | 6 ++ .../Enums/SearchEventType.cs | 24 ++++++++ .../Services/ProductService.cs | 7 +++ .../ProductTests.cs | 58 +++++++++---------- 7 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 ShoppingAssistantApi.Application/Models/ProductSearch/MessagePart.cs create mode 100644 ShoppingAssistantApi.Application/Models/ProductSearch/ServerSentEvent.cs create mode 100644 ShoppingAssistantApi.Application/Models/ProductSearch/Suggestion.cs create mode 100644 ShoppingAssistantApi.Domain/Enums/SearchEventType.cs diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 8f929f4..8bd24b6 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -1,6 +1,5 @@ -using System.Collections.ObjectModel; +using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; -using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; @@ -10,6 +9,8 @@ public interface IProductService { IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); + IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken); + IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken); IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, diff --git a/ShoppingAssistantApi.Application/Models/ProductSearch/MessagePart.cs b/ShoppingAssistantApi.Application/Models/ProductSearch/MessagePart.cs new file mode 100644 index 0000000..feacc20 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/ProductSearch/MessagePart.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.ProductSearch; + +public class MessagePart +{ + public string Text { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/ProductSearch/ServerSentEvent.cs b/ShoppingAssistantApi.Application/Models/ProductSearch/ServerSentEvent.cs new file mode 100644 index 0000000..e7be1cb --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/ProductSearch/ServerSentEvent.cs @@ -0,0 +1,10 @@ +using ShoppingAssistantApi.Domain.Enums; + +namespace ShoppingAssistantApi.Application.Models.ProductSearch; + +public class ServerSentEvent +{ + public SearchEventType Event { get; set; } + + public string Data { get; set; } +} diff --git a/ShoppingAssistantApi.Application/Models/ProductSearch/Suggestion.cs b/ShoppingAssistantApi.Application/Models/ProductSearch/Suggestion.cs new file mode 100644 index 0000000..ccefea2 --- /dev/null +++ b/ShoppingAssistantApi.Application/Models/ProductSearch/Suggestion.cs @@ -0,0 +1,6 @@ +namespace ShoppingAssistantApi.Application.Models.ProductSearch; + +public class Suggestion +{ + public string Text { get; set; } +} diff --git a/ShoppingAssistantApi.Domain/Enums/SearchEventType.cs b/ShoppingAssistantApi.Domain/Enums/SearchEventType.cs new file mode 100644 index 0000000..3388692 --- /dev/null +++ b/ShoppingAssistantApi.Domain/Enums/SearchEventType.cs @@ -0,0 +1,24 @@ +namespace ShoppingAssistantApi.Domain.Enums; + +public enum SearchEventType +{ + Wishlist = 0, + Message = 1, + Suggestion = 2, + Product = 3 +} + +public static class SearchEventTypeExtensions +{ + public static string ToSseEventString(this SearchEventType eventType) + { + return eventType switch + { + SearchEventType.Wishlist => "wishlist", + SearchEventType.Message => "message", + SearchEventType.Suggestion => "suggestion", + SearchEventType.Product => "product", + _ => throw new ArgumentOutOfRangeException(nameof(eventType), eventType, null), + }; + } +} diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index ecaf0fb..c108f78 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -25,6 +25,13 @@ public class ProductService : IProductService _wishlistsService = wishlistsService; } + public IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) + { + // get all messages from wishlist + + throw new NotImplementedException(); + } + public async IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken) { List messages = new List() diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 1ddee69..78b1376 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -17,20 +17,43 @@ public class ProductTests { private Mock _openAiServiceMock; - private Mock _productServiceMock; + private IProductService _productService; public Mock _wishListServiceMock; public ProductTests() { _openAiServiceMock = new Mock(); - _productServiceMock = new Mock(); _wishListServiceMock = new Mock(); + _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); } [Fact] public async Task StartNewSearchAndReturnWishlist_CreatesWishlistObject() { + // Arrange + var expectedOpenAiMessage = new OpenAiMessage + { + Role = OpenAiRole.User, + Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" + }; + + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), CancellationToken.None)) + .Returns((ChatCompletionRequest request, CancellationToken token) => + { + var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); + return asyncEnumerable; + }); + + _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), CancellationToken.None)) + .ReturnsAsync(new WishlistDto + { + Id = "someID", + Name = "MacBook", + Type = "Product", // Use enum + CreatedById = "someId" + }); + var message = new Message { Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), @@ -38,45 +61,20 @@ public class ProductTests CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), Role = "user" }; - var cancellationToken = CancellationToken.None; - - var expectedOpenAiMessage = new OpenAiMessage - { - Role = OpenAiRole.User, - Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" - }; - - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) - .Returns((ChatCompletionRequest request, CancellationToken token) => - { - var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); - return asyncEnumerable; - }); - - _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), cancellationToken)) - .ReturnsAsync(new WishlistDto - { - Id = "someID", - Name = "MacBook", - Type = "Product", - CreatedById = "someId" - }); - - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); List productNames = null; WishlistDto createdWishList = null; - var result = productService.StartNewSearchAndReturnWishlist(message, cancellationToken); + // Act + var result = _productService.StartNewSearchAndReturnWishlist(message, CancellationToken.None); await foreach (var (productList, wishlist) in result) { productNames = productList; createdWishList = wishlist; } - - var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); + // Assert Assert.NotNull(createdWishList); Assert.NotNull(productNames); } From 8ae360b7e022258c9e6616b6fb4f0f55b8c00972 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sat, 21 Oct 2023 16:52:54 +0300 Subject: [PATCH 45/85] SA-116 initialaizer fixed --- .../PersistanceExtentions/DbInitialaizer.cs | 267 +++++++++--------- 1 file changed, 134 insertions(+), 133 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index f96d491..af50479 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -1,12 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; using MongoDB.Driver; -using ShoppingAssistantApi.Application.GlobalInstances; -using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.IServices.Identity; -using ShoppingAssistantApi.Application.Models.CreateDtos; -using ShoppingAssistantApi.Application.Models.Dtos; -using ShoppingAssistantApi.Application.Models.Identity; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Persistance.Database; @@ -15,34 +10,23 @@ namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; public class DbInitialaizer { - private readonly IUsersService _usersService; - - private readonly IUserManager _userManager; - - private readonly IRolesService _rolesService; - - private readonly ITokensService _tokensService; - - private readonly IWishlistsService _wishlistsService; - private readonly IMongoCollection _userCollection; + private readonly IMongoCollection _roleCollection; + private readonly IMongoCollection _wishlistCollection; - + private readonly IMongoCollection _productCollection; - public IEnumerable Roles { get; set; } + private readonly IPasswordHasher _passwordHasher; - public DbInitialaizer(IServiceProvider serviceProvider) + public DbInitialaizer(IServiceProvider serviceProvider, IPasswordHasher passwordHasher) { - _usersService = serviceProvider.GetService(); - _rolesService = serviceProvider.GetService(); - _userManager = serviceProvider.GetService(); - _tokensService = serviceProvider.GetService(); - _wishlistsService = serviceProvider.GetService(); _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); + _roleCollection = serviceProvider.GetService().Db.GetCollection("Roles"); _productCollection = serviceProvider.GetService().Db.GetCollection("Product"); + _passwordHasher = passwordHasher; } public async Task InitialaizeDb(CancellationToken cancellationToken) @@ -55,123 +39,140 @@ public class DbInitialaizer public async Task AddUsers(CancellationToken cancellationToken) { - var guestModel1 = new AccessGuestModel + var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User"))).FirstAsync(); + var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest"))).FirstAsync(); + var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin"))).FirstAsync(); + + var users = new User[] { - GuestId = Guid.NewGuid(), + new User + { + Id = ObjectId.Parse("6533bb29c8c22b038c71cf46"), + GuestId = Guid.NewGuid(), + Roles = {guestRole}, + CreatedById = ObjectId.Parse("6533bb29c8c22b038c71cf46"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bb29c8c22b038c71cf46"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false + }, + + new User + { + Id = ObjectId.Parse("6533bde5755745116be42ce7"), + GuestId = Guid.NewGuid(), + Roles = + { + guestRole, + userRole + }, + Phone = "+380953326869", + Email = "mykhailo.bilodid@nure.ua", + PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Parse("6533bde5755745116be42ce7"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bde5755745116be42ce7"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false + }, + + new User + { + Id = ObjectId.Parse("6533bded80fbc6e96250575b"), + GuestId = Guid.NewGuid(), + Roles = + { + guestRole, + userRole, + adminRole + }, + Phone = "+380953826869", + Email = "shopping.assistant.team@gmail.com", + PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false }, + + new User + { + Id = ObjectId.Parse("6533bdf9efaca5bb0894f992"), + GuestId = Guid.NewGuid(), + Roles = + { + guestRole, + userRole + }, + Phone = "+380983326869", + Email = "vitalii.krasnorutski@nure.ua", + PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Parse("6533bdf9efaca5bb0894f992"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bdf9efaca5bb0894f992"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false }, + + new User + { + Id = ObjectId.Parse("6533be06d1b78a76c664ddae"), + GuestId = Guid.NewGuid(), + Roles = + { + guestRole, + userRole + }, + Phone = "+380953326888", + Email = "serhii.shchoholiev@nure.ua", + PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + CreatedById = ObjectId.Parse("6533be06d1b78a76c664ddae"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533be06d1b78a76c664ddae"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false } }; - var guestModel2 = new AccessGuestModel - { - GuestId = Guid.NewGuid(), - }; - - var guestModel3 = new AccessGuestModel - { - GuestId = Guid.NewGuid(), - }; - - var guestModel4 = new AccessGuestModel - { - GuestId = Guid.NewGuid(), - }; - - var guestModel5 = new AccessGuestModel - { - GuestId = Guid.NewGuid(), - }; - - Task.WaitAll( - _userManager.AccessGuestAsync(guestModel1, cancellationToken), - _userManager.AccessGuestAsync(guestModel2, cancellationToken), - _userManager.AccessGuestAsync(guestModel3, cancellationToken), - _userManager.AccessGuestAsync(guestModel4, cancellationToken), - _userManager.AccessGuestAsync(guestModel5, cancellationToken) - ); - - var guests = await _usersService.GetUsersPageAsync(1, 4, cancellationToken); - var guestsResult = guests.Items.ToList(); - - var user1 = new UserDto - { - Id = guestsResult[0].Id, - GuestId = guestsResult[0].GuestId, - Roles = guestsResult[0].Roles, - Phone = "+380953326869", - Email = "mykhailo.bilodid@nure.ua", - Password = "Yuiop12345", - RefreshToken = _tokensService.GenerateRefreshToken(), - RefreshTokenExpiryDate = DateTime.Now.AddDays(7), - }; - - var user2 = new UserDto - { - Id = guestsResult[1].Id, - GuestId = guestsResult[1].GuestId, - Roles = guestsResult[1].Roles, - Phone = "+380953326888", - Email = "serhii.shchoholiev@nure.ua", - Password = "Yuiop12345", - RefreshToken = _tokensService.GenerateRefreshToken(), - RefreshTokenExpiryDate = DateTime.Now.AddDays(7), - }; - - var user3 = new UserDto - { - Id = guestsResult[2].Id, - GuestId = guestsResult[2].GuestId, - Roles = guestsResult[2].Roles, - Phone = "+380983326869", - Email = "vitalii.krasnorutski@nure.ua", - Password = "Yuiop12345", - RefreshToken = _tokensService.GenerateRefreshToken(), - RefreshTokenExpiryDate = DateTime.Now.AddDays(7), - }; - - var user4 = new UserDto - { - Id = guestsResult[3].Id, - GuestId = guestsResult[3].GuestId, - Roles = guestsResult[3].Roles, - Phone = "+380953826869", - Email = "shopping.assistant.team@gmail.com", - Password = "Yuiop12345", - RefreshToken = _tokensService.GenerateRefreshToken(), - RefreshTokenExpiryDate = DateTime.Now.AddDays(7), - }; - - GlobalUser.Id = ObjectId.Parse(user1.Id); - await _userManager.UpdateAsync(user1, cancellationToken); - - GlobalUser.Id = ObjectId.Parse(user2.Id); - await _userManager.UpdateAsync(user2, cancellationToken); - - GlobalUser.Id = ObjectId.Parse(user3.Id); - await _userManager.UpdateAsync(user3, cancellationToken); - - GlobalUser.Id = ObjectId.Parse(user4.Id); - await _userManager.UpdateAsync(user4, cancellationToken); + await _userCollection.InsertManyAsync(users); } public async Task AddRoles(CancellationToken cancellationToken) { - var role1 = new RoleCreateDto + var roles = new Role[] { - Name = "User" - }; + new Role + { + Id = ObjectId.Parse("6533b5882e7867b8b21e7b27"), + Name = "User", + CreatedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false + }, - var role2 = new RoleCreateDto - { - Name = "Admin" - }; + new Role + { + Id = ObjectId.Parse("6533b591a7f31776cd2d50fc"), + Name = "Guest", + CreatedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false + }, - var role3 = new RoleCreateDto - { - Name = "Guest" + new Role + { + Id = ObjectId.Parse("6533b59d1b09ab2618af5ff3"), + Name = "Admin", + CreatedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + CreatedDateUtc = DateTime.UtcNow, + LastModifiedById = ObjectId.Parse("6533bded80fbc6e96250575b"), + LastModifiedDateUtc = DateTime.UtcNow, + IsDeleted = false + }, }; - - var dto1 = await _rolesService.AddRoleAsync(role1, cancellationToken); - var dto2 = await _rolesService.AddRoleAsync(role2, cancellationToken); - var dto3 = await _rolesService.AddRoleAsync(role3, cancellationToken); + await _roleCollection.InsertManyAsync(roles); } public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) @@ -249,8 +250,8 @@ public class DbInitialaizer CreatedDateUtc = DateTime.UtcNow, WasOpened = false, WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd") - }, - + }, + new Product() { Name = "Apple MagSafe Battery Pack", @@ -268,7 +269,7 @@ public class DbInitialaizer WasOpened = false, WishlistId = ObjectId.Parse("ab79cde6f69abcd3efab65cd") }, - + new Product() { Name = "Logitech K400 Plus Wireless Touch With Easy Media Control and Built-in Touchpad", @@ -286,7 +287,7 @@ public class DbInitialaizer WasOpened = false, WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab") }, - + new Product() { Name = "Logitech MX Anywhere 2S Wireless Mouse Use On Any Surface", From 962ab03c4c4f3e5e0a36be47287fbc4abed19c02 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sat, 21 Oct 2023 19:19:13 +0300 Subject: [PATCH 46/85] SA-33 comments and some changes added --- .../IServices/IProductService.cs | 5 ++-- .../Entities/Wishlist.cs | 2 -- .../Services/ProductService.cs | 5 ++-- .../PersistanceExtentions/DbInitialaizer.cs | 30 ------------------- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 8bd24b6..03a8545 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -7,10 +7,11 @@ namespace ShoppingAssistantApi.Application.IServices; public interface IProductService { - IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); - IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken); + // TODO remove all methods below + IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); + IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken); IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, diff --git a/ShoppingAssistantApi.Domain/Entities/Wishlist.cs b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs index 4dee7fc..9c9bfc6 100644 --- a/ShoppingAssistantApi.Domain/Entities/Wishlist.cs +++ b/ShoppingAssistantApi.Domain/Entities/Wishlist.cs @@ -7,6 +7,4 @@ public class Wishlist : EntityBase public string Name { get; set; } public string Type { get; set; } - - public ICollection? Messages { get; set; } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index c108f78..7bc99ed 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -24,14 +24,15 @@ public class ProductService : IProductService _openAiService = openAiService; _wishlistsService = wishlistsService; } - + public IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - // get all messages from wishlist + // Documentation: https://shchoholiev.atlassian.net/l/cp/JizkynhU throw new NotImplementedException(); } + // TODO: remove all methods below public async IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken) { List messages = new List() diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index f96d491..4d40e28 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -187,25 +187,6 @@ public class DbInitialaizer Name = "Gaming PC", Type = WishlistTypes.Product.ToString(), CreatedById = user1.Id, - Messages = new Message[] - { - new Message - { - 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 - }, - } }, new Wishlist { @@ -213,17 +194,6 @@ public class DbInitialaizer Name = "Generic Wishlist Name", Type = WishlistTypes.Product.ToString(), CreatedById = user2.Id, - Messages = new Message[] - { - new Message - { - Text = "Prompt", - Role = MessageRoles.User.ToString(), - WishlistId = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - CreatedById = user1.Id, - CreatedDateUtc = DateTime.UtcNow - } - } } }; From bc0501dab598d31e9fd5b506096d1b6259f630c4 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sat, 21 Oct 2023 22:12:01 +0300 Subject: [PATCH 47/85] SA-116 final changes --- ShoppingAssistantApi.Api/Program.cs | 14 +++++----- .../PersistanceExtentions/DbInitialaizer.cs | 26 ++++++++++--------- .../ShoppingAssistantApi.Persistance.csproj | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs index affb266..4a1e95b 100644 --- a/ShoppingAssistantApi.Api/Program.cs +++ b/ShoppingAssistantApi.Api/Program.cs @@ -36,14 +36,12 @@ app.AddGlobalUserMiddleware(); app.MapGraphQL(); app.MapControllers(); -/* -using var scope = app.Services.CreateScope(); -var serviceProvider = scope.ServiceProvider; -using var cancellationTokenSource = new CancellationTokenSource(); -var cancellationToken = cancellationTokenSource.Token; -var initializer = new DbInitialaizer(serviceProvider); -initializer.InitialaizeDb(cancellationToken); -*/ + +// using var scope = app.Services.CreateScope(); +// var serviceProvider = scope.ServiceProvider; +// var initializer = new DbInitialaizer(serviceProvider); +// await initializer.InitialaizeDb(CancellationToken.None); + app.Run(); public partial class Program { } \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index af50479..f627b46 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -1,9 +1,11 @@ using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using MongoDB.Bson; using MongoDB.Driver; using ShoppingAssistantApi.Application.IServices.Identity; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; +using ShoppingAssistantApi.Infrastructure.Services.Identity; using ShoppingAssistantApi.Persistance.Database; namespace ShoppingAssistantApi.Persistance.PersistanceExtentions; @@ -18,15 +20,15 @@ public class DbInitialaizer private readonly IMongoCollection _productCollection; - private readonly IPasswordHasher _passwordHasher; + private readonly PasswordHasher passwordHasher; - public DbInitialaizer(IServiceProvider serviceProvider, IPasswordHasher passwordHasher) + public DbInitialaizer(IServiceProvider serviceProvider) { + passwordHasher = new PasswordHasher(new Logger(new LoggerFactory())); _wishlistCollection = serviceProvider.GetService().Db.GetCollection("Wishlists"); _userCollection = serviceProvider.GetService().Db.GetCollection("Users"); _roleCollection = serviceProvider.GetService().Db.GetCollection("Roles"); _productCollection = serviceProvider.GetService().Db.GetCollection("Product"); - _passwordHasher = passwordHasher; } public async Task InitialaizeDb(CancellationToken cancellationToken) @@ -49,7 +51,7 @@ public class DbInitialaizer { Id = ObjectId.Parse("6533bb29c8c22b038c71cf46"), GuestId = Guid.NewGuid(), - Roles = {guestRole}, + Roles = new List {guestRole}, CreatedById = ObjectId.Parse("6533bb29c8c22b038c71cf46"), CreatedDateUtc = DateTime.UtcNow, LastModifiedById = ObjectId.Parse("6533bb29c8c22b038c71cf46"), @@ -61,14 +63,14 @@ public class DbInitialaizer { Id = ObjectId.Parse("6533bde5755745116be42ce7"), GuestId = Guid.NewGuid(), - Roles = + Roles = new List { guestRole, userRole }, Phone = "+380953326869", Email = "mykhailo.bilodid@nure.ua", - PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + PasswordHash = this.passwordHasher.Hash("Yuiop12345"), CreatedById = ObjectId.Parse("6533bde5755745116be42ce7"), CreatedDateUtc = DateTime.UtcNow, LastModifiedById = ObjectId.Parse("6533bde5755745116be42ce7"), @@ -80,7 +82,7 @@ public class DbInitialaizer { Id = ObjectId.Parse("6533bded80fbc6e96250575b"), GuestId = Guid.NewGuid(), - Roles = + Roles = new List { guestRole, userRole, @@ -88,7 +90,7 @@ public class DbInitialaizer }, Phone = "+380953826869", Email = "shopping.assistant.team@gmail.com", - PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + PasswordHash = this.passwordHasher.Hash("Yuiop12345"), CreatedById = ObjectId.Parse("6533bded80fbc6e96250575b"), CreatedDateUtc = DateTime.UtcNow, LastModifiedById = ObjectId.Parse("6533bded80fbc6e96250575b"), @@ -99,14 +101,14 @@ public class DbInitialaizer { Id = ObjectId.Parse("6533bdf9efaca5bb0894f992"), GuestId = Guid.NewGuid(), - Roles = + Roles = new List { guestRole, userRole }, Phone = "+380983326869", Email = "vitalii.krasnorutski@nure.ua", - PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + PasswordHash = this.passwordHasher.Hash("Yuiop12345"), CreatedById = ObjectId.Parse("6533bdf9efaca5bb0894f992"), CreatedDateUtc = DateTime.UtcNow, LastModifiedById = ObjectId.Parse("6533bdf9efaca5bb0894f992"), @@ -117,14 +119,14 @@ public class DbInitialaizer { Id = ObjectId.Parse("6533be06d1b78a76c664ddae"), GuestId = Guid.NewGuid(), - Roles = + Roles = new List { guestRole, userRole }, Phone = "+380953326888", Email = "serhii.shchoholiev@nure.ua", - PasswordHash = this._passwordHasher.Hash("Yuiop12345"), + PasswordHash = this.passwordHasher.Hash("Yuiop12345"), CreatedById = ObjectId.Parse("6533be06d1b78a76c664ddae"), CreatedDateUtc = DateTime.UtcNow, LastModifiedById = ObjectId.Parse("6533be06d1b78a76c664ddae"), diff --git a/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj b/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj index 951f76f..743a04f 100644 --- a/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj +++ b/ShoppingAssistantApi.Persistance/ShoppingAssistantApi.Persistance.csproj @@ -14,6 +14,7 @@ + From 5ddd5c9ada6d22636ca120a9e4b31b7bf43c3ed2 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sun, 22 Oct 2023 21:40:03 +0300 Subject: [PATCH 48/85] SA-29 open ai service fixed and developed --- .../Controllers/WeatherForecastController.cs | 66 ++++++++- ShoppingAssistantApi.Api/Program.cs | 1 + .../Models/OpenAi/OpenAiMessage.cs | 2 +- .../Enums/OpenAiRole.cs | 18 +++ .../ServicesExtention.cs | 19 ++- .../Services/OpenAiService.cs | 52 +++---- .../OpenAiServiceTests.cs | 130 ++++++++++-------- 7 files changed, 194 insertions(+), 94 deletions(-) diff --git a/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs b/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs index 86d61b0..39417a2 100644 --- a/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs +++ b/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs @@ -1,4 +1,7 @@ using Microsoft.AspNetCore.Mvc; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.OpenAi; +using ShoppingAssistantApi.Domain.Enums; namespace ShoppingAssistantApi.Api.Controllers; [ApiController] @@ -12,8 +15,11 @@ public class WeatherForecastController : ControllerBase private readonly ILogger _logger; - public WeatherForecastController(ILogger logger) + private readonly IOpenAiService _openAiService; + + public WeatherForecastController(ILogger logger, IOpenAiService openAiService) { + _openAiService = openAiService; _logger = logger; } @@ -28,4 +34,60 @@ public class WeatherForecastController : ControllerBase }) .ToArray(); } -} + + [HttpPost("open-ai-test-simple")] + public async Task OpenAiTest(string text) + { + return await _openAiService.GetChatCompletion(new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = OpenAiRole.System.RequestConvert(), + Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed.\nYou must return data with one of the prefixes:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names" + }, + + new OpenAiMessage + { + Role = OpenAiRole.Assistant.RequestConvert(), + Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop" + }, + + new OpenAiMessage + { + Role = OpenAiRole.User.RequestConvert(), + Content = text + } + } + }, CancellationToken.None); + } + + [HttpPost("open-ai-test-streamed")] + public IAsyncEnumerable OpenAiTestStrean(string text) + { + return _openAiService.GetChatCompletionStream(new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = OpenAiRole.System.RequestConvert(), + Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed.\nYou must return data with one of the prefixes:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names" + }, + + new OpenAiMessage + { + Role = OpenAiRole.Assistant.RequestConvert(), + Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop" + }, + + new OpenAiMessage + { + Role = OpenAiRole.User.RequestConvert(), + Content = text + } + } + }, CancellationToken.None); + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs index affb266..2d9a9d6 100644 --- a/ShoppingAssistantApi.Api/Program.cs +++ b/ShoppingAssistantApi.Api/Program.cs @@ -12,6 +12,7 @@ builder.Services.AddJWTTokenAuthentication(builder.Configuration); builder.Services.AddMapper(); builder.Services.AddInfrastructure(); builder.Services.AddServices(); +builder.Services.AddOpenAiHttpClient(builder.Configuration); builder.Services.AddGraphQl(); builder.Services.AddControllers(); diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs index 91bd757..edb4cba 100644 --- a/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs +++ b/ShoppingAssistantApi.Application/Models/OpenAi/OpenAiMessage.cs @@ -4,7 +4,7 @@ namespace ShoppingAssistantApi.Application.Models.OpenAi; public class OpenAiMessage { - public OpenAiRole Role { get; set; } + public string Role { get; set; } public string Content { get; set; } } diff --git a/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs b/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs index 54d2c0a..a01e6a5 100644 --- a/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs +++ b/ShoppingAssistantApi.Domain/Enums/OpenAiRole.cs @@ -6,3 +6,21 @@ public enum OpenAiRole User, Assistant } + +public static class OpenAiRoleExtensions +{ + public static string RequestConvert(this OpenAiRole role) + { + switch (role) + { + case OpenAiRole.System: + return "system"; + case OpenAiRole.Assistant: + return "assistant"; + case OpenAiRole.User: + return "user"; + default: + return ""; + } + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs index 0db9d03..028935a 100644 --- a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -1,8 +1,10 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.IServices.Identity; using ShoppingAssistantApi.Infrastructure.Services; using ShoppingAssistantApi.Infrastructure.Services.Identity; +using System.Net.Http.Headers; namespace ShoppingAssistantApi.Infrastructure.InfrastructureExtentions; public static class ServicesExtention @@ -15,6 +17,21 @@ public static class ServicesExtention services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); + + return services; + } + + public static IServiceCollection AddOpenAiHttpClient(this IServiceCollection services, IConfiguration configuration) + { + services.AddHttpClient( + "OpenAiHttpClient", + client => + { + client.BaseAddress = new Uri(configuration.GetValue("OpenAi:OpenAiApiUri")); + client.DefaultRequestHeaders.Authorization = + new AuthenticationHeaderValue("Bearer", configuration.GetValue("OpenAi:OpenAiApiKey")); + }); return services; } diff --git a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs index a141bbe..233388c 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/OpenAiService.cs @@ -1,8 +1,8 @@ -using System; +using System.IO; using System.Net.Http.Headers; using System.Text; -using MongoDB.Bson; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.OpenAi; @@ -23,21 +23,18 @@ public class OpenAiService : IOpenAiService private readonly HttpClient _httpClient; - public OpenAiService(HttpClient client) + public OpenAiService(IHttpClientFactory httpClientFactory) { - _httpClient = client; - _httpClient.DefaultRequestHeaders.Authorization = - new AuthenticationHeaderValue("Bearer", "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"); - _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + _httpClient = httpClientFactory.CreateClient("OpenAiHttpClient"); } public async Task GetChatCompletion(ChatCompletionRequest chat, CancellationToken cancellationToken) { chat.Stream = false; var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); - var body = new StringContent(jsonBody, Encoding.UTF8, /*change file appsettings.Develop.json*/"application/json"); + var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - using var httpResponse = await _httpClient.PostAsync(/*api url*/"https://api.openai.com/v1/completions", body, cancellationToken); + using var httpResponse = await _httpClient.PostAsync("", body, cancellationToken); var responseBody = await httpResponse.Content.ReadAsStringAsync(cancellationToken); @@ -52,28 +49,23 @@ public class OpenAiService : IOpenAiService var jsonBody = JsonConvert.SerializeObject(chat, _jsonSettings); var body = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - var request = new HttpRequestMessage(HttpMethod.Post, "https://api.openai.com/v1/completions") + + using var httpResponse = await _httpClient.PostAsync("", body, cancellationToken); + + using var responseStream = await httpResponse.Content.ReadAsStreamAsync(cancellationToken); + using var reader = new StreamReader(responseStream, Encoding.UTF8); + + while (!cancellationToken.IsCancellationRequested) { - Content = body - }; - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream")); - - using var httpResponse = await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); - - var allData = string.Empty; - - using var streamReader = new StreamReader(await httpResponse.Content.ReadAsStringAsync(cancellationToken)); - while(!streamReader.EndOfStream) - { - var line = await streamReader.ReadLineAsync(); - allData += line + "\n\n"; - if (string.IsNullOrEmpty(line)) continue; - - var json = line?.Substring(6, line.Length - 6); - if (json == "[DONE]") yield break; - - var OpenAiResponse = JsonConvert.DeserializeObject(json, _jsonSettings); - yield return OpenAiResponse; + var jsonChunk = await reader.ReadLineAsync(); + if (jsonChunk.StartsWith("data: ")) + { + jsonChunk = jsonChunk.Substring("data: ".Length); + if (jsonChunk == "[DONE]") break; + var data = JsonConvert.DeserializeObject(jsonChunk); + if (data.Choices[0].Delta.Content == "" || data.Choices[0].Delta.Content == null) continue; + yield return data.Choices[0].Delta.Content; + } } } } \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs index ac32b4a..6b3272a 100644 --- a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs +++ b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs @@ -14,73 +14,83 @@ public class OpenAiServiceTests private readonly Mock _mockHttpMessageHandler; - private readonly HttpClient _httpClient; + private readonly Mock _mockHttpClientFactory; public OpenAiServiceTests() { - // Mock any dependencies + _mockHttpClientFactory = new Mock(); _mockHttpMessageHandler = new Mock(); - _httpClient = new HttpClient(_mockHttpMessageHandler.Object); - _openAiService = new OpenAiService(_httpClient); + + var client = new HttpClient(_mockHttpMessageHandler.Object); + client.BaseAddress = new Uri("https://www.google.com.ua/"); + + _mockHttpClientFactory + .Setup(factory => factory.CreateClient(It.IsAny())) + .Returns(() => + { + return client; + }); + + _openAiService = new OpenAiService(_mockHttpClientFactory.Object); } - //[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!" - // } - // } - // }; + [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 + } + }"), + }); - // // Act - // var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None); + var chat = new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = OpenAiRole.User.RequestConvert(), + Content = "Return Hello World!" + } + } + }; - // // Assert - // Assert.NotNull(newMessage); - // Assert.Equal("Hello World!", newMessage.Content); - //} + // Act + var newMessage = await _openAiService.GetChatCompletion(chat, CancellationToken.None); + + // Assert + Assert.NotNull(newMessage); + Assert.Equal("Hello, World!", newMessage.Content); + } // TODO: Add more tests @@ -128,7 +138,7 @@ public class OpenAiServiceTests { new OpenAiMessage { - Role = OpenAiRole.User, + Role = OpenAiRole.User.RequestConvert(), Content = "Return Hello World!" } } From ef35d6dea28d20ddbaf0dded15fd0f3aa05ca18a Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sun, 22 Oct 2023 22:04:08 +0300 Subject: [PATCH 49/85] SA-29 all bugs fixed --- .../Controllers/WeatherForecastController.cs | 93 ------------------- ShoppingAssistantApi.Api/Program.cs | 2 +- .../ShoppingAssistantApi.Api.csproj | 4 + ShoppingAssistantApi.Api/WeatherForecast.cs | 12 --- .../ServicesExtention.cs | 6 +- 5 files changed, 8 insertions(+), 109 deletions(-) delete mode 100644 ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs delete mode 100644 ShoppingAssistantApi.Api/WeatherForecast.cs diff --git a/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs b/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs deleted file mode 100644 index 39417a2..0000000 --- a/ShoppingAssistantApi.Api/Controllers/WeatherForecastController.cs +++ /dev/null @@ -1,93 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Application.Models.OpenAi; -using ShoppingAssistantApi.Domain.Enums; - -namespace ShoppingAssistantApi.Api.Controllers; -[ApiController] -[Route("[controller]")] -public class WeatherForecastController : ControllerBase -{ - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - private readonly ILogger _logger; - - private readonly IOpenAiService _openAiService; - - public WeatherForecastController(ILogger logger, IOpenAiService openAiService) - { - _openAiService = openAiService; - _logger = logger; - } - - [HttpGet(Name = "GetWeatherForecast")] - public IEnumerable Get() - { - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }) - .ToArray(); - } - - [HttpPost("open-ai-test-simple")] - public async Task OpenAiTest(string text) - { - return await _openAiService.GetChatCompletion(new ChatCompletionRequest - { - Messages = new List - { - new OpenAiMessage - { - Role = OpenAiRole.System.RequestConvert(), - Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed.\nYou must return data with one of the prefixes:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names" - }, - - new OpenAiMessage - { - Role = OpenAiRole.Assistant.RequestConvert(), - Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop" - }, - - new OpenAiMessage - { - Role = OpenAiRole.User.RequestConvert(), - Content = text - } - } - }, CancellationToken.None); - } - - [HttpPost("open-ai-test-streamed")] - public IAsyncEnumerable OpenAiTestStrean(string text) - { - return _openAiService.GetChatCompletionStream(new ChatCompletionRequest - { - Messages = new List - { - new OpenAiMessage - { - Role = OpenAiRole.System.RequestConvert(), - Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed.\nYou must return data with one of the prefixes:\n[Question] - return question. Each question must have suggestions.\n[Options] - return semicolon separated suggestion how to answer to a question\n[Message] - return text\n[Products] - return semicolon separated product names" - }, - - new OpenAiMessage - { - Role = OpenAiRole.Assistant.RequestConvert(), - Content = "[Question] What are you looking for?\n[Options] Bicycle, Laptop" - }, - - new OpenAiMessage - { - Role = OpenAiRole.User.RequestConvert(), - Content = text - } - } - }, CancellationToken.None); - } -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs index 2d9a9d6..79395dd 100644 --- a/ShoppingAssistantApi.Api/Program.cs +++ b/ShoppingAssistantApi.Api/Program.cs @@ -12,7 +12,7 @@ builder.Services.AddJWTTokenAuthentication(builder.Configuration); builder.Services.AddMapper(); builder.Services.AddInfrastructure(); builder.Services.AddServices(); -builder.Services.AddOpenAiHttpClient(builder.Configuration); +builder.Services.AddHttpClient(builder.Configuration); builder.Services.AddGraphQl(); builder.Services.AddControllers(); diff --git a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj index 33cec29..50dd57a 100644 --- a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj +++ b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/ShoppingAssistantApi.Api/WeatherForecast.cs b/ShoppingAssistantApi.Api/WeatherForecast.cs deleted file mode 100644 index 360f533..0000000 --- a/ShoppingAssistantApi.Api/WeatherForecast.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ShoppingAssistantApi.Api; - -public class WeatherForecast -{ - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } -} diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs index 028935a..cbc7b65 100644 --- a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -22,15 +22,15 @@ public static class ServicesExtention return services; } - public static IServiceCollection AddOpenAiHttpClient(this IServiceCollection services, IConfiguration configuration) + public static IServiceCollection AddHttpClient(this IServiceCollection services, IConfiguration configuration) { services.AddHttpClient( "OpenAiHttpClient", client => { - client.BaseAddress = new Uri(configuration.GetValue("OpenAi:OpenAiApiUri")); + client.BaseAddress = new Uri(configuration.GetValue("ApiUri")); client.DefaultRequestHeaders.Authorization = - new AuthenticationHeaderValue("Bearer", configuration.GetValue("OpenAi:OpenAiApiKey")); + new AuthenticationHeaderValue("Bearer", configuration.GetValue("ApiKey")); }); return services; From 47c67df292a5b2c01ae33449614c0e077ff599f2 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sun, 22 Oct 2023 22:23:36 +0300 Subject: [PATCH 50/85] SA-29 stream open ai response test commented --- ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs index 6b3272a..d9dffd9 100644 --- a/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs +++ b/ShoppingAssistantApi.UnitTests/OpenAiServiceTests.cs @@ -93,7 +93,7 @@ public class OpenAiServiceTests } // TODO: Add more tests - +/* [Fact] public async Task GetChatCompletionStream_ValidChat_ReturnsNewMessage() { @@ -151,4 +151,5 @@ public class OpenAiServiceTests Assert.NotNull(newMessage); Assert.Equal("Hello World!", newMessage.ToString()); } +*/ } \ No newline at end of file From ba116a353349968026e62d631514830fc7fe5863 Mon Sep 17 00:00:00 2001 From: stasex Date: Mon, 23 Oct 2023 15:11:22 +0300 Subject: [PATCH 51/85] added the initial implementation of the method SearchProductAsync and a rough test for it --- .../Services/ProductService.cs | 128 +++++++++++++++++- .../ProductTests.cs | 106 ++++++++++++++- .../ShoppingAssistantApi.UnitTests.csproj | 1 + 3 files changed, 224 insertions(+), 11 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 7bc99ed..6da34ab 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -10,6 +10,7 @@ using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; +using ServerSentEvent = ShoppingAssistantApi.Application.Models.ProductSearch.ServerSentEvent; namespace ShoppingAssistantApi.Infrastructure.Services; @@ -18,6 +19,7 @@ public class ProductService : IProductService private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; + public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService) { @@ -25,13 +27,127 @@ public class ProductService : IProductService _wishlistsService = wishlistsService; } - public IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) + public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - // Documentation: https://shchoholiev.atlassian.net/l/cp/JizkynhU + var chatRequest = new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = "User", + Content = PromptForProductSearch(message.Text) + } + }, + Stream = true + }; + + var currentDataType = SearchEventType.Wishlist; + var dataTypeHolder = string.Empty; - throw new NotImplementedException(); + await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) + { + if (data.Contains("[")) + { + dataTypeHolder = string.Empty; + dataTypeHolder += data; + } + + else if (data.Contains("]")) + { + dataTypeHolder += data; + currentDataType = DetermineDataType(dataTypeHolder); + } + + else if (dataTypeHolder=="[" && !data.Contains("[")) + { + dataTypeHolder += data; + } + + else + { + switch (currentDataType) + { + case SearchEventType.Message: + yield return new ServerSentEvent + { + Event = SearchEventType.Message, + Data = data + }; + break; + + case SearchEventType.Suggestion: + yield return new ServerSentEvent + { + Event = SearchEventType.Suggestion, + Data = data + }; + break; + + case SearchEventType.Product: + yield return new ServerSentEvent + { + Event = SearchEventType.Product, + Data = data + }; + break; + + case SearchEventType.Wishlist: + yield return new ServerSentEvent + { + Event = SearchEventType.Wishlist, + Data = data + }; + break; + + } + dataTypeHolder = string.Empty; + } + } } + private SearchEventType DetermineDataType(string dataTypeHolder) + { + if (dataTypeHolder.StartsWith("[Question]")) + { + return SearchEventType.Message; + } + else if (dataTypeHolder.StartsWith("[Options]")) + { + return SearchEventType.Suggestion; + } + else if (dataTypeHolder.StartsWith("[Message]")) + { + return SearchEventType.Message; + } + else if (dataTypeHolder.StartsWith("[Products]")) + { + return SearchEventType.Product; + } + else + { + return SearchEventType.Wishlist; + } + } + + + + + + + + + + + + + + + + + + + // TODO: remove all methods below public async IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken) { @@ -39,7 +155,7 @@ public class ProductService : IProductService { new OpenAiMessage() { - Role = OpenAiRole.User, + Role = "User", Content = PromptForProductSearch(message.Text) } }; @@ -73,7 +189,7 @@ public class ProductService : IProductService { new OpenAiMessage() { - Role = OpenAiRole.User, + Role = "User", Content = PromptForProductSearchWithQuestion(message.Text) } }; @@ -114,7 +230,7 @@ public class ProductService : IProductService { new OpenAiMessage() { - Role = OpenAiRole.User, + Role = "User", Content = PromptForRecommendationsForProductSearch(message.Text) } }; diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 78b1376..caf6e09 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; using Moq; using Newtonsoft.Json.Linq; @@ -28,13 +29,108 @@ public class ProductTests _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); } + + + /*[Fact] + public async Task SearchProductAsync_WhenWishlistIdIsEmpty_CreatesWishlistAndReturnsEvent() + { + // Arrange + string wishlistId = string.Empty; // Simulating an empty wishlist ID + var message = new MessageCreateDto + { + Text = "Your message text here" + }; + var cancellationToken = CancellationToken.None; + + // Define your expected new wishlist and event data + var newWishlistId = "123"; // Example wishlist ID + var expectedEvent = new ServerSentEvent + { + Event = SearchEventType.Wishlist, + Data = newWishlistId + }; + + // Mock the StartPersonalWishlistAsync method to return the expected wishlist + _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), CancellationToken.None)) + .ReturnsAsync(new WishlistDto + { + Id = "123", + Name = "MacBook", + Type = WishlistTypes.Product.ToString(), // Use enum + CreatedById = "someId" + }); + + // Mock the GetChatCompletionStream method to provide SSE data + var sseData = new List { "[Question] What is your question?" }; + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(sseData.ToAsyncEnumerable()); + + // Act + var result = await _productService.SearchProductAsync(wishlistId, message, cancellationToken).ToListAsync(); + + // Assert + // Check if the first item in the result is the expected wishlist creation event + var firstEvent = result.FirstOrDefault(); + Assert.NotNull(firstEvent); + Assert.Equal(expectedEvent.Event, firstEvent.Event); + Assert.Equal(expectedEvent.Data, firstEvent.Data); + + // You can add more assertions to verify the other SSE events as needed. + }*/ + + + [Fact] + public async Task SearchProductAsync_WhenWishlistExists_ReturnsExpectedEvents() + { + // Arrange + string wishlistId = "existingWishlistId"; // Simulating an existing wishlist ID + var message = new MessageCreateDto + { + Text = "Your message text here" + }; + var cancellationToken = CancellationToken.None; + + // Define your expected SSE data for the test + var expectedSseData = new List + { + "[", + "Question", + "]", + " What", + " features", + " are", + " you", + " looking", + "?\n", + "[", + "Options", + "]", + " USB", + "-C" + }; + + // Mock the GetChatCompletionStream method to provide the expected SSE data + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(expectedSseData.ToAsyncEnumerable()); + + // Act + var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); + + // Convert the result stream to a list of ServerSentEvent + var actualSseEvents = await resultStream.ToListAsync(); + + // Assert + // Check if the actual SSE events match the expected SSE events + Assert.Equal(8, actualSseEvents.Count); + } + [Fact] public async Task StartNewSearchAndReturnWishlist_CreatesWishlistObject() { // Arrange var expectedOpenAiMessage = new OpenAiMessage { - Role = OpenAiRole.User, + Role = "User", Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; @@ -93,7 +189,7 @@ public class ProductTests var expectedOpenAiMessage = new OpenAiMessage { - Role = OpenAiRole.User, + Role = "User", Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" }; @@ -132,7 +228,7 @@ public class ProductTests var expectedOpenAiMessage = new OpenAiMessage { - Role = OpenAiRole.User, + Role = "User", Content = "{ \"AdditionalQuestion\": [{ \"QuestionText\": \"What specific MacBook model are you using?\" }," + " { \"QuestionText\": \"Do you have any preferences for brand or capacity?\" }] }" }; @@ -170,7 +266,7 @@ public class ProductTests var expectedOpenAiMessage = new OpenAiMessage { - Role = OpenAiRole.User, + Role = "User", Content = "{ \"Recommendation\": [\"Recommendation 1\", \"Recommendation 2\"] }" }; diff --git a/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj index e5361a9..05ef7fc 100644 --- a/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj +++ b/ShoppingAssistantApi.UnitTests/ShoppingAssistantApi.UnitTests.csproj @@ -10,6 +10,7 @@ + From b1e878386e8bdc8246581d0a3751bfe5d00c7db0 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Mon, 23 Oct 2023 22:42:32 +0300 Subject: [PATCH 52/85] fix: OpenAiHttpClient JWT configuration --- .../InfrastructureExtentions/ServicesExtention.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs index cbc7b65..32aa136 100644 --- a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -28,9 +28,9 @@ public static class ServicesExtention "OpenAiHttpClient", client => { - client.BaseAddress = new Uri(configuration.GetValue("ApiUri")); + client.BaseAddress = new Uri(configuration.GetValue("OpenAi:ApiUrl")); client.DefaultRequestHeaders.Authorization = - new AuthenticationHeaderValue("Bearer", configuration.GetValue("ApiKey")); + new AuthenticationHeaderValue("Bearer", configuration.GetValue("OpenAi:ApiKey")); }); return services; From b63d3e39c39855bf23c4dd5bf34827bb7528dab1 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Mon, 23 Oct 2023 22:44:42 +0300 Subject: [PATCH 53/85] feature: add generatePersonalWishlistName method, Api endpoint and tests --- .../Mutations/WishlistsMutation.cs | 4 ++ .../IRepositories/IWishlistRepository.cs | 5 +- .../IServices/IWishlistService.cs | 2 + .../Services/WishlistsService.cs | 42 ++++++++++++++- .../Repositories/WishlistsRepository.cs | 15 ++++++ .../Tests/WishlistsTests.cs | 52 +++++++++++++++++++ 6 files changed, 118 insertions(+), 2 deletions(-) diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs index f3ff806..d33cf81 100644 --- a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -11,6 +11,10 @@ public class WishlistsMutation [Service] IWishlistsService wishlistsService) => wishlistsService.StartPersonalWishlistAsync(dto, cancellationToken); + public Task GenerateNameForPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken, + [Service] IWishlistsService wishlistsService) + => wishlistsService.GenerateNameForPersonalWishlistAsync(wishlistId, cancellationToken); + public Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); diff --git a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs index b8c6abf..e9a9368 100644 --- a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs +++ b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs @@ -1,9 +1,12 @@ using System.Linq.Expressions; +using MongoDB.Bson; using ShoppingAssistantApi.Domain.Entities; namespace ShoppingAssistantApi.Application.IRepositories; public interface IWishlistsRepository : IBaseRepository { - public Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken); + Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken); + + Task UpdateWishlistNameAsync(ObjectId id, string name, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index d95a874..4b26cf1 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -8,6 +8,8 @@ public interface IWishlistsService { Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken); + Task GenerateNameForPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); + Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken); Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 5dd2ae7..1773a9f 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -6,6 +6,7 @@ using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Paging; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; @@ -22,12 +23,16 @@ public class WishlistsService : IWishlistsService private readonly IMapper _mapper; - public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, IProductsRepository productRepository, IMapper mapper) + private readonly IOpenAiService _openAiService; + + public WishlistsService(IWishlistsRepository wishlistRepository, IMessagesRepository messageRepository, + IProductsRepository productRepository, IMapper mapper, IOpenAiService openAiService) { _wishlistsRepository = wishlistRepository; _messagesRepository = messageRepository; _productsRepository = productRepository; _mapper = mapper; + _openAiService = openAiService; } public async Task StartPersonalWishlistAsync(WishlistCreateDto dto, CancellationToken cancellationToken) @@ -59,6 +64,41 @@ public class WishlistsService : IWishlistsService return _mapper.Map(createdWishlist); } + public async Task GenerateNameForPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken) + { + if (!ObjectId.TryParse(wishlistId, out var wishlistObjectId)) + { + throw new InvalidDataException("Provided id is invalid."); + } + + var wishlist = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); + + var firstUserMessage = (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString(), cancellationToken)).First(); + + var chatCompletionRequest = new ChatCompletionRequest + { + Messages = new List(2) + { + new OpenAiMessage + { + Role = OpenAiRole.System.RequestConvert(), + Content = "You will be provided with a general information about some product and your task is to generate general (not specific to any company or brand) chat name where recommendations on which specific product to buy will be given. Only name he product without adverbs and adjectives\nExamples:\n - Prompt: Hub For Macbook. Answer: Macbook Hub\n - Prompt: What is the best power bank for MacBook with capacity 20000 mAh and power near 20V? Answer: Macbook Powerbank" + }, + new OpenAiMessage + { + Role = OpenAiRole.User.RequestConvert(), + Content = firstUserMessage.Text + } + } + }; + + var openAiMessage = await _openAiService.GetChatCompletion(chatCompletionRequest, cancellationToken); + + wishlist = await _wishlistsRepository.UpdateWishlistNameAsync(wishlist.Id, openAiMessage.Content, cancellationToken); + + return _mapper.Map(wishlist); + } + public async Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken) { var newMessage = _mapper.Map(dto); diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs index 04aca96..c0cd957 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs @@ -1,4 +1,5 @@ using System.Linq.Expressions; +using MongoDB.Bson; using MongoDB.Driver; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Entities; @@ -14,4 +15,18 @@ public class WishlistsRepository : BaseRepository, IWishlistsRepositor { return await (await _collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); } + + public async Task UpdateWishlistNameAsync(ObjectId wishlistId, string newName, CancellationToken cancellationToken) + { + var filterDefinition = Builders.Filter.Eq(w => w.Id, wishlistId); + + var updateDefinition = Builders.Update.Set(w => w.Name, newName); + + var options = new FindOneAndUpdateOptions + { + ReturnDocument = ReturnDocument.After + }; + + return await _collection.FindOneAndUpdateAsync(filterDefinition, updateDefinition, options, cancellationToken); + } } diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 5d989b7..6a3c3a0 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -61,6 +61,58 @@ public class WishlistsTests : TestsBase Assert.Equal($"{WishlistTypes.Product} Search", wishlist.Name); } + [Fact] + public async Task GenerateNameForPersonalWishlist_ValidWishlistId_ReturnsNewName() + { + await LoginAsync(TestingUserEmail, TestingUserPassword); + var startWishlistMutation = new + { + query = @" + mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) { + startPersonalWishlist (dto: $dto) { + id, name, type, createdById + } + }", + variables = new + { + dto = new + { + firstMessageText = "Mechanical keyboard for programming", + type = WishlistTypes.Product.ToString() + } + } + }; + + var jsonObject = await SendGraphQlRequestAsync(startWishlistMutation); + var startWishlistResponse = (WishlistDto?) jsonObject?.data?.startPersonalWishlist?.ToObject(); + + Assert.NotNull(startWishlistResponse); + + var generateWishlistNameMutation = new + { + query = @" + mutation genarateNameForPersonalWishlist($wishlistId: String!) { + generateNameForPersonalWishlist(wishlistId: $wishlistId) { + id, name, type, createdById + } + }", + variables = new + { + wishlistId = startWishlistResponse.Id + } + }; + + jsonObject = await SendGraphQlRequestAsync(generateWishlistNameMutation); + var generateWishlistNameResponse = (WishlistDto?) jsonObject?.data?.generateNameForPersonalWishlist?.ToObject(); + + Assert.NotNull(generateWishlistNameResponse); + Assert.Equal(startWishlistResponse.Id, generateWishlistNameResponse.Id); + + Assert.NotEqual($"{startWishlistResponse.Type} Search", generateWishlistNameResponse.Name); + Assert.NotEqual(String.Empty, generateWishlistNameResponse.Name); + Assert.NotEqual(null, generateWishlistNameResponse.Name); + } + [Fact] public async Task GetPersonalWishlistsPage_ValidPageNumberAndSize_ReturnsPage() { From dc4826dacc4d8a9430e0e34d279b761124950164 Mon Sep 17 00:00:00 2001 From: stasex Date: Tue, 24 Oct 2023 02:01:46 +0300 Subject: [PATCH 54/85] added changes to the search method and removed unnecessary code --- .../Mutations/ProductMutation.cs | 3 - .../Queries/ProductQuery.cs | 9 - .../IServices/IProductService.cs | 9 +- .../Services/ProductService.cs | 216 ++-------------- .../ProductTests.cs | 244 ++---------------- 5 files changed, 48 insertions(+), 433 deletions(-) diff --git a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs index 24ad5e3..f4598a5 100644 --- a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs @@ -9,7 +9,4 @@ namespace ShoppingAssistantApi.Api.Mutations; [ExtendObjectType(OperationTypeNames.Mutation)] public class ProductMutation { - public IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist( - Message message, CancellationToken cancellationToken, [Service] IProductService productService) - => productService.StartNewSearchAndReturnWishlist(message, cancellationToken); } \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs index cbaa775..b76586b 100644 --- a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs +++ b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs @@ -7,14 +7,5 @@ namespace ShoppingAssistantApi.Api.Queries; [ExtendObjectType(OperationTypeNames.Query)] public class ProductQuery { - [Authorize] - public IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken, - [Service] IProductService productService) - => productService.GetProductFromSearch(message, cancellationToken); - [Authorize] - public IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken, - [Service] IProductService productService) - => productService.GetRecommendationsForProductFromSearchStream(message, cancellationToken); - } \ No newline at end of file diff --git a/ShoppingAssistantApi.Application/IServices/IProductService.cs b/ShoppingAssistantApi.Application/IServices/IProductService.cs index 03a8545..3cf6d42 100644 --- a/ShoppingAssistantApi.Application/IServices/IProductService.cs +++ b/ShoppingAssistantApi.Application/IServices/IProductService.cs @@ -8,12 +8,5 @@ namespace ShoppingAssistantApi.Application.IServices; public interface IProductService { IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken); - - // TODO remove all methods below - IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken); - - IAsyncEnumerable GetProductFromSearch(Message message, CancellationToken cancellationToken); - - IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, - CancellationToken cancellationToken); + } \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 6da34ab..a429da6 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -1,9 +1,4 @@ -using System.Collections.ObjectModel; -using System.Linq.Expressions; -using System.Runtime.CompilerServices; -using Newtonsoft.Json.Linq; -using ShoppingAssistantApi.Application.IRepositories; -using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; @@ -19,7 +14,6 @@ public class ProductService : IProductService private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; - public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService) { @@ -36,19 +30,29 @@ public class ProductService : IProductService new OpenAiMessage { Role = "User", - Content = PromptForProductSearch(message.Text) + Content = "" } }, Stream = true }; - + + var suggestionBuffer = new Suggestion(); + var messageBuffer = new MessagePart(); var currentDataType = SearchEventType.Wishlist; var dataTypeHolder = string.Empty; + var dataBuffer = string.Empty; await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) { if (data.Contains("[")) { + if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) + { + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = messageBuffer.Text, + }, cancellationToken); + } dataTypeHolder = string.Empty; dataTypeHolder += data; } @@ -66,6 +70,8 @@ public class ProductService : IProductService else { + dataBuffer += data; + switch (currentDataType) { case SearchEventType.Message: @@ -74,16 +80,21 @@ public class ProductService : IProductService Event = SearchEventType.Message, Data = data }; + messageBuffer.Text += data; break; case SearchEventType.Suggestion: - yield return new ServerSentEvent + suggestionBuffer.Text += data; + if (data.Contains(";")) { - Event = SearchEventType.Suggestion, - Data = data - }; - break; - + yield return new ServerSentEvent + { + Event = SearchEventType.Suggestion, + Data = suggestionBuffer.Text + }; + suggestionBuffer.Text = string.Empty; + } + break; case SearchEventType.Product: yield return new ServerSentEvent { @@ -91,17 +102,8 @@ public class ProductService : IProductService Data = data }; break; - - case SearchEventType.Wishlist: - yield return new ServerSentEvent - { - Event = SearchEventType.Wishlist, - Data = data - }; - break; } - dataTypeHolder = string.Empty; } } } @@ -129,170 +131,4 @@ public class ProductService : IProductService return SearchEventType.Wishlist; } } - - - - - - - - - - - - - - - - - - - - // TODO: remove all methods below - public async IAsyncEnumerable<(List ProductNames, WishlistDto Wishlist)> StartNewSearchAndReturnWishlist(Message message, CancellationToken cancellationToken) - { - List messages = new List() - { - new OpenAiMessage() - { - Role = "User", - Content = PromptForProductSearch(message.Text) - } - }; - - var chatRequest = new ChatCompletionRequest - { - Messages = messages - }; - - await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) - { - var openAiContent = JObject.Parse(response); - var productNames = openAiContent["Name"]?.ToObject>() ?? new List(); - - WishlistCreateDto newWishlist = new WishlistCreateDto() - { - Type = "Product", - FirstMessageText = message.Text - }; - - var resultWishlistTask = _wishlistsService.StartPersonalWishlistAsync(newWishlist, cancellationToken); - var resultWishlist = await resultWishlistTask; - - yield return (productNames, resultWishlist); - } - } - - public async IAsyncEnumerable GetProductFromSearch(Message message, [EnumeratorCancellation] CancellationToken cancellationToken) - { - List messages = new List() - { - new OpenAiMessage() - { - Role = "User", - Content = PromptForProductSearchWithQuestion(message.Text) - } - }; - - var chatRequest = new ChatCompletionRequest - { - Messages = messages - }; - - await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) - { - var openAiContent = JObject.Parse(response); - var productNames = openAiContent["Name"]?.ToObject>(); - - if (productNames != null && productNames.Any()) - { - foreach (var productName in productNames) - { - yield return productName.Name; - } - } - else - { - var questions = openAiContent["AdditionalQuestion"]?.ToObject>() ?? new List(); - - foreach (var question in questions) - { - yield return question.QuestionText; - } - } - } - } - - - public async IAsyncEnumerable GetRecommendationsForProductFromSearchStream(Message message, CancellationToken cancellationToken) - { - List messages = new List() - { - new OpenAiMessage() - { - Role = "User", - Content = PromptForRecommendationsForProductSearch(message.Text) - } - }; - - var chatRequest = new ChatCompletionRequest - { - Messages = messages - }; - - await foreach (var response in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) - { - var openAiContent = JObject.Parse(response); - var recommendations = openAiContent["Recommendation"]?.ToObject>() ?? new List(); - - foreach (var recommendation in recommendations) - { - yield return recommendation; - } - } - } - - public string PromptForProductSearch(string message) - { - string promptForSearch = "Return information in JSON. " + - "\nProvide information, only that indicated in the type of answer, namely only the name. " + - "\nAsk additional questions to the user if there is not enough information. " + - "\nIf there are several answer options, list them. " + - "\nYou don't need to display questions and products together! " + - "\nDo not output any text other than JSON!!! " + - $"\n\nQuestion: {message} " + - $"\nType of answer: Question:[] " + - $"\n\nif there are no questions, then just display the products " + - $"\nType of answer: Name:"; - return promptForSearch; - } - - public string PromptForRecommendationsForProductSearch(string message) - { - string promptForSearch = "Return information in JSON. " + - "\nProvide only information indicated in the type of answer, namely only the recommendation. " + - "\nIf there are several answer options, list them. " + - "\nDo not output any text other than JSON." + - $"\n\nGive recommendations for this question: {message} " + - "\nType of answer: " + - "\n\nRecommendation :"; - return promptForSearch; - } - - public string PromptForProductSearchWithQuestion(string message) - { - string promptForSearch = "Return information in JSON. " + - "\nAsk additional questions to the user if there is not enough information." + - "\nIf there are several answer options, list them. " + - "\nYou don't need to display questions and products together!" + - "\nDo not output any text other than JSON!!!" + - $"\n\nQuestion: {message}" + - "\n\nif you can ask questions to clarify the choice, then ask them" + - "\nType of answer:" + - "\nAdditionalQuestion:[]" + - "\n\nif there are no questions, then just display the products" + - "\nType of answer:" + - "\nName:"; - return promptForSearch; - } } \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index caf6e09..e4b6a01 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -29,56 +29,6 @@ public class ProductTests _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); } - - - /*[Fact] - public async Task SearchProductAsync_WhenWishlistIdIsEmpty_CreatesWishlistAndReturnsEvent() - { - // Arrange - string wishlistId = string.Empty; // Simulating an empty wishlist ID - var message = new MessageCreateDto - { - Text = "Your message text here" - }; - var cancellationToken = CancellationToken.None; - - // Define your expected new wishlist and event data - var newWishlistId = "123"; // Example wishlist ID - var expectedEvent = new ServerSentEvent - { - Event = SearchEventType.Wishlist, - Data = newWishlistId - }; - - // Mock the StartPersonalWishlistAsync method to return the expected wishlist - _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), CancellationToken.None)) - .ReturnsAsync(new WishlistDto - { - Id = "123", - Name = "MacBook", - Type = WishlistTypes.Product.ToString(), // Use enum - CreatedById = "someId" - }); - - // Mock the GetChatCompletionStream method to provide SSE data - var sseData = new List { "[Question] What is your question?" }; - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) - .Returns(sseData.ToAsyncEnumerable()); - - // Act - var result = await _productService.SearchProductAsync(wishlistId, message, cancellationToken).ToListAsync(); - - // Assert - // Check if the first item in the result is the expected wishlist creation event - var firstEvent = result.FirstOrDefault(); - Assert.NotNull(firstEvent); - Assert.Equal(expectedEvent.Event, firstEvent.Event); - Assert.Equal(expectedEvent.Data, firstEvent.Data); - - // You can add more assertions to verify the other SSE events as needed. - }*/ - - [Fact] public async Task SearchProductAsync_WhenWishlistExists_ReturnsExpectedEvents() { @@ -94,19 +44,34 @@ public class ProductTests var expectedSseData = new List { "[", - "Question", + "Message", "]", " What", - " features", - " are", - " you", - " looking", + " u", + " want", + " ?", + "[", + "Options", + "]", + " USB-C", + " ;", + " Keyboard", + " ultra", + " ;", "?\n", "[", "Options", "]", " USB", - "-C" + "-C", + " ;", + "[", + "Message", + "]", + " What", + " u", + " want", + " ?" }; // Mock the GetChatCompletionStream method to provide the expected SSE data @@ -123,171 +88,4 @@ public class ProductTests // Check if the actual SSE events match the expected SSE events Assert.Equal(8, actualSseEvents.Count); } - - [Fact] - public async Task StartNewSearchAndReturnWishlist_CreatesWishlistObject() - { - // Arrange - var expectedOpenAiMessage = new OpenAiMessage - { - Role = "User", - Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" - }; - - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), CancellationToken.None)) - .Returns((ChatCompletionRequest request, CancellationToken token) => - { - var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); - return asyncEnumerable; - }); - - _wishListServiceMock.Setup(x => x.StartPersonalWishlistAsync(It.IsAny(), CancellationToken.None)) - .ReturnsAsync(new WishlistDto - { - Id = "someID", - Name = "MacBook", - Type = "Product", // Use enum - CreatedById = "someId" - }); - - var message = new Message - { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Text = "what are the best graphics cards you know?", - CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Role = "user" - }; - - List productNames = null; - WishlistDto createdWishList = null; - - // Act - var result = _productService.StartNewSearchAndReturnWishlist(message, CancellationToken.None); - - await foreach (var (productList, wishlist) in result) - { - productNames = productList; - createdWishList = wishlist; - } - - // Assert - Assert.NotNull(createdWishList); - Assert.NotNull(productNames); - } - - [Fact] - public async Task GetProductFromSearch_ReturnsProductListWithName() - { - var message = new Message - { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Text = "what are the best graphics cards you know?", - CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Role = "user" - }; - var cancellationToken = CancellationToken.None; - - var expectedOpenAiMessage = new OpenAiMessage - { - Role = "User", - Content = "{ \"Name\": [{ \"Name\": \"NVIDIA GeForce RTX 3080\" }, { \"Name\": \"AMD Radeon RX 6900 XT\" }] }" - }; - - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) - .Returns(new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable()); - - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); - - var productList = new List(); - - await foreach (var product in productService.GetProductFromSearch(message, cancellationToken)) - { - productList.Add(product); - } - - var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - var productNames = openAiContent["Name"].ToObject>(); - var expectedProductList = productNames.Select(info => info.Name).ToList(); - - Assert.Equal(expectedProductList, productList); - Assert.NotNull(openAiContent); - Assert.True(openAiContent.ContainsKey("Name")); - } - - [Fact] - public async Task GetProductFromSearch_ReturnsProductListWithQuestion() - { - var message = new Message - { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Text = "what are the best graphics cards you know?", - CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Role = "user" - }; - var cancellationToken = CancellationToken.None; - - var expectedOpenAiMessage = new OpenAiMessage - { - Role = "User", - Content = "{ \"AdditionalQuestion\": [{ \"QuestionText\": \"What specific MacBook model are you using?\" }," + - " { \"QuestionText\": \"Do you have any preferences for brand or capacity?\" }] }" - }; - - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) - .Returns(new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable()); - - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); - - var productList = new List(); - - await foreach (var product in productService.GetProductFromSearch(message, cancellationToken)) - { - productList.Add(product); - } - - var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - var productNames = openAiContent["AdditionalQuestion"].ToObject>(); - - Assert.NotNull(openAiContent); - Assert.True(openAiContent.ContainsKey("AdditionalQuestion")); - } - - [Fact] - public async Task GetRecommendationsForProductFromSearch_ReturnsRecommendations() - { - var message = new Message - { - Id = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Text = "get recommendations for this product", - CreatedById = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"), - Role = "user" - }; - var cancellationToken = CancellationToken.None; - - var expectedOpenAiMessage = new OpenAiMessage - { - Role = "User", - Content = "{ \"Recommendation\": [\"Recommendation 1\", \"Recommendation 2\"] }" - }; - - _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) - .Returns((ChatCompletionRequest request, CancellationToken token) => - { - var asyncEnumerable = new List { expectedOpenAiMessage.Content }.ToAsyncEnumerable(); - return asyncEnumerable; - }); - - var recommendations = new List(); - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); - - await foreach (var recommendation in productService.GetRecommendationsForProductFromSearchStream(message, cancellationToken)) - { - recommendations.Add(recommendation); - } - - var openAiContent = JObject.Parse(expectedOpenAiMessage.Content); - Assert.NotNull(openAiContent); - Assert.True(openAiContent.ContainsKey("Recommendation")); - Assert.Equal(new List { "Recommendation 1", "Recommendation 2" }, recommendations); - } } \ No newline at end of file From 0d97d552e32100ebff567e2e461c1710c4a29530 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Tue, 24 Oct 2023 07:43:49 +0300 Subject: [PATCH 55/85] fix: update LastModifiedDateUtc nad LastModifiedById when changing wishlist name --- .../Repositories/WishlistsRepository.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs index c0cd957..63d533c 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs @@ -1,6 +1,7 @@ using System.Linq.Expressions; using MongoDB.Bson; using MongoDB.Driver; +using ShoppingAssistantApi.Application.GlobalInstances; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Persistance.Database; @@ -20,7 +21,10 @@ public class WishlistsRepository : BaseRepository, IWishlistsRepositor { var filterDefinition = Builders.Filter.Eq(w => w.Id, wishlistId); - var updateDefinition = Builders.Update.Set(w => w.Name, newName); + var updateDefinition = Builders.Update + .Set(w => w.Name, newName) + .Set(w => w.LastModifiedDateUtc, DateTime.UtcNow) + .Set(w => w.LastModifiedById, GlobalUser.Id); var options = new FindOneAndUpdateOptions { From 422b6085ce8fb4ce5d4443564b65994302780f5e Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Tue, 24 Oct 2023 07:49:29 +0300 Subject: [PATCH 56/85] remove GlobalUser reference from WishlistRepository --- .../IRepositories/IWishlistRepository.cs | 2 +- .../Services/WishlistsService.cs | 3 ++- .../Repositories/WishlistsRepository.cs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs index e9a9368..cfc5e36 100644 --- a/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs +++ b/ShoppingAssistantApi.Application/IRepositories/IWishlistRepository.cs @@ -8,5 +8,5 @@ public interface IWishlistsRepository : IBaseRepository { Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken); - Task UpdateWishlistNameAsync(ObjectId id, string name, CancellationToken cancellationToken); + Task UpdateWishlistNameAsync(ObjectId id, string name, ObjectId updatedById, CancellationToken cancellationToken); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index 1773a9f..b6814bb 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -94,7 +94,8 @@ public class WishlistsService : IWishlistsService var openAiMessage = await _openAiService.GetChatCompletion(chatCompletionRequest, cancellationToken); - wishlist = await _wishlistsRepository.UpdateWishlistNameAsync(wishlist.Id, openAiMessage.Content, cancellationToken); + wishlist = await _wishlistsRepository.UpdateWishlistNameAsync(wishlist.Id, + openAiMessage.Content, (ObjectId) GlobalUser.Id, cancellationToken); return _mapper.Map(wishlist); } diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs index 63d533c..d015cf8 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using MongoDB.Bson; using MongoDB.Driver; -using ShoppingAssistantApi.Application.GlobalInstances; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Persistance.Database; @@ -17,14 +16,15 @@ public class WishlistsRepository : BaseRepository, IWishlistsRepositor return await (await _collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); } - public async Task UpdateWishlistNameAsync(ObjectId wishlistId, string newName, CancellationToken cancellationToken) + public async Task UpdateWishlistNameAsync(ObjectId wishlistId, string newName, + ObjectId updatedById, CancellationToken cancellationToken) { var filterDefinition = Builders.Filter.Eq(w => w.Id, wishlistId); var updateDefinition = Builders.Update .Set(w => w.Name, newName) .Set(w => w.LastModifiedDateUtc, DateTime.UtcNow) - .Set(w => w.LastModifiedById, GlobalUser.Id); + .Set(w => w.LastModifiedById, updatedById); var options = new FindOneAndUpdateOptions { From 3372a0910b4c56a744c74714cb62f755ec2e7757 Mon Sep 17 00:00:00 2001 From: stasex Date: Tue, 24 Oct 2023 20:03:54 +0300 Subject: [PATCH 57/85] added new chips to the product search service and implemented unit tests --- .../Controllers/BaseController.cs | 10 ++ .../Controllers/ProductsSearchController.cs | 37 +++++ .../ShoppingAssistantApi.Api.csproj | 3 - .../ServicesExtention.cs | 1 + .../Services/ProductService.cs | 128 +++++++++++++++--- .../Tests/ProductsTests.cs | 33 +++++ .../ProductTests.cs | 91 ++++++++++++- 7 files changed, 273 insertions(+), 30 deletions(-) create mode 100644 ShoppingAssistantApi.Api/Controllers/BaseController.cs create mode 100644 ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs create mode 100644 ShoppingAssistantApi.Tests/Tests/ProductsTests.cs diff --git a/ShoppingAssistantApi.Api/Controllers/BaseController.cs b/ShoppingAssistantApi.Api/Controllers/BaseController.cs new file mode 100644 index 0000000..87efa2c --- /dev/null +++ b/ShoppingAssistantApi.Api/Controllers/BaseController.cs @@ -0,0 +1,10 @@ +using Microsoft.AspNetCore.Mvc; + +namespace ShoppingAssistantApi.Api.Controllers; + +[ApiController] +[Route("api/[controller]")] +public class BaseController : ControllerBase +{ + +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs new file mode 100644 index 0000000..6873127 --- /dev/null +++ b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs @@ -0,0 +1,37 @@ +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.IServices; +using ShoppingAssistantApi.Application.Models.CreateDtos; + +namespace ShoppingAssistantApi.Api.Controllers; + +public class ProductsSearchController : BaseController +{ + private readonly IProductService _productService; + + public ProductsSearchController(IProductService productService) + { + _productService = productService; + } + + [HttpPost("search/{wishlistId}")] + public async Task StreamDataToClient(string wishlistId, [FromBody]MessageCreateDto message, CancellationToken cancellationToken) + { + Response.Headers.Add("Content-Type", "text/event-stream"); + Response.Headers.Add("Cache-Control", "no-cache"); + Response.Headers.Add("Connection", "keep-alive"); + + var result = _productService.SearchProductAsync(wishlistId, message, cancellationToken); + + await foreach (var sse in result) + { + var chunk = JsonConvert.SerializeObject(sse.Data); + + var serverSentEvent = $"event: {sse.Event}\ndata: {chunk}\n\n"; + + await Response.WriteAsync(serverSentEvent); + await Response.Body.FlushAsync(); + } + } + +} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj index 50dd57a..761a282 100644 --- a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj +++ b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj @@ -21,8 +21,5 @@ - - - diff --git a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs index cbc7b65..a5ee8a3 100644 --- a/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs +++ b/ShoppingAssistantApi.Infrastructure/InfrastructureExtentions/ServicesExtention.cs @@ -18,6 +18,7 @@ public static class ServicesExtention services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); return services; } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index a429da6..1d87086 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -14,6 +14,7 @@ public class ProductService : IProductService private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; + public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService) { @@ -23,24 +24,91 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - var chatRequest = new ChatCompletionRequest - { - Messages = new List - { - new OpenAiMessage - { - Role = "User", - Content = "" - } - }, - Stream = true - }; + bool checker = false; + var isFirstMessage = _wishlistsService + .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result; - var suggestionBuffer = new Suggestion(); + var chatRequest = new ChatCompletionRequest(); + + if (isFirstMessage==null) + { + chatRequest = new ChatCompletionRequest + { + Messages = new List + { + new OpenAiMessage + { + Role = OpenAiRole.System.ToString(), + Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + + "\nYou must return data with one of the prefixes:" + + "\n[Question] - return question" + + "\n[Suggestions] - return semicolon separated suggestion how to answer to a question" + + "\n[Message] - return text" + + "\n[Products] - return semicolon separated product names" + }, + + new OpenAiMessage() + { + Role = OpenAiRole.Assistant.ToString(), + Content = "What are you looking for?" + } + }, + Stream = true + }; + + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = "What are you looking for?", + }, cancellationToken); + + yield return new ServerSentEvent + { + Event = SearchEventType.Message, + Data = "What are you looking for?" + }; + + yield return new ServerSentEvent + { + Event = SearchEventType.Suggestion, + Data = "Bicycle" + }; + + yield return new ServerSentEvent + { + Event = SearchEventType.Suggestion, + Data = "Laptop" + }; + + checker = true; + } + + if(isFirstMessage!=null && checker==false) + { + var previousMessages = _wishlistsService + .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result.Items.ToList(); + + var messagesForOpenAI = new List(); + foreach (var item in previousMessages ) + { + messagesForOpenAI.Add( + new OpenAiMessage() + { + Role = item.Role, + Content = item.Text + }); + } + + chatRequest = new ChatCompletionRequest + { + Messages = messagesForOpenAI, + Stream = true + }; + + var suggestionBuffer = new Suggestion(); var messageBuffer = new MessagePart(); + var productBuffer = new ProductName(); var currentDataType = SearchEventType.Wishlist; var dataTypeHolder = string.Empty; - var dataBuffer = string.Empty; await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) { @@ -53,6 +121,18 @@ public class ProductService : IProductService Text = messageBuffer.Text, }, cancellationToken); } + if (dataTypeHolder=="[Products]" && productBuffer.Name!=null) + { + _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() + { + Url = "", + Name = productBuffer.Name, + Rating = 0, + Description = "", + ImagesUrls = new []{"", ""}, + WasOpened = false + }, cancellationToken); + } dataTypeHolder = string.Empty; dataTypeHolder += data; } @@ -70,8 +150,6 @@ public class ProductService : IProductService else { - dataBuffer += data; - switch (currentDataType) { case SearchEventType.Message: @@ -96,16 +174,22 @@ public class ProductService : IProductService } break; case SearchEventType.Product: - yield return new ServerSentEvent + productBuffer.Name += data; + if (data.Contains(";")) { - Event = SearchEventType.Product, - Data = data - }; - break; - + yield return new ServerSentEvent + { + Event = SearchEventType.Product, + Data = productBuffer.Name + }; + productBuffer.Name = string.Empty; + } + break; } } } + + } } private SearchEventType DetermineDataType(string dataTypeHolder) diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs new file mode 100644 index 0000000..d120697 --- /dev/null +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -0,0 +1,33 @@ +using System.Net; +using System.Net.Http.Json; +using System.Text; +using MongoDB.Bson; +using Newtonsoft.Json; +using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Tests.TestExtentions; + +namespace ShoppingAssistantApi.Tests.Tests; + +public class ProductsTests : TestsBase +{ + public ProductsTests(TestingFactory factory) + : base(factory) + { + } + + [Fact] + public async Task StreamDataToClient_ReturnsExpectedResponse() + { + // Arrange + var wishlistId = "your_wishlist_id"; + var message = new MessageCreateDto { Text = "Your message text" }; + + // Act + var response = await _httpClient.PostAsJsonAsync($"http://localhost:5183/api/products/search/{"ab79cde6f69abcd3efab65cd"}", message); + + // Assert + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + // Додайте додаткові перевірки на відповідь, якщо необхідно + } +} \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index e4b6a01..1ba4861 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -8,6 +8,7 @@ using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; using ShoppingAssistantApi.Application.Models.ProductSearch; +using ShoppingAssistantApi.Application.Paging; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Infrastructure.Services; @@ -66,11 +67,17 @@ public class ProductTests "-C", " ;", "[", - "Message", + "Products", "]", - " What", - " u", - " want", + " GTX", + " 3090", + " ;", + " GTX", + " 3070TI", + " ;", + " GTX", + " 4070TI", + " ;", " ?" }; @@ -78,6 +85,17 @@ public class ProductTests _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) .Returns(expectedSseData.ToAsyncEnumerable()); + _wishListServiceMock.Setup(w => w.GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken)) + .ReturnsAsync(new PagedList(new List + { + new MessageDto + { + Text = "Some existing message", + Id = "", + CreatedById = "", + Role = "" + } + }, 1, 1, 1)); // Act var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); @@ -86,6 +104,69 @@ public class ProductTests // Assert // Check if the actual SSE events match the expected SSE events - Assert.Equal(8, actualSseEvents.Count); + Assert.NotNull(actualSseEvents); + } + + + [Fact] + public async void SearchProductAsync_WithExistingMessageInWishlist_ReturnsExpectedEvents() + { + // Arrange + var wishlistId = "your_wishlist_id"; + var message = new MessageCreateDto { Text = "Your message text" }; + var cancellationToken = new CancellationToken(); + + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + + var expectedSseData = new List + { + "[", + "Message", + "]", + " What", + " u", + " want", + " ?", + "[", + "Options", + "]", + " USB-C", + " ;", + " Keyboard", + " ultra", + " ;", + "?\n", + "[", + "Options", + "]", + " USB", + "-C", + " ;", + "[", + "Products", + "]", + " GTX", + " 3090", + " ;", + " GTX", + " 3070TI", + " ;", + " GTX", + " 4070TI", + " ;", + " ?" + }; + + // Mock the GetChatCompletionStream method to provide the expected SSE data + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(expectedSseData.ToAsyncEnumerable()); + + // Act + var resultStream = productService.SearchProductAsync(wishlistId, message, cancellationToken); + + var actualSseEvents = await resultStream.ToListAsync(); + // Assert + + Assert.NotNull(actualSseEvents); } } \ No newline at end of file From f5d9c3e80e4eb606a950259ca8e5c446928ee496 Mon Sep 17 00:00:00 2001 From: stasex Date: Tue, 24 Oct 2023 23:24:23 +0300 Subject: [PATCH 58/85] added some fix for tests --- .../Services/ProductService.cs | 147 +++++++++--------- .../Tests/ProductsTests.cs | 6 +- .../ProductTests.cs | 1 + 3 files changed, 76 insertions(+), 78 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 1d87086..ce0fad0 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -1,4 +1,5 @@ -using ShoppingAssistantApi.Application.IServices; +using System.Diagnostics; +using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; @@ -24,7 +25,6 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - bool checker = false; var isFirstMessage = _wishlistsService .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result; @@ -78,11 +78,9 @@ public class ProductService : IProductService Event = SearchEventType.Suggestion, Data = "Laptop" }; - - checker = true; } - if(isFirstMessage!=null && checker==false) + if(isFirstMessage!=null) { var previousMessages = _wishlistsService .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result.Items.ToList(); @@ -105,91 +103,91 @@ public class ProductService : IProductService }; var suggestionBuffer = new Suggestion(); - var messageBuffer = new MessagePart(); - var productBuffer = new ProductName(); - var currentDataType = SearchEventType.Wishlist; - var dataTypeHolder = string.Empty; + var messageBuffer = new MessagePart(); + var productBuffer = new ProductName(); + var currentDataType = SearchEventType.Wishlist; + var dataTypeHolder = string.Empty; - await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) - { - if (data.Contains("[")) + await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) { - if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) + if (data.Contains("[")) { - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) { - Text = messageBuffer.Text, - }, cancellationToken); - } - if (dataTypeHolder=="[Products]" && productBuffer.Name!=null) - { - _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = messageBuffer.Text, + }, cancellationToken); + } + if (dataTypeHolder=="[Products]" && productBuffer.Name!=null) { - Url = "", - Name = productBuffer.Name, - Rating = 0, - Description = "", - ImagesUrls = new []{"", ""}, - WasOpened = false - }, cancellationToken); + _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() + { + Url = "", + Name = productBuffer.Name, + Rating = 0, + Description = "", + ImagesUrls = new []{"", ""}, + WasOpened = false + }, cancellationToken); + } + dataTypeHolder = string.Empty; + dataTypeHolder += data; } - dataTypeHolder = string.Empty; - dataTypeHolder += data; - } - else if (data.Contains("]")) - { - dataTypeHolder += data; - currentDataType = DetermineDataType(dataTypeHolder); - } - - else if (dataTypeHolder=="[" && !data.Contains("[")) - { - dataTypeHolder += data; - } - - else - { - switch (currentDataType) + else if (data.Contains("]")) { - case SearchEventType.Message: - yield return new ServerSentEvent - { - Event = SearchEventType.Message, - Data = data - }; - messageBuffer.Text += data; - break; + dataTypeHolder += data; + currentDataType = DetermineDataType(dataTypeHolder); + } - case SearchEventType.Suggestion: - suggestionBuffer.Text += data; - if (data.Contains(";")) - { + else if (dataTypeHolder=="[" && !data.Contains("[")) + { + dataTypeHolder += data; + } + + else + { + switch (currentDataType) + { + case SearchEventType.Message: yield return new ServerSentEvent { - Event = SearchEventType.Suggestion, - Data = suggestionBuffer.Text + Event = SearchEventType.Message, + Data = data }; - suggestionBuffer.Text = string.Empty; - } - break; - case SearchEventType.Product: - productBuffer.Name += data; - if (data.Contains(";")) - { - yield return new ServerSentEvent + messageBuffer.Text += data; + break; + + case SearchEventType.Suggestion: + suggestionBuffer.Text += data; + if (data.Contains(";")) { - Event = SearchEventType.Product, - Data = productBuffer.Name - }; - productBuffer.Name = string.Empty; - } - break; + yield return new ServerSentEvent + { + Event = SearchEventType.Suggestion, + Data = suggestionBuffer.Text + }; + suggestionBuffer.Text = string.Empty; + } + break; + + case SearchEventType.Product: + productBuffer.Name += data; + if (data.Contains(";")) + { + yield return new ServerSentEvent + { + Event = SearchEventType.Product, + Data = productBuffer.Name + }; + productBuffer.Name = string.Empty; + } + break; + } } } } - - } } private SearchEventType DetermineDataType(string dataTypeHolder) @@ -215,4 +213,5 @@ public class ProductService : IProductService return SearchEventType.Wishlist; } } + } \ No newline at end of file diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs index d120697..21ea9fe 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -19,15 +19,13 @@ public class ProductsTests : TestsBase public async Task StreamDataToClient_ReturnsExpectedResponse() { // Arrange - var wishlistId = "your_wishlist_id"; + var wishlistId = "ab79cde6f69abcd3efab65cd"; var message = new MessageCreateDto { Text = "Your message text" }; // Act - var response = await _httpClient.PostAsJsonAsync($"http://localhost:5183/api/products/search/{"ab79cde6f69abcd3efab65cd"}", message); + var response = await _httpClient.PostAsJsonAsync($"http://127.0.0.1:5183//api/products/search/{wishlistId}", message); // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); - - // Додайте додаткові перевірки на відповідь, якщо необхідно } } \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 1ba4861..2c2ac96 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -168,5 +168,6 @@ public class ProductTests // Assert Assert.NotNull(actualSseEvents); + Assert.Equal(3, actualSseEvents.Count); } } \ No newline at end of file From 77b14bf4c7db2190958086f3dcdffe21e6c6b06a Mon Sep 17 00:00:00 2001 From: stasex Date: Wed, 25 Oct 2023 14:16:11 +0300 Subject: [PATCH 59/85] changed the logic for product search and set up the integration test --- .../Controllers/ProductsSearchController.cs | 4 +- .../Services/ProductService.cs | 23 +++++----- .../TestExtentions/DbInitializer.cs | 45 ++++++++++++++++++- .../Tests/ProductsTests.cs | 7 +-- .../ProductTests.cs | 12 +++-- 5 files changed, 71 insertions(+), 20 deletions(-) diff --git a/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs index 6873127..7dd9949 100644 --- a/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs +++ b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Mvc; +using HotChocolate.Authorization; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; namespace ShoppingAssistantApi.Api.Controllers; +[Authorize] public class ProductsSearchController : BaseController { private readonly IProductService _productService; diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index ce0fad0..b4d4739 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -1,4 +1,6 @@ using System.Diagnostics; +using MongoDB.Bson; +using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; @@ -15,22 +17,23 @@ public class ProductService : IProductService private readonly IWishlistsService _wishlistsService; private readonly IOpenAiService _openAiService; - - public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService) + private readonly IMessagesRepository _messagesRepository; + + public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService, IMessagesRepository messagesRepository) { _openAiService = openAiService; _wishlistsService = wishlistsService; + _messagesRepository = messagesRepository; } public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - var isFirstMessage = _wishlistsService - .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result; + var isFirstMessage = await _messagesRepository.GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); var chatRequest = new ChatCompletionRequest(); - if (isFirstMessage==null) + if (isFirstMessage==0) { chatRequest = new ChatCompletionRequest { @@ -38,7 +41,7 @@ public class ProductService : IProductService { new OpenAiMessage { - Role = OpenAiRole.System.ToString(), + Role = OpenAiRole.System.ToString().ToLower(), Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + "\nYou must return data with one of the prefixes:" + "\n[Question] - return question" + @@ -49,7 +52,7 @@ public class ProductService : IProductService new OpenAiMessage() { - Role = OpenAiRole.Assistant.ToString(), + Role = OpenAiRole.System.ToString().ToLower(), Content = "What are you looking for?" } }, @@ -80,10 +83,10 @@ public class ProductService : IProductService }; } - if(isFirstMessage!=null) + if(isFirstMessage!=0) { var previousMessages = _wishlistsService - .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken).Result.Items.ToList(); + .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 50, cancellationToken).Result.Items.ToList(); var messagesForOpenAI = new List(); foreach (var item in previousMessages ) @@ -91,7 +94,7 @@ public class ProductService : IProductService messagesForOpenAI.Add( new OpenAiMessage() { - Role = item.Role, + Role = item.Role.ToLower(), Content = item.Text }); } diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index 811cce6..a89df14 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -107,6 +107,8 @@ public class DbInitializer var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + var wishlistId3 = ObjectId.Parse("ab7c8c2d9edf39abcd1ef9ab"); + var wishlistId4 = ObjectId.Parse("ab8c8c2d9edf39abcd1ef9ab"); var wishlists = new Wishlist[] { @@ -125,7 +127,23 @@ public class DbInitializer Type = WishlistTypes.Product.ToString(), CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow - } + }, + new Wishlist + { + Id = wishlistId3, + Name = "Test For Search", + Type = WishlistTypes.Product.ToString(), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Wishlist + { + Id = wishlistId4, + Name = "Test For Answer", + Type = WishlistTypes.Product.ToString(), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, }; await wishlistsCollection.InsertManyAsync(wishlists); @@ -142,6 +160,8 @@ public class DbInitializer var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + var wishlistId3 = ObjectId.Parse("ab7c8c2d9edf39abcd1ef9ab"); + var wishlistId4 = ObjectId.Parse("ab8c8c2d9edf39abcd1ef9ab"); var messages = new Message[] { @@ -197,7 +217,28 @@ public class DbInitializer WishlistId = wishlistId2, CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow - } + }, + new Message + { + Text = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + + "\nYou must return data with one of the prefixes:" + + "\n[Question] - return question" + + "\n[Suggestions] - return semicolon separated suggestion how to answer to a question" + + "\n[Message] - return text" + + "\n[Products] - return semicolon separated product names", + Role = "system", + WishlistId = wishlistId4, + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Message + { + Text = "What are you looking for?", + Role = "system", + WishlistId = wishlistId4, + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow + }, }; await messagesCollection.InsertManyAsync(messages); diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs index 21ea9fe..686d057 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -18,12 +18,13 @@ public class ProductsTests : TestsBase [Fact] public async Task StreamDataToClient_ReturnsExpectedResponse() { + await LoginAsync("wishlists@gmail.com", "Yuiop12345"); // Arrange - var wishlistId = "ab79cde6f69abcd3efab65cd"; - var message = new MessageCreateDto { Text = "Your message text" }; + var wishlistId = "ab8c8c2d9edf39abcd1ef9ab"; + var message = new MessageCreateDto { Text = "I want new powerful laptop" }; // Act - var response = await _httpClient.PostAsJsonAsync($"http://127.0.0.1:5183//api/products/search/{wishlistId}", message); + var response = await _httpClient.PostAsJsonAsync($"http://127.0.0.1:5183/api/ProductsSearch/search/{wishlistId}", message); // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 2c2ac96..6bf5b67 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; using Moq; using Newtonsoft.Json.Linq; +using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; @@ -21,13 +22,16 @@ public class ProductTests private IProductService _productService; - public Mock _wishListServiceMock; + private Mock _wishListServiceMock; - public ProductTests() + private IMessagesRepository _messagesRepository; + + public ProductTests(IMessagesRepository messagesRepository) { + _messagesRepository = messagesRepository; _openAiServiceMock = new Mock(); _wishListServiceMock = new Mock(); - _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object, _messagesRepository); } [Fact] @@ -116,7 +120,7 @@ public class ProductTests var message = new MessageCreateDto { Text = "Your message text" }; var cancellationToken = new CancellationToken(); - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object); + var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object, _messagesRepository); var expectedSseData = new List { From 73b9b5213f8e08c59e208ea73c3c4171338db89e Mon Sep 17 00:00:00 2001 From: stasex Date: Wed, 25 Oct 2023 14:45:44 +0300 Subject: [PATCH 60/85] added a small change to the service --- .../Services/ProductService.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index b4d4739..5d0ff84 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -99,6 +99,12 @@ public class ProductService : IProductService }); } + messagesForOpenAI.Add(new OpenAiMessage() + { + Role = MessageRoles.User.ToString().ToLower(), + Content = message.Text + }); + chatRequest = new ChatCompletionRequest { Messages = messagesForOpenAI, From 40f294f61bf5d45f8d06a8dcbbace36a64b0cddf Mon Sep 17 00:00:00 2001 From: stasex Date: Wed, 25 Oct 2023 17:28:55 +0300 Subject: [PATCH 61/85] added new tests --- .../Models/OpenAi/ChatCompletionRequest.cs | 2 +- .../Services/ProductService.cs | 60 ++-- .../Tests/ProductsTests.cs | 4 +- .../ProductTests.cs | 280 +++++++++++------- 4 files changed, 213 insertions(+), 133 deletions(-) diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs index d2ad66b..40f3972 100644 --- a/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs +++ b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs @@ -2,7 +2,7 @@ namespace ShoppingAssistantApi.Application.Models.OpenAi; public class ChatCompletionRequest { - public string Model { get; set; } = "gpt-3.5-turbo"; + public string Model { get; set; } = "gpt-4"; public List Messages { get; set; } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 5d0ff84..d86bae6 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -29,6 +29,14 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { + string promptForGpt = + "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + + "\nYou must return data with one of the prefixes:" + + "\n[Question] - return question" + + "\n[Suggestions] - return semicolon separated suggestion how to answer to a question" + + "\n[Message] - return text" + + "\n[Products] - return semicolon separated product names"; + var isFirstMessage = await _messagesRepository.GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); var chatRequest = new ChatCompletionRequest(); @@ -42,12 +50,7 @@ public class ProductService : IProductService new OpenAiMessage { Role = OpenAiRole.System.ToString().ToLower(), - Content = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + - "\nYou must return data with one of the prefixes:" + - "\n[Question] - return question" + - "\n[Suggestions] - return semicolon separated suggestion how to answer to a question" + - "\n[Message] - return text" + - "\n[Products] - return semicolon separated product names" + Content = promptForGpt }, new OpenAiMessage() @@ -70,17 +73,6 @@ public class ProductService : IProductService Data = "What are you looking for?" }; - yield return new ServerSentEvent - { - Event = SearchEventType.Suggestion, - Data = "Bicycle" - }; - - yield return new ServerSentEvent - { - Event = SearchEventType.Suggestion, - Data = "Laptop" - }; } if(isFirstMessage!=0) @@ -89,6 +81,11 @@ public class ProductService : IProductService .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 50, cancellationToken).Result.Items.ToList(); var messagesForOpenAI = new List(); + messagesForOpenAI.Add(new OpenAiMessage() + { + Role = OpenAiRole.System.ToString().ToLower(), + Content = promptForGpt + }); foreach (var item in previousMessages ) { messagesForOpenAI.Add( @@ -128,18 +125,6 @@ public class ProductService : IProductService Text = messageBuffer.Text, }, cancellationToken); } - if (dataTypeHolder=="[Products]" && productBuffer.Name!=null) - { - _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() - { - Url = "", - Name = productBuffer.Name, - Rating = 0, - Description = "", - ImagesUrls = new []{"", ""}, - WasOpened = false - }, cancellationToken); - } dataTypeHolder = string.Empty; dataTypeHolder += data; } @@ -169,7 +154,6 @@ public class ProductService : IProductService break; case SearchEventType.Suggestion: - suggestionBuffer.Text += data; if (data.Contains(";")) { yield return new ServerSentEvent @@ -178,11 +162,12 @@ public class ProductService : IProductService Data = suggestionBuffer.Text }; suggestionBuffer.Text = string.Empty; + break; } + suggestionBuffer.Text += data; break; case SearchEventType.Product: - productBuffer.Name += data; if (data.Contains(";")) { yield return new ServerSentEvent @@ -191,7 +176,20 @@ public class ProductService : IProductService Data = productBuffer.Name }; productBuffer.Name = string.Empty; + + await _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() + { + Url = "", + Name = productBuffer.Name, + Rating = 0, + Description = "", + ImagesUrls = new []{"", ""}, + WasOpened = false + }, cancellationToken); + + break; } + productBuffer.Name += data; break; } } diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs index 686d057..bb3119b 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -25,8 +25,10 @@ public class ProductsTests : TestsBase // Act var response = await _httpClient.PostAsJsonAsync($"http://127.0.0.1:5183/api/ProductsSearch/search/{wishlistId}", message); - + var responseContent = await response.Content.ReadAsStringAsync(); + // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotNull(responseContent); } } \ No newline at end of file diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 6bf5b67..f480031 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -1,18 +1,14 @@ -using FluentAssertions; -using Microsoft.Extensions.DependencyInjection; -using MongoDB.Bson; -using Moq; -using Newtonsoft.Json.Linq; +using Moq; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Models.OpenAi; -using ShoppingAssistantApi.Application.Models.ProductSearch; using ShoppingAssistantApi.Application.Paging; using ShoppingAssistantApi.Domain.Entities; using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Infrastructure.Services; +using System.Linq.Expressions; namespace ShoppingAssistantApi.Tests.Tests; @@ -24,21 +20,21 @@ public class ProductTests private Mock _wishListServiceMock; - private IMessagesRepository _messagesRepository; + private Mock _messagesRepositoryMock; - public ProductTests(IMessagesRepository messagesRepository) + public ProductTests() { - _messagesRepository = messagesRepository; + _messagesRepositoryMock = new Mock(); _openAiServiceMock = new Mock(); _wishListServiceMock = new Mock(); - _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object, _messagesRepository); + _productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object, _messagesRepositoryMock.Object); } [Fact] - public async Task SearchProductAsync_WhenWishlistExists_ReturnsExpectedEvents() + public async Task SearchProductAsync_WhenWishlistsWithoutMessages_ReturnsExpectedEvents() { // Arrange - string wishlistId = "existingWishlistId"; // Simulating an existing wishlist ID + string wishlistId = "existingWishlistId"; var message = new MessageCreateDto { Text = "Your message text here" @@ -48,67 +44,44 @@ public class ProductTests // Define your expected SSE data for the test var expectedSseData = new List { - "[", - "Message", - "]", - " What", - " u", - " want", - " ?", - "[", - "Options", - "]", - " USB-C", - " ;", - " Keyboard", - " ultra", - " ;", - "?\n", - "[", - "Options", - "]", - " USB", - "-C", - " ;", - "[", - "Products", - "]", - " GTX", - " 3090", - " ;", - " GTX", - " 3070TI", - " ;", - " GTX", - " 4070TI", - " ;", - " ?" + "[", "Message", "]", " What", " u", " want", " ?", "[", "Options", "]", " USB-C", " ;", " Keyboard", " ultra", + " ;", "[", "Options", "]", " USB", "-C", " ;", "[", "Products", "]", " GTX", " 3090", " ;", " GTX", + " 3070TI", " ;", " GTX", " 4070TI", " ;", " ?" }; + + var expectedMessages = new List { "What are you looking for?" }; // Mock the GetChatCompletionStream method to provide the expected SSE data _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) .Returns(expectedSseData.ToAsyncEnumerable()); - - _wishListServiceMock.Setup(w => w.GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 1, cancellationToken)) - .ReturnsAsync(new PagedList(new List - { - new MessageDto - { - Text = "Some existing message", - Id = "", - CreatedById = "", - Role = "" - } - }, 1, 1, 1)); + + _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) + .ReturnsAsync(0); + + _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) + .Verifiable(); + // Act var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); // Convert the result stream to a list of ServerSentEvent var actualSseEvents = await resultStream.ToListAsync(); + var receivedMessages = actualSseEvents + .Where(e => e.Event == SearchEventType.Message) + .Select(e => e.Data) + .ToList(); + + var receivedSuggestions = actualSseEvents + .Where(e => e.Event == SearchEventType.Suggestion) + .Select(e => e.Data) + .ToList(); + // Assert // Check if the actual SSE events match the expected SSE events Assert.NotNull(actualSseEvents); + Assert.Equal(expectedMessages, receivedMessages); + _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); } @@ -120,58 +93,165 @@ public class ProductTests var message = new MessageCreateDto { Text = "Your message text" }; var cancellationToken = new CancellationToken(); - var productService = new ProductService(_openAiServiceMock.Object, _wishListServiceMock.Object, _messagesRepository); - + var productService = _productService; + var expectedSseData = new List { - "[", - "Message", - "]", - " What", - " u", - " want", - " ?", - "[", - "Options", - "]", - " USB-C", - " ;", - " Keyboard", - " ultra", - " ;", - "?\n", - "[", - "Options", - "]", - " USB", - "-C", - " ;", - "[", - "Products", - "]", - " GTX", - " 3090", - " ;", - " GTX", - " 3070TI", - " ;", - " GTX", - " 4070TI", - " ;", - " ?" + "[", "Message", "]", " What", " u", " want", " ?", "[", "Options", "]", "USB-C", " ;", "Keyboard", " ultra", + " ;", "[", "Options", "]", "USB", "-C", " ;" }; + + var expectedMessages = new List { " What", " u", " want", " ?" }; + var expectedSuggestions = new List { "USB-C", "Keyboard ultra", "USB-C" }; // Mock the GetChatCompletionStream method to provide the expected SSE data _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) .Returns(expectedSseData.ToAsyncEnumerable()); - - // Act - var resultStream = productService.SearchProductAsync(wishlistId, message, cancellationToken); + _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) + .ReturnsAsync(3); + + _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) + .Verifiable(); + + _wishListServiceMock + .Setup(w => w.GetMessagesPageFromPersonalWishlistAsync( + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(new PagedList(new List + { + new MessageDto + { + Text = "Message 1", + Id = "1", + CreatedById = "User2", + Role = "User" + }, + new MessageDto + { + Text = "Message 2", + Id = "2", + CreatedById = "User2", + Role = "User" + }, + new MessageDto + { + Text = "Message 3", + Id = "3", + CreatedById = "User2", + Role = "User" + }, + }, 1, 3, 3)); + + // Act + var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); + + // Convert the result stream to a list of ServerSentEvent var actualSseEvents = await resultStream.ToListAsync(); + + var receivedMessages = actualSseEvents + .Where(e => e.Event == SearchEventType.Message) + .Select(e => e.Data) + .ToList(); + + var receivedSuggestions = actualSseEvents + .Where(e => e.Event == SearchEventType.Suggestion) + .Select(e => e.Data) + .ToList(); // Assert Assert.NotNull(actualSseEvents); - Assert.Equal(3, actualSseEvents.Count); + Assert.Equal(expectedMessages, receivedMessages); + Assert.Equal(expectedSuggestions, receivedSuggestions); + _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); + } + + + [Fact] + public async void SearchProductAsync_WithExistingMessageInWishlistAndAddProduct_ReturnsExpectedEvents() + { + // Arrange + var wishlistId = "your_wishlist_id"; + var message = new MessageCreateDto { Text = "Your message text" }; + var cancellationToken = new CancellationToken(); + + var productService = _productService; + + var expectedSseData = new List + { + "[", "Message", "]", " What", " u", " want", " ?", "[", "Options", "]", "USB-C", " ;", "Keyboard", " ultra", + " ;", "[", "Options", "]", "USB", "-C", " ;", "[", "Products", "]", " GTX", " 3090", " ;", " GTX", + " 3070TI", " ;", " GTX", " 4070TI", " ;", " ?" + }; + + var expectedMessages = new List { " What", " u", " want", " ?" }; + var expectedSuggestions = new List { "USB-C", "Keyboard ultra", "USB-C" }; + + // Mock the GetChatCompletionStream method to provide the expected SSE data + _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) + .Returns(expectedSseData.ToAsyncEnumerable()); + + _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) + .ReturnsAsync(3); + + _wishListServiceMock + .Setup(w => w.AddProductToPersonalWishlistAsync( + It.IsAny(), It.IsAny(), It.IsAny())) + .Verifiable(); + + _wishListServiceMock.Setup(w => w.AddProductToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) + .Verifiable(); + + _wishListServiceMock + .Setup(w => w.GetMessagesPageFromPersonalWishlistAsync( + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(new PagedList(new List + { + new MessageDto + { + Text = "Message 1", + Id = "1", + CreatedById = "User2", + Role = "User" + }, + new MessageDto + { + Text = "Message 2", + Id = "2", + CreatedById = "User2", + Role = "User" + }, + new MessageDto + { + Text = "Message 3", + Id = "3", + CreatedById = "User2", + Role = "User" + }, + }, 1, 3, 3)); + + // Act + var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); + + // Convert the result stream to a list of ServerSentEvent + var actualSseEvents = await resultStream.ToListAsync(); + + var receivedMessages = actualSseEvents + .Where(e => e.Event == SearchEventType.Message) + .Select(e => e.Data) + .ToList(); + + var receivedSuggestions = actualSseEvents + .Where(e => e.Event == SearchEventType.Suggestion) + .Select(e => e.Data) + .ToList(); + + // Assert + Assert.NotNull(actualSseEvents); + Assert.Equal(expectedMessages, receivedMessages); + Assert.Equal(expectedSuggestions, receivedSuggestions); + _wishListServiceMock.Verify(w => w.AddProductToPersonalWishlistAsync( + It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); + _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync( + wishlistId, It.IsAny(), cancellationToken), Times.Once); } } \ No newline at end of file From adf956b44c8fd571cd1a5a1581dc12dff8874218 Mon Sep 17 00:00:00 2001 From: stasex Date: Wed, 25 Oct 2023 21:36:30 +0300 Subject: [PATCH 62/85] added new test --- .../Services/ProductService.cs | 9 +++-- .../Tests/ProductsTests.cs | 36 +++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index d86bae6..e2daa83 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -29,6 +29,8 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { + string firstMessageForUser = "What are you looking for?"; + string promptForGpt = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + "\nYou must return data with one of the prefixes:" + @@ -56,7 +58,7 @@ public class ProductService : IProductService new OpenAiMessage() { Role = OpenAiRole.System.ToString().ToLower(), - Content = "What are you looking for?" + Content = firstMessageForUser } }, Stream = true @@ -64,13 +66,13 @@ public class ProductService : IProductService _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() { - Text = "What are you looking for?", + Text = firstMessageForUser, }, cancellationToken); yield return new ServerSentEvent { Event = SearchEventType.Message, - Data = "What are you looking for?" + Data = firstMessageForUser }; } @@ -177,6 +179,7 @@ public class ProductService : IProductService }; productBuffer.Name = string.Empty; + //a complete description of the entity when the Amazon API is connected await _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() { Url = "", diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs index bb3119b..a017f06 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -31,4 +31,40 @@ public class ProductsTests : TestsBase Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.NotNull(responseContent); } + + [Fact] + public async Task StreamDataToClientFirstly_ReturnsExpectedResponse() + { + await LoginAsync("wishlists@gmail.com", "Yuiop12345"); + // Arrange + var wishlistId = "ab7c8c2d9edf39abcd1ef9ab"; + var message = new MessageCreateDto { Text = "I want new powerful laptop" }; + + // Act + var response = await _httpClient.PostAsJsonAsync($"http://127.0.0.1:5183/api/ProductsSearch/search/{wishlistId}", message); + var responseContent = await response.Content.ReadAsStringAsync(); + var sseEvents = responseContent.Split("\n\n", StringSplitOptions.RemoveEmptyEntries); + bool foundMessageEvent = false; + + // Assert + foreach (var sseEvent in sseEvents) + { + var sseParts = sseEvent.Split('\n'); + if (sseParts.Length >= 2) + { + var eventName = sseParts[0]; + var eventData = sseParts[1].Substring("data: ".Length); + if (eventName == "event: Message") + { + foundMessageEvent = true; + Assert.Equal("\"What are you looking for?\"", eventData); + break; + } + } + } + + Assert.True(foundMessageEvent, "Message event not found"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotNull(responseContent); + } } \ No newline at end of file From 51aca2e2707261c3c5afaab875b960cddb7a7450 Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 26 Oct 2023 12:57:52 +0300 Subject: [PATCH 63/85] made a fix for the pr --- .../Mutations/ProductMutation.cs | 12 ---- .../Queries/ProductQuery.cs | 11 ---- .../Services/ProductService.cs | 65 +++++++------------ .../TestExtentions/DbInitializer.cs | 8 +++ .../ProductTests.cs | 27 +++++++- 5 files changed, 56 insertions(+), 67 deletions(-) delete mode 100644 ShoppingAssistantApi.Api/Mutations/ProductMutation.cs delete mode 100644 ShoppingAssistantApi.Api/Queries/ProductQuery.cs diff --git a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs b/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs deleted file mode 100644 index f4598a5..0000000 --- a/ShoppingAssistantApi.Api/Mutations/ProductMutation.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Application.Models.Dtos; -using ShoppingAssistantApi.Application.Models.ProductSearch; -using ShoppingAssistantApi.Domain.Entities; -using ShoppingAssistantApi.Infrastructure.Services; - -namespace ShoppingAssistantApi.Api.Mutations; - -[ExtendObjectType(OperationTypeNames.Mutation)] -public class ProductMutation -{ -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs b/ShoppingAssistantApi.Api/Queries/ProductQuery.cs deleted file mode 100644 index b76586b..0000000 --- a/ShoppingAssistantApi.Api/Queries/ProductQuery.cs +++ /dev/null @@ -1,11 +0,0 @@ -using HotChocolate.Authorization; -using ShoppingAssistantApi.Application.IServices; -using ShoppingAssistantApi.Domain.Entities; - -namespace ShoppingAssistantApi.Api.Queries; - -[ExtendObjectType(OperationTypeNames.Query)] -public class ProductQuery -{ - -} \ No newline at end of file diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index e2daa83..32fb2fc 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -29,8 +29,6 @@ public class ProductService : IProductService public async IAsyncEnumerable SearchProductAsync(string wishlistId, MessageCreateDto message, CancellationToken cancellationToken) { - string firstMessageForUser = "What are you looking for?"; - string promptForGpt = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + "\nYou must return data with one of the prefixes:" + @@ -39,56 +37,43 @@ public class ProductService : IProductService "\n[Message] - return text" + "\n[Products] - return semicolon separated product names"; - var isFirstMessage = await _messagesRepository.GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); + var countOfMessage = await _messagesRepository + .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); - var chatRequest = new ChatCompletionRequest(); - - if (isFirstMessage==0) + var previousMessages = await _wishlistsService + .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); + + var chatRequest = new ChatCompletionRequest { - chatRequest = new ChatCompletionRequest + Messages = new List { - Messages = new List + new OpenAiMessage { - new OpenAiMessage - { - Role = OpenAiRole.System.ToString().ToLower(), - Content = promptForGpt - }, - - new OpenAiMessage() - { - Role = OpenAiRole.System.ToString().ToLower(), - Content = firstMessageForUser - } - }, - Stream = true - }; - - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() - { - Text = firstMessageForUser, - }, cancellationToken); - + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.System), + Content = promptForGpt + } + } + }; + + if (countOfMessage==1) + { yield return new ServerSentEvent { Event = SearchEventType.Message, - Data = firstMessageForUser + Data = previousMessages.Items.FirstOrDefault()?.Text }; - } - if(isFirstMessage!=0) + if(countOfMessage>1) { - var previousMessages = _wishlistsService - .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, 50, cancellationToken).Result.Items.ToList(); - var messagesForOpenAI = new List(); messagesForOpenAI.Add(new OpenAiMessage() { - Role = OpenAiRole.System.ToString().ToLower(), + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.System), Content = promptForGpt }); - foreach (var item in previousMessages ) + + foreach (var item in previousMessages.Items) { messagesForOpenAI.Add( new OpenAiMessage() @@ -100,15 +85,11 @@ public class ProductService : IProductService messagesForOpenAI.Add(new OpenAiMessage() { - Role = MessageRoles.User.ToString().ToLower(), + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.User), Content = message.Text }); - chatRequest = new ChatCompletionRequest - { - Messages = messagesForOpenAI, - Stream = true - }; + chatRequest.Messages.AddRange(messagesForOpenAI); var suggestionBuffer = new Suggestion(); var messageBuffer = new MessagePart(); diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index a89df14..f66a9b1 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -239,6 +239,14 @@ public class DbInitializer CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow }, + new Message + { + Text = "What are you looking for?", + Role = "system", + WishlistId = wishlistId3, + CreatedById = user2.Id, + CreatedDateUtc = DateTime.UtcNow + }, }; await messagesCollection.InsertManyAsync(messages); diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index f480031..8a6fb99 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -56,11 +56,35 @@ public class ProductTests .Returns(expectedSseData.ToAsyncEnumerable()); _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) - .ReturnsAsync(0); + .ReturnsAsync(1); _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) .Verifiable(); + _wishListServiceMock + .Setup(m => m.GetMessagesPageFromPersonalWishlistAsync( + It.IsAny(), // Очікуваний параметр wishlistId + It.IsAny(), // Очікуваний параметр pageNumber + It.IsAny(), // Очікуваний параметр pageSize + It.IsAny()) // Очікуваний параметр cancellationToken + ) + .ReturnsAsync(new PagedList( + new List + { + new MessageDto + { + Text = "What are you looking for?", + Id = "3", + CreatedById = "User2", + Role = "User" + }, + + }, + 1, + 1, + 1 + )); + // Act var resultStream = _productService.SearchProductAsync(wishlistId, message, cancellationToken); @@ -81,7 +105,6 @@ public class ProductTests // Check if the actual SSE events match the expected SSE events Assert.NotNull(actualSseEvents); Assert.Equal(expectedMessages, receivedMessages); - _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); } From 98377dbf9dd0a391da3c8069d2131c64f066048f Mon Sep 17 00:00:00 2001 From: stasex Date: Fri, 27 Oct 2023 01:16:02 +0300 Subject: [PATCH 64/85] changed the logic in the service and added some changes to the tests --- .../Services/ProductService.cs | 191 ++++++++---------- .../TestExtentions/DbInitializer.cs | 19 +- .../Tests/ProductsTests.cs | 2 +- .../ProductTests.cs | 13 +- 4 files changed, 98 insertions(+), 127 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 32fb2fc..8c4d567 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -55,127 +55,110 @@ public class ProductService : IProductService } }; - if (countOfMessage==1) + + var messagesForOpenAI = new List(); + + foreach (var item in previousMessages.Items) { - yield return new ServerSentEvent - { - Event = SearchEventType.Message, - Data = previousMessages.Items.FirstOrDefault()?.Text - }; - } - - if(countOfMessage>1) - { - var messagesForOpenAI = new List(); - messagesForOpenAI.Add(new OpenAiMessage() - { - Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.System), - Content = promptForGpt - }); - - foreach (var item in previousMessages.Items) - { - messagesForOpenAI.Add( - new OpenAiMessage() + messagesForOpenAI + .Add(new OpenAiMessage() { Role = item.Role.ToLower(), - Content = item.Text + Content = item.Text }); + } + + messagesForOpenAI.Add(new OpenAiMessage() + { + Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.User), + Content = message.Text + }); + + chatRequest.Messages.AddRange(messagesForOpenAI); + + var suggestionBuffer = new Suggestion(); + var messageBuffer = new MessagePart(); + var productBuffer = new ProductName(); + var currentDataType = SearchEventType.Wishlist; + var dataTypeHolder = string.Empty; + + await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) + { + if (data.Contains("[")) + { + if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) + { + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = messageBuffer.Text, + }, cancellationToken); + } + dataTypeHolder = string.Empty; + dataTypeHolder += data; } - - messagesForOpenAI.Add(new OpenAiMessage() - { - Role = OpenAiRoleExtensions.RequestConvert(OpenAiRole.User), - Content = message.Text - }); - - chatRequest.Messages.AddRange(messagesForOpenAI); - - var suggestionBuffer = new Suggestion(); - var messageBuffer = new MessagePart(); - var productBuffer = new ProductName(); - var currentDataType = SearchEventType.Wishlist; - var dataTypeHolder = string.Empty; - await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) + else if (data.Contains("]")) { - if (data.Contains("[")) + dataTypeHolder += data; + currentDataType = DetermineDataType(dataTypeHolder); + } + + else if (dataTypeHolder=="[" && !data.Contains("[")) + { + dataTypeHolder += data; + } + + else + { + switch (currentDataType) { - if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) - { - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + case SearchEventType.Message: + yield return new ServerSentEvent { - Text = messageBuffer.Text, - }, cancellationToken); - } - dataTypeHolder = string.Empty; - dataTypeHolder += data; - } + Event = SearchEventType.Message, + Data = data + }; + messageBuffer.Text += data; + break; - else if (data.Contains("]")) - { - dataTypeHolder += data; - currentDataType = DetermineDataType(dataTypeHolder); - } - - else if (dataTypeHolder=="[" && !data.Contains("[")) - { - dataTypeHolder += data; - } - - else - { - switch (currentDataType) - { - case SearchEventType.Message: + case SearchEventType.Suggestion: + if (data.Contains(";")) + { yield return new ServerSentEvent { - Event = SearchEventType.Message, - Data = data + Event = SearchEventType.Suggestion, + Data = suggestionBuffer.Text }; - messageBuffer.Text += data; - break; - - case SearchEventType.Suggestion: - if (data.Contains(";")) - { - yield return new ServerSentEvent - { - Event = SearchEventType.Suggestion, - Data = suggestionBuffer.Text - }; - suggestionBuffer.Text = string.Empty; - break; - } - suggestionBuffer.Text += data; + suggestionBuffer.Text = string.Empty; break; + } + suggestionBuffer.Text += data; + break; - case SearchEventType.Product: - if (data.Contains(";")) + case SearchEventType.Product: + if (data.Contains(";")) + { + yield return new ServerSentEvent { - yield return new ServerSentEvent - { - Event = SearchEventType.Product, - Data = productBuffer.Name - }; - productBuffer.Name = string.Empty; + Event = SearchEventType.Product, + Data = productBuffer.Name + }; + productBuffer.Name = string.Empty; - //a complete description of the entity when the Amazon API is connected - await _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() - { - Url = "", - Name = productBuffer.Name, - Rating = 0, - Description = "", - ImagesUrls = new []{"", ""}, - WasOpened = false - }, cancellationToken); - - break; - } - productBuffer.Name += data; - break; - } + //a complete description of the entity when the Amazon API is connected + await _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() + { + Url = "", + Name = productBuffer.Name, + Rating = 0, + Description = "", + ImagesUrls = new []{"", ""}, + WasOpened = false + }, cancellationToken); + break; + } + productBuffer.Name += data; + break; } } } diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index f66a9b1..02929da 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -220,13 +220,8 @@ public class DbInitializer }, new Message { - Text = "You are a Shopping Assistant that helps people find product recommendations. Ask user additional questions if more context needed." + - "\nYou must return data with one of the prefixes:" + - "\n[Question] - return question" + - "\n[Suggestions] - return semicolon separated suggestion how to answer to a question" + - "\n[Message] - return text" + - "\n[Products] - return semicolon separated product names", - Role = "system", + Text = "What are you looking for?", + Role = "assistant", WishlistId = wishlistId4, CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow @@ -234,15 +229,7 @@ public class DbInitializer new Message { Text = "What are you looking for?", - Role = "system", - WishlistId = wishlistId4, - CreatedById = user2.Id, - CreatedDateUtc = DateTime.UtcNow - }, - new Message - { - Text = "What are you looking for?", - Role = "system", + Role = "assistant", WishlistId = wishlistId3, CreatedById = user2.Id, CreatedDateUtc = DateTime.UtcNow diff --git a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs index a017f06..f9756ec 100644 --- a/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/ProductsTests.cs @@ -57,7 +57,7 @@ public class ProductsTests : TestsBase if (eventName == "event: Message") { foundMessageEvent = true; - Assert.Equal("\"What are you looking for?\"", eventData); + Assert.NotNull(eventData); break; } } diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 8a6fb99..9887d90 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -49,7 +49,8 @@ public class ProductTests " 3070TI", " ;", " GTX", " 4070TI", " ;", " ?" }; - var expectedMessages = new List { "What are you looking for?" }; + var expectedMessages = new List { " What", " u", " want", " ?" }; + var expectedSuggestion = new List { " USB-C", " Keyboard ultra", " USB-C" }; // Mock the GetChatCompletionStream method to provide the expected SSE data _openAiServiceMock.Setup(x => x.GetChatCompletionStream(It.IsAny(), cancellationToken)) @@ -63,10 +64,10 @@ public class ProductTests _wishListServiceMock .Setup(m => m.GetMessagesPageFromPersonalWishlistAsync( - It.IsAny(), // Очікуваний параметр wishlistId - It.IsAny(), // Очікуваний параметр pageNumber - It.IsAny(), // Очікуваний параметр pageSize - It.IsAny()) // Очікуваний параметр cancellationToken + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny()) ) .ReturnsAsync(new PagedList( new List @@ -78,7 +79,6 @@ public class ProductTests CreatedById = "User2", Role = "User" }, - }, 1, 1, @@ -105,6 +105,7 @@ public class ProductTests // Check if the actual SSE events match the expected SSE events Assert.NotNull(actualSseEvents); Assert.Equal(expectedMessages, receivedMessages); + Assert.Equal(expectedSuggestion, receivedSuggestions); } From 821b3acc0006ee686e4807645853fdd3f5a51606 Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:15:53 -0400 Subject: [PATCH 65/85] Add or update the Azure App Service build and deployment workflow config --- .../develop_shopping-assistant-api-dev.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/develop_shopping-assistant-api-dev.yml diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml new file mode 100644 index 0000000..11c692d --- /dev/null +++ b/.github/workflows/develop_shopping-assistant-api-dev.yml @@ -0,0 +1,57 @@ +# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy ASP.Net Core app to Azure Web App - shopping-assistant-api-dev + +on: + push: + branches: + - develop + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '7.x' + include-prerelease: true + + - name: Build with dotnet + run: dotnet build --configuration Release + + - name: dotnet publish + run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v3 + with: + name: .net-app + path: ${{env.DOTNET_ROOT}}/myapp + + deploy: + runs-on: ubuntu-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v3 + with: + name: .net-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'shopping-assistant-api-dev' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_E1A733523AF642D8B37F28AA91718E8C }} + package: . From e83a254e9d6b8f1d2b3dde4511ad91b808480310 Mon Sep 17 00:00:00 2001 From: shchoholiev Date: Sun, 29 Oct 2023 01:54:43 +0000 Subject: [PATCH 66/85] SA-72 Added use of Azure App Config --- ShoppingAssistantApi.Api/Program.cs | 2 ++ .../ShoppingAssistantApi.Api.csproj | 1 + ShoppingAssistantApi.Api/appsettings.json | 14 +++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.Api/Program.cs b/ShoppingAssistantApi.Api/Program.cs index e7f574b..6d67dd6 100644 --- a/ShoppingAssistantApi.Api/Program.cs +++ b/ShoppingAssistantApi.Api/Program.cs @@ -6,6 +6,8 @@ using ShoppingAssistantApi.Api.ApiExtentions; var builder = WebApplication.CreateBuilder(args); // Add services to the container. +var appConfig = Environment.GetEnvironmentVariable("APP_CONFIG") ?? builder.Configuration.GetConnectionString("AppConfig"); +builder.Configuration.AddAzureAppConfiguration(appConfig); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddJWTTokenAuthentication(builder.Configuration); diff --git a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj index 761a282..e38ca43 100644 --- a/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj +++ b/ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj @@ -11,6 +11,7 @@ + diff --git a/ShoppingAssistantApi.Api/appsettings.json b/ShoppingAssistantApi.Api/appsettings.json index 10f68b8..a018db4 100644 --- a/ShoppingAssistantApi.Api/appsettings.json +++ b/ShoppingAssistantApi.Api/appsettings.json @@ -5,5 +5,17 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "ConnectionStrings": { + "MongoDatabaseName": "ShoppingAssistant" + }, + "JsonWebTokenKeys": { + "ValidateIssuer": true, + "ValidateAudience": true, + "ValidateLifetime": true, + "ValidateIssuerSigningKey": true + }, + "OpenAi": { + "ApiUrl": "https://api.openai.com/v1/chat/completions" + } } From 953f397cc8fd417c6f83fcfcc3d0415988b35703 Mon Sep 17 00:00:00 2001 From: shchoholiev Date: Sun, 29 Oct 2023 01:59:08 +0000 Subject: [PATCH 67/85] SA-72 Updated dev github workflow --- .github/workflows/develop_shopping-assistant-api-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml index 11c692d..e24cb0d 100644 --- a/.github/workflows/develop_shopping-assistant-api-dev.yml +++ b/.github/workflows/develop_shopping-assistant-api-dev.yml @@ -4,9 +4,6 @@ name: Build and deploy ASP.Net Core app to Azure Web App - shopping-assistant-api-dev on: - push: - branches: - - develop workflow_dispatch: jobs: @@ -25,6 +22,9 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release + - name: Test with dotnet + run: dotnet test --no-build --verbosity normal + - name: dotnet publish run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest needs: build environment: - name: 'Production' + name: 'Development' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} steps: From c919ec2c6edf0b917445ed2f2c714cf68230d773 Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:04:15 -0400 Subject: [PATCH 68/85] SA-72 Update develop_shopping-assistant-api-dev.yml From 0311238e2d8173709117dfa150ab96f5cafc9e8a Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:16:55 -0400 Subject: [PATCH 69/85] SA-72 Update develop_shopping-assistant-api-dev.yml --- .github/workflows/develop_shopping-assistant-api-dev.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml index e24cb0d..957aea5 100644 --- a/.github/workflows/develop_shopping-assistant-api-dev.yml +++ b/.github/workflows/develop_shopping-assistant-api-dev.yml @@ -22,8 +22,11 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release - - name: Test with dotnet - run: dotnet test --no-build --verbosity normal + - name: Integration Tests + run: dotnet test ShoppingAssistantApi.Tests --configuration Debug --verbosity normal + + - name: Unit Tests + run: dotnet test ShoppingAssistantApi.UnitTests --configuration Debug --verbosity normal - name: dotnet publish run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp From a0231900d3ca072984271fceaceca8ef3e662fe5 Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:23:32 -0400 Subject: [PATCH 70/85] SA-72 Removed tests develop_shopping-assistant-api-dev.yml --- .github/workflows/develop_shopping-assistant-api-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml index 957aea5..c72a1cd 100644 --- a/.github/workflows/develop_shopping-assistant-api-dev.yml +++ b/.github/workflows/develop_shopping-assistant-api-dev.yml @@ -22,11 +22,11 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release - - name: Integration Tests - run: dotnet test ShoppingAssistantApi.Tests --configuration Debug --verbosity normal + # - name: Integration Tests + # run: dotnet test ShoppingAssistantApi.Tests --configuration Debug --verbosity normal - - name: Unit Tests - run: dotnet test ShoppingAssistantApi.UnitTests --configuration Debug --verbosity normal + # - name: Unit Tests + # run: dotnet test ShoppingAssistantApi.UnitTests --configuration Debug --verbosity normal - name: dotnet publish run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp From d3dd06fb58c328feef3bf7f1c573f6dae3bbc280 Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:37:51 -0400 Subject: [PATCH 71/85] SA-112 Update publish step develop_shopping-assistant-api-dev.yml --- .github/workflows/develop_shopping-assistant-api-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop_shopping-assistant-api-dev.yml b/.github/workflows/develop_shopping-assistant-api-dev.yml index c72a1cd..6030027 100644 --- a/.github/workflows/develop_shopping-assistant-api-dev.yml +++ b/.github/workflows/develop_shopping-assistant-api-dev.yml @@ -29,7 +29,7 @@ jobs: # run: dotnet test ShoppingAssistantApi.UnitTests --configuration Debug --verbosity normal - name: dotnet publish - run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp + run: dotnet publish ShoppingAssistantApi.Api/ShoppingAssistantApi.Api.csproj -c Release -o ${{env.DOTNET_ROOT}}/myapp --no-build --no-restore - name: Upload artifact for deployment job uses: actions/upload-artifact@v3 From 261bd276a85e0123e4173fd2cfb1806db707b3ac Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Tue, 7 Nov 2023 19:37:12 +0200 Subject: [PATCH 72/85] Bug fixed --- .../Services/Identity/UserManager.cs | 22 +++++++++---------- .../Services/ProductService.cs | 2 +- .../Services/RolesService.cs | 2 +- .../Services/WishlistsService.cs | 15 +++++++------ .../PersistanceExtentions/DbInitialaizer.cs | 10 ++++----- .../Repositories/BaseRepository.cs | 2 +- .../Repositories/RolesRepository.cs | 2 +- .../Repositories/UsersRepository.cs | 2 +- 8 files changed, 29 insertions(+), 28 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs index 7720477..7b9024f 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs @@ -54,8 +54,8 @@ public class UserManager : ServiceBase, IUserManager _logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}."); var user = string.IsNullOrEmpty(login.Phone) - ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email, cancellationToken) - : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone, cancellationToken); + ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email && u.IsDeleted == false, cancellationToken) + : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone && u.IsDeleted == false, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -79,11 +79,11 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Logging in / Registering guest with guest id: {guest.GuestId}."); - var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId, cancellationToken); + var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId && x.IsDeleted == false, cancellationToken); if (user == null) { - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest" && r.IsDeleted == false, cancellationToken); user = new User { GuestId = guest.GuestId, @@ -148,7 +148,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Adding Role: {roleName} to User with Id: {userId}."); - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken); if (role == null) { throw new EntityNotFoundException(); @@ -174,7 +174,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Removing Role: {roleName} from User with Id: {userId}."); - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken); if (role == null) { throw new EntityNotFoundException(); @@ -202,7 +202,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Updating user with id: {GlobalUser.Id}."); - var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id, cancellationToken); + var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id && x.IsDeleted == false, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -310,11 +310,11 @@ public class UserManager : ServiceBase, IUserManager private async Task CheckAndUpgradeToUserAsync(User user, CancellationToken cancellationToken) { - if (user.Roles.Any(x => x.Name == "Guest") && !user.Roles.Any(x => x.Name == "User")) + if (user.Roles.Any(x => x.Name == "Guest" && x.IsDeleted == false) && !user.Roles.Any(x => x.Name == "User" && x.IsDeleted == false)) { if (!string.IsNullOrEmpty(user.PasswordHash) && (!string.IsNullOrEmpty(user.Email) || !string.IsNullOrEmpty(user.Phone))) { - var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User" && x.IsDeleted == false, cancellationToken); user.Roles.Add(role); } } @@ -326,7 +326,7 @@ public class UserManager : ServiceBase, IUserManager { ValidateEmail(userDto.Email); if (userDto.Email != user.Email - && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email, cancellationToken)) + && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email && x.IsDeleted == false, cancellationToken)) { throw new EntityAlreadyExistsException("email", userDto.Email); } @@ -336,7 +336,7 @@ public class UserManager : ServiceBase, IUserManager { ValidatePhone(userDto.Phone); if (userDto.Phone != user.Phone - && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone, cancellationToken)) + && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone && x.IsDeleted == false, cancellationToken)) { throw new EntityAlreadyExistsException("phone", userDto.Phone); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 8c4d567..532e023 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -38,7 +38,7 @@ public class ProductService : IProductService "\n[Products] - return semicolon separated product names"; var countOfMessage = await _messagesRepository - .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)), cancellationToken); + .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)) && message.IsDeleted == false, cancellationToken); var previousMessages = await _wishlistsService .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); diff --git a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs index d30bc3b..31c664c 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs @@ -24,7 +24,7 @@ public class RolesService : IRolesService public async Task AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken) { - var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name, cancellationToken); + var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name && r.IsDeleted == false, cancellationToken); if (role != null) { throw new EntityAlreadyExistsException(); diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index b6814bb..c1473de 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -73,7 +73,8 @@ public class WishlistsService : IWishlistsService var wishlist = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var firstUserMessage = (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString(), cancellationToken)).First(); + var firstUserMessage = + (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString() && x.IsDeleted == false, cancellationToken)).First(); var chatCompletionRequest = new ChatCompletionRequest { @@ -123,7 +124,7 @@ public class WishlistsService : IWishlistsService public async Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) { - var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id, cancellationToken); + var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id && x.IsDeleted == false, cancellationToken); var dtos = _mapper.Map>(entities); var count = await _wishlistsRepository.GetTotalCountAsync(); return new PagedList(dtos, pageNumber, pageSize, count); @@ -150,10 +151,10 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); + var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); var dtos = _mapper.Map>(entities); - var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); + var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); return new PagedList(dtos, pageNumber, pageSize, count); } @@ -186,10 +187,10 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); + var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); var dtos = _mapper.Map>(entities); - var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); + var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); return new PagedList(dtos, pageNumber, pageSize, count); } @@ -212,7 +213,7 @@ public class WishlistsService : IWishlistsService private async Task TryGetPersonalWishlist(ObjectId wishlistId, CancellationToken cancellationToken) { - var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId, cancellationToken); + var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId && x.IsDeleted == false, cancellationToken); if (entity.CreatedById != GlobalUser.Id) { diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 98425a6..0025134 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -41,9 +41,9 @@ public class DbInitialaizer public async Task AddUsers(CancellationToken cancellationToken) { - var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User"))).FirstAsync(); - var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest"))).FirstAsync(); - var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin"))).FirstAsync(); + var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User") && x.IsDeleted == false)).FirstAsync(); + var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest") && x.IsDeleted == false)).FirstAsync(); + var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin") && x.IsDeleted == false)).FirstAsync(); var users = new User[] { @@ -179,8 +179,8 @@ public class DbInitialaizer public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) { - var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com"))).FirstAsync(); - var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua"))).FirstAsync(); + var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com") && x.IsDeleted == false)).FirstAsync(); + var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua") && x.IsDeleted == false)).FirstAsync(); var wishlists = new Wishlist[] { diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index 8a128ff..7e50eac 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -21,7 +21,7 @@ public abstract class BaseRepository : IBaseRepository where T public async Task GetOneAsync(ObjectId id, CancellationToken cancellationToken) { - return await this._collection.Find(x => x.Id == id).FirstOrDefaultAsync(cancellationToken); + return await this._collection.Find(x => x.Id == id && x.IsDeleted == false).FirstOrDefaultAsync(cancellationToken); } public async Task GetOneAsync(Expression> predicate, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs index 2c09d63..fae93c2 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs @@ -13,7 +13,7 @@ public class RolesRepository : BaseRepository, IRolesRepository public async Task GetRoleAsync(ObjectId id, CancellationToken cancellationToken) { - return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); + return await (await this._collection.FindAsync(x => x.Id == id && x.IsDeleted == false)).FirstOrDefaultAsync(cancellationToken); } public async Task GetRoleAsync(Expression> predicate, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs index 39b4ab5..07a77f0 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs @@ -14,7 +14,7 @@ public class UsersRepository : BaseRepository, IUsersRepository public async Task GetUserAsync(ObjectId id, CancellationToken cancellationToken) { - return await (await this._collection.FindAsync(x => x.Id == id)).FirstOrDefaultAsync(cancellationToken); + return await (await this._collection.FindAsync(x => x.Id == id && x.IsDeleted == false)).FirstOrDefaultAsync(cancellationToken); } public async Task GetUserAsync(Expression> predicate, CancellationToken cancellationToken) From 58ae7af0fa18672acae94a437b72511cfbf966dd Mon Sep 17 00:00:00 2001 From: stasex Date: Wed, 8 Nov 2023 14:29:40 +0200 Subject: [PATCH 73/85] added a new field to the Product entity and to Dtos --- .../Models/CreateDtos/ProductCreateDto.cs | 2 ++ ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs | 2 ++ ShoppingAssistantApi.Domain/Entities/Product.cs | 2 ++ ShoppingAssistantApi.Infrastructure/Services/ProductService.cs | 1 + 4 files changed, 7 insertions(+) diff --git a/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs index 015706c..01d900c 100644 --- a/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs +++ b/ShoppingAssistantApi.Application/Models/CreateDtos/ProductCreateDto.cs @@ -9,6 +9,8 @@ public class ProductCreateDto public required string Description { get; set; } public required double Rating { get; set; } + + public required double Price { get; set; } public required string[] ImagesUrls { get; set; } diff --git a/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs index 1697cd6..81cc6f0 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/ProductDto.cs @@ -12,6 +12,8 @@ public class ProductDto public required double Rating { get; set; } + public required double Price { get; set; } + public required string[] ImagesUrls { get; set; } public required bool WasOpened { get; set; } diff --git a/ShoppingAssistantApi.Domain/Entities/Product.cs b/ShoppingAssistantApi.Domain/Entities/Product.cs index 2085293..91e1cb1 100644 --- a/ShoppingAssistantApi.Domain/Entities/Product.cs +++ b/ShoppingAssistantApi.Domain/Entities/Product.cs @@ -17,6 +17,8 @@ public class Product : EntityBase public string[] ImagesUrls { get; set; } public bool WasOpened { get; set; } + + public double Price { get; set; } public ObjectId WishlistId { get; set; } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 8c4d567..a6f6ce1 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -152,6 +152,7 @@ public class ProductService : IProductService Name = productBuffer.Name, Rating = 0, Description = "", + Price = 0, ImagesUrls = new []{"", ""}, WasOpened = false }, cancellationToken); From fce98e6f2cb5e70e125aff327add07f344694827 Mon Sep 17 00:00:00 2001 From: stasex Date: Thu, 9 Nov 2023 12:49:05 +0200 Subject: [PATCH 74/85] add new field for product in dbinitialaizer --- .../PersistanceExtentions/DbInitialaizer.cs | 4 ++++ ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 98425a6..37ab4e5 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -212,6 +212,7 @@ public class DbInitialaizer Name = "Thermaltake Glacier 360 Liquid-Cooled PC", Description = "Cool PC for any task!", Rating = 4.3, + Price = 855, 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[] @@ -229,6 +230,7 @@ public class DbInitialaizer Name = "Apple MagSafe Battery Pack", Description = "Portable Charger with Fast Charging Capability, Power Bank Compatible with iPhone", Rating = 4.3, + Price = 35.99, 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[] @@ -247,6 +249,7 @@ public class DbInitialaizer Name = "Logitech K400 Plus Wireless Touch With Easy Media Control and Built-in Touchpad", Description = "Reliable membrane keyboard with touchpad!", Rating = 4.5, + Price = 99, 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[] @@ -266,6 +269,7 @@ public class DbInitialaizer 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, + Price = 50.99, 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[] diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index 02929da..f4346d7 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -257,6 +257,7 @@ public class DbInitializer 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, + Price = 120, Url = "https://a.co/d/5ceuIrq", ImagesUrls = new string[] { @@ -273,6 +274,7 @@ public class DbInitializer 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, + Price = 153, Url = "https://a.co/d/gxnuqs1", ImagesUrls = new string[] { From 02eb8e3634d968f8e7b0dbf79ce751208b048f33 Mon Sep 17 00:00:00 2001 From: stasex Date: Sat, 11 Nov 2023 00:17:17 +0200 Subject: [PATCH 75/85] added a test group for the method to work --- .../Services/ProductService.cs | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index a6f6ce1..721b2a8 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -19,6 +19,10 @@ public class ProductService : IProductService private readonly IOpenAiService _openAiService; private readonly IMessagesRepository _messagesRepository; + + private bool mqchecker = false; + + private SearchEventType currentDataType = SearchEventType.Wishlist; public ProductService(IOpenAiService openAiService, IWishlistsService wishlistsService, IMessagesRepository messagesRepository) { @@ -79,20 +83,26 @@ public class ProductService : IProductService var suggestionBuffer = new Suggestion(); var messageBuffer = new MessagePart(); var productBuffer = new ProductName(); - var currentDataType = SearchEventType.Wishlist; var dataTypeHolder = string.Empty; + var counter = 0; await foreach (var data in _openAiService.GetChatCompletionStream(chatRequest, cancellationToken)) { - if (data.Contains("[")) + counter++; + if (mqchecker && currentDataType == SearchEventType.Message && messageBuffer != null) { - if (dataTypeHolder=="[Message]" && messageBuffer.Text!=null) + if (data == "[") { _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() { Text = messageBuffer.Text, }, cancellationToken); + mqchecker = false; } + } + + if (data.Contains("[")) + { dataTypeHolder = string.Empty; dataTypeHolder += data; } @@ -101,13 +111,17 @@ public class ProductService : IProductService { dataTypeHolder += data; currentDataType = DetermineDataType(dataTypeHolder); + if (currentDataType == SearchEventType.Message) + { + mqchecker = true; + } } else if (dataTypeHolder=="[" && !data.Contains("[")) { dataTypeHolder += data; } - + else { switch (currentDataType) @@ -118,6 +132,7 @@ public class ProductService : IProductService Event = SearchEventType.Message, Data = data }; + currentDataType = SearchEventType.Message; messageBuffer.Text += data; break; @@ -163,6 +178,11 @@ public class ProductService : IProductService } } } + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = messageBuffer.Text, + }, cancellationToken); + mqchecker = false; } private SearchEventType DetermineDataType(string dataTypeHolder) From 17055273bfdce7df6df4d203777d0df58fd43160 Mon Sep 17 00:00:00 2001 From: stasex Date: Sat, 11 Nov 2023 00:23:54 +0200 Subject: [PATCH 76/85] added a condition to call adding a message --- .../Services/ProductService.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 721b2a8..e18da09 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -178,11 +178,14 @@ public class ProductService : IProductService } } } - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + if (currentDataType == SearchEventType.Message) { - Text = messageBuffer.Text, - }, cancellationToken); - mqchecker = false; + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + { + Text = messageBuffer.Text, + }, cancellationToken); + mqchecker = false; + } } private SearchEventType DetermineDataType(string dataTypeHolder) From d4d5ec20b5636ef4d83ed48aae2c789341321b8e Mon Sep 17 00:00:00 2001 From: stasex Date: Sat, 11 Nov 2023 00:37:08 +0200 Subject: [PATCH 77/85] changed unit test --- ShoppingAssistantApi.UnitTests/ProductTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 9887d90..18b83ea 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -46,10 +46,10 @@ public class ProductTests { "[", "Message", "]", " What", " u", " want", " ?", "[", "Options", "]", " USB-C", " ;", " Keyboard", " ultra", " ;", "[", "Options", "]", " USB", "-C", " ;", "[", "Products", "]", " GTX", " 3090", " ;", " GTX", - " 3070TI", " ;", " GTX", " 4070TI", " ;", " ?" + " 3070TI", " ;", " GTX", " 4070TI", " ;", " ?", "[", "Message", "]", " What", " u", " want", " ?" }; - var expectedMessages = new List { " What", " u", " want", " ?" }; + var expectedMessages = new List { " What", " u", " want", " ?", " What", " u", " want", " ?" }; var expectedSuggestion = new List { " USB-C", " Keyboard ultra", " USB-C" }; // Mock the GetChatCompletionStream method to provide the expected SSE data From 3f371f68eb65f6b62e7c4d0d04750f549b64e993 Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Sun, 12 Nov 2023 15:26:34 +0200 Subject: [PATCH 78/85] Fixed bug with retrieving deleted data. Added predicates to repositories. --- .../Services/Identity/UserManager.cs | 22 +++++++++---------- .../Services/ProductService.cs | 2 +- .../Services/RolesService.cs | 2 +- .../Services/WishlistsService.cs | 14 ++++++------ .../PersistanceExtentions/DbInitialaizer.cs | 10 ++++----- .../Repositories/BaseRepository.cs | 12 +++++----- .../Repositories/MessagesRepository.cs | 2 +- .../Repositories/RolesRepository.cs | 2 +- .../Repositories/UsersRepository.cs | 4 ++-- .../Repositories/WishlistsRepository.cs | 4 ++-- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs index 7b9024f..22cba2c 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/Identity/UserManager.cs @@ -54,8 +54,8 @@ public class UserManager : ServiceBase, IUserManager _logger.LogInformation($"Logging in user with email: {login.Email} and phone: {login.Phone}."); var user = string.IsNullOrEmpty(login.Phone) - ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email && u.IsDeleted == false, cancellationToken) - : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone && u.IsDeleted == false, cancellationToken); + ? await this._usersRepository.GetUserAsync(u => u.Email == login.Email, cancellationToken) + : await this._usersRepository.GetUserAsync(u => u.Phone == login.Phone, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -79,11 +79,11 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Logging in / Registering guest with guest id: {guest.GuestId}."); - var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId && x.IsDeleted == false, cancellationToken); + var user = await this._usersRepository.GetUserAsync(x => x.GuestId == guest.GuestId, cancellationToken); if (user == null) { - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest" && r.IsDeleted == false, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == "Guest", cancellationToken); user = new User { GuestId = guest.GuestId, @@ -116,7 +116,7 @@ public class UserManager : ServiceBase, IUserManager .GetOneAsync(r => r.Token == tokensModel.RefreshToken && r.CreatedById == userId - && r.IsDeleted == false, cancellationToken); + , cancellationToken); if (refreshTokenModel == null || refreshTokenModel.ExpiryDateUTC < DateTime.UtcNow) { throw new SecurityTokenExpiredException(); @@ -148,7 +148,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Adding Role: {roleName} to User with Id: {userId}."); - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); if (role == null) { throw new EntityNotFoundException(); @@ -174,7 +174,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Removing Role: {roleName} from User with Id: {userId}."); - var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName && r.IsDeleted == false, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(r => r.Name == roleName, cancellationToken); if (role == null) { throw new EntityNotFoundException(); @@ -202,7 +202,7 @@ public class UserManager : ServiceBase, IUserManager { _logger.LogInformation($"Updating user with id: {GlobalUser.Id}."); - var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id && x.IsDeleted == false, cancellationToken); + var user = await this._usersRepository.GetUserAsync(x => x.Id == GlobalUser.Id, cancellationToken); if (user == null) { throw new EntityNotFoundException(); @@ -314,7 +314,7 @@ public class UserManager : ServiceBase, IUserManager { if (!string.IsNullOrEmpty(user.PasswordHash) && (!string.IsNullOrEmpty(user.Email) || !string.IsNullOrEmpty(user.Phone))) { - var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User" && x.IsDeleted == false, cancellationToken); + var role = await this._rolesRepository.GetRoleAsync(x => x.Name == "User", cancellationToken); user.Roles.Add(role); } } @@ -326,7 +326,7 @@ public class UserManager : ServiceBase, IUserManager { ValidateEmail(userDto.Email); if (userDto.Email != user.Email - && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email && x.IsDeleted == false, cancellationToken)) + && await this._usersRepository.ExistsAsync(x => x.Email == userDto.Email, cancellationToken)) { throw new EntityAlreadyExistsException("email", userDto.Email); } @@ -336,7 +336,7 @@ public class UserManager : ServiceBase, IUserManager { ValidatePhone(userDto.Phone); if (userDto.Phone != user.Phone - && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone && x.IsDeleted == false, cancellationToken)) + && await this._usersRepository.ExistsAsync(x => x.Phone == userDto.Phone, cancellationToken)) { throw new EntityAlreadyExistsException("phone", userDto.Phone); } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index 532e023..82d6476 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -38,7 +38,7 @@ public class ProductService : IProductService "\n[Products] - return semicolon separated product names"; var countOfMessage = await _messagesRepository - .GetCountAsync(message=>message.WishlistId==ObjectId.Parse((wishlistId)) && message.IsDeleted == false, cancellationToken); + .GetCountAsync(message=>message.WishlistId == ObjectId.Parse((wishlistId)), cancellationToken); var previousMessages = await _wishlistsService .GetMessagesPageFromPersonalWishlistAsync(wishlistId, 1, countOfMessage, cancellationToken); diff --git a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs index 31c664c..d30bc3b 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/RolesService.cs @@ -24,7 +24,7 @@ public class RolesService : IRolesService public async Task AddRoleAsync(RoleCreateDto dto, CancellationToken cancellationToken) { - var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name && r.IsDeleted == false, cancellationToken); + var role = await this._repository.GetRoleAsync(r => r.Name == dto.Name, cancellationToken); if (role != null) { throw new EntityAlreadyExistsException(); diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index c1473de..837d991 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -74,7 +74,7 @@ public class WishlistsService : IWishlistsService var wishlist = await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); var firstUserMessage = - (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString() && x.IsDeleted == false, cancellationToken)).First(); + (await _messagesRepository.GetPageAsync(1, 1, x => x.WishlistId == wishlistObjectId && x.Role == MessageRoles.User.ToString(), cancellationToken)).First(); var chatCompletionRequest = new ChatCompletionRequest { @@ -124,7 +124,7 @@ public class WishlistsService : IWishlistsService public async Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) { - var entities = await _wishlistsRepository.GetPageAsync(pageNumber, pageSize, x => x.CreatedById == GlobalUser.Id && x.IsDeleted == false, 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); @@ -151,10 +151,10 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var entities = await _messagesRepository.GetPageStartingFromEndAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, 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 && x.IsDeleted == false, cancellationToken); + var count = await _messagesRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); return new PagedList(dtos, pageNumber, pageSize, count); } @@ -187,10 +187,10 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); + var entities = await _productsRepository.GetPageAsync(pageNumber, pageSize, x => x.WishlistId == wishlistObjectId, cancellationToken); var dtos = _mapper.Map>(entities); - var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId && x.IsDeleted == false, cancellationToken); + var count = await _productsRepository.GetCountAsync(x => x.WishlistId == wishlistObjectId, cancellationToken); return new PagedList(dtos, pageNumber, pageSize, count); } @@ -213,7 +213,7 @@ public class WishlistsService : IWishlistsService private async Task TryGetPersonalWishlist(ObjectId wishlistId, CancellationToken cancellationToken) { - var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId && x.IsDeleted == false, cancellationToken); + var entity = await _wishlistsRepository.GetWishlistAsync(x => x.Id == wishlistId, cancellationToken); if (entity.CreatedById != GlobalUser.Id) { diff --git a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs index 0025134..98425a6 100644 --- a/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs +++ b/ShoppingAssistantApi.Persistance/PersistanceExtentions/DbInitialaizer.cs @@ -41,9 +41,9 @@ public class DbInitialaizer public async Task AddUsers(CancellationToken cancellationToken) { - var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User") && x.IsDeleted == false)).FirstAsync(); - var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest") && x.IsDeleted == false)).FirstAsync(); - var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin") && x.IsDeleted == false)).FirstAsync(); + var userRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("User"))).FirstAsync(); + var guestRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Guest"))).FirstAsync(); + var adminRole = await (await _roleCollection.FindAsync(x => x.Name.Equals("Admin"))).FirstAsync(); var users = new User[] { @@ -179,8 +179,8 @@ public class DbInitialaizer public async Task AddWishlistsWithMessages(CancellationToken cancellationToken) { - var user1 = await (await _userCollection.FindAsync(x => x.Email.Equals("shopping.assistant.team@gmail.com") && x.IsDeleted == false)).FirstAsync(); - var user2 = await (await _userCollection.FindAsync(x => x.Email.Equals("mykhailo.bilodid@nure.ua") && x.IsDeleted == false)).FirstAsync(); + 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 wishlists = new Wishlist[] { diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index 7e50eac..e222f77 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -3,6 +3,7 @@ using MongoDB.Driver; using ShoppingAssistantApi.Application.IRepositories; using ShoppingAssistantApi.Domain.Common; using ShoppingAssistantApi.Persistance.Database; +using System; using System.Linq.Expressions; namespace ShoppingAssistantApi.Persistance.Repositories; @@ -26,7 +27,8 @@ public abstract class BaseRepository : IBaseRepository where T public async Task GetOneAsync(Expression> predicate, CancellationToken cancellationToken) { - return await this._collection.Find(predicate).FirstOrDefaultAsync(cancellationToken); + return await this._collection.Find(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted)) + .FirstOrDefaultAsync(cancellationToken); } public async Task AddAsync(TEntity entity, CancellationToken cancellationToken) @@ -37,7 +39,7 @@ public abstract class BaseRepository : IBaseRepository where T public async Task> GetPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken) { - return await this._collection.Find(Builders.Filter.Empty) + return await this._collection.Find(Builders.Filter.Where(x => !x.IsDeleted)) .Skip((pageNumber - 1) * pageSize) .Limit(pageSize) .ToListAsync(cancellationToken); @@ -45,7 +47,7 @@ public abstract class BaseRepository : IBaseRepository where T public async Task> GetPageAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken) { - return await this._collection.Find(predicate) + return await this._collection.Find(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted)) .Skip((pageNumber - 1) * pageSize) .Limit(pageSize) .ToListAsync(cancellationToken); @@ -58,12 +60,12 @@ public abstract class BaseRepository : IBaseRepository where T public async Task GetCountAsync(Expression> predicate, CancellationToken cancellationToken) { - return (int)(await this._collection.CountDocumentsAsync(predicate, cancellationToken: cancellationToken)); + return (int)(await this._collection.CountDocumentsAsync(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted), cancellationToken: cancellationToken)); } public async Task ExistsAsync(Expression> predicate, CancellationToken cancellationToken) { - return await this._collection.Find(predicate).AnyAsync(cancellationToken); + return await this._collection.Find(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted)).AnyAsync(cancellationToken); } public async Task DeleteAsync(TEntity entity, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs index 55734c9..1c6368e 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/MessagesRepository.cs @@ -12,7 +12,7 @@ public class MessagesRepository : BaseRepository, IMessagesRepository public async Task> GetPageStartingFromEndAsync(int pageNumber, int pageSize, Expression> predicate, CancellationToken cancellationToken) { - return await _collection.Find(predicate) + return await _collection.Find(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted)) .SortByDescending(x => x.CreatedDateUtc) .Skip((pageNumber - 1) * pageSize) .Limit(pageSize) diff --git a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs index fae93c2..480a368 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/RolesRepository.cs @@ -18,6 +18,6 @@ public class RolesRepository : BaseRepository, IRolesRepository public async Task GetRoleAsync(Expression> predicate, CancellationToken cancellationToken) { - return await (await this._collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + return await (await this._collection.FindAsync(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted))).FirstOrDefaultAsync(cancellationToken); } } \ No newline at end of file diff --git a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs index 07a77f0..459cccd 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/UsersRepository.cs @@ -19,7 +19,7 @@ public class UsersRepository : BaseRepository, IUsersRepository public async Task GetUserAsync(Expression> predicate, CancellationToken cancellationToken) { - return await (await this._collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + return await (await this._collection.FindAsync(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted))).FirstOrDefaultAsync(cancellationToken); } public async Task UpdateUserAsync(User user, CancellationToken cancellationToken) @@ -39,6 +39,6 @@ public class UsersRepository : BaseRepository, IUsersRepository }; return await this._collection.FindOneAndUpdateAsync( - Builders.Filter.Eq(u => u.Id, user.Id), updateDefinition, options, cancellationToken); + Builders.Filter.Eq(u => u.Id, user.Id) & Builders.Filter.Where(x => !x.IsDeleted), updateDefinition, options, cancellationToken); } } diff --git a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs index d015cf8..ec760ba 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/WishlistsRepository.cs @@ -13,13 +13,13 @@ public class WishlistsRepository : BaseRepository, IWishlistsRepositor public async Task GetWishlistAsync(Expression> predicate, CancellationToken cancellationToken) { - return await (await _collection.FindAsync(predicate)).FirstOrDefaultAsync(cancellationToken); + return await (await _collection.FindAsync(Builders.Filter.Where(predicate) & Builders.Filter.Where(x => !x.IsDeleted))).FirstOrDefaultAsync(cancellationToken); } public async Task UpdateWishlistNameAsync(ObjectId wishlistId, string newName, ObjectId updatedById, CancellationToken cancellationToken) { - var filterDefinition = Builders.Filter.Eq(w => w.Id, wishlistId); + var filterDefinition = Builders.Filter.Eq(w => w.Id, wishlistId) & Builders.Filter.Where(x => !x.IsDeleted); var updateDefinition = Builders.Update .Set(w => w.Name, newName) From d7f5dc331d4f9070b656d4e3fe3b39388b02ad2c Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Wed, 15 Nov 2023 16:54:33 +0200 Subject: [PATCH 79/85] SA-149 all issues are fixed --- .../Controllers/ProductsSearchController.cs | 14 +++++++- .../Mutations/WishlistsMutation.cs | 2 +- .../IServices/IWishlistService.cs | 2 +- .../Models/Dtos/MessageDto.cs | 8 ++--- .../Services/ProductService.cs | 6 ++-- .../Services/WishlistsService.cs | 15 ++++---- .../Tests/WishlistsTests.cs | 36 +++++++++++++++++-- .../ProductTests.cs | 8 ++--- 8 files changed, 67 insertions(+), 24 deletions(-) diff --git a/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs index 7dd9949..f00b26a 100644 --- a/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs +++ b/ShoppingAssistantApi.Api/Controllers/ProductsSearchController.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using ShoppingAssistantApi.Application.IServices; using ShoppingAssistantApi.Application.Models.CreateDtos; +using ShoppingAssistantApi.Application.Models.Dtos; +using ShoppingAssistantApi.Domain.Enums; namespace ShoppingAssistantApi.Api.Controllers; @@ -11,14 +13,24 @@ public class ProductsSearchController : BaseController { private readonly IProductService _productService; - public ProductsSearchController(IProductService productService) + private readonly IWishlistsService _wishlistsService; + + public ProductsSearchController(IProductService productService, IWishlistsService wishlistsService) { _productService = productService; + _wishlistsService = wishlistsService; } [HttpPost("search/{wishlistId}")] public async Task StreamDataToClient(string wishlistId, [FromBody]MessageCreateDto message, CancellationToken cancellationToken) { + var dto = new MessageDto() + { + Text = message.Text, + Role = MessageRoles.User.ToString(), + }; + await _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); + Response.Headers.Add("Content-Type", "text/event-stream"); Response.Headers.Add("Cache-Control", "no-cache"); Response.Headers.Add("Connection", "keep-alive"); diff --git a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs index d33cf81..a8f1d8f 100644 --- a/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs +++ b/ShoppingAssistantApi.Api/Mutations/WishlistsMutation.cs @@ -15,7 +15,7 @@ public class WishlistsMutation [Service] IWishlistsService wishlistsService) => wishlistsService.GenerateNameForPersonalWishlistAsync(wishlistId, cancellationToken); - public Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken, + public Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageDto dto, CancellationToken cancellationToken, [Service] IWishlistsService wishlistsService) => wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, dto, cancellationToken); diff --git a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs index 4b26cf1..c2d5899 100644 --- a/ShoppingAssistantApi.Application/IServices/IWishlistService.cs +++ b/ShoppingAssistantApi.Application/IServices/IWishlistService.cs @@ -10,7 +10,7 @@ public interface IWishlistsService Task GenerateNameForPersonalWishlistAsync(string wishlistId, CancellationToken cancellationToken); - Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken); + Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageDto dto, CancellationToken cancellationToken); Task> GetPersonalWishlistsPageAsync(int pageNumber, int pageSize, CancellationToken cancellationToken); diff --git a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs index 9225d00..7c2a7cd 100644 --- a/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs +++ b/ShoppingAssistantApi.Application/Models/Dtos/MessageDto.cs @@ -2,11 +2,11 @@ namespace ShoppingAssistantApi.Application.Models.Dtos; public class MessageDto { - public required string Id { get; set; } + public string Id { get; set; } - public required string Text { get; set; } + public string Text { get; set; } - public required string Role { get; set; } + public string Role { get; set; } - public required string CreatedById { get; set; } + public string CreatedById { get; set; } } diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index e18da09..bb3d83d 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -93,9 +93,10 @@ public class ProductService : IProductService { if (data == "[") { - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageDto() { Text = messageBuffer.Text, + Role = MessageRoles.Application.ToString(), }, cancellationToken); mqchecker = false; } @@ -180,9 +181,10 @@ public class ProductService : IProductService } if (currentDataType == SearchEventType.Message) { - _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageCreateDto() + _wishlistsService.AddMessageToPersonalWishlistAsync(wishlistId, new MessageDto() { Text = messageBuffer.Text, + Role = MessageRoles.Application.ToString(), }, cancellationToken); mqchecker = false; } diff --git a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs index b6814bb..42ae372 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/WishlistsService.cs @@ -45,7 +45,7 @@ public class WishlistsService : IWishlistsService throw new InvalidDataException("Provided type is invalid."); } - newWishlist.CreatedById = (ObjectId) GlobalUser.Id; + newWishlist.CreatedById = GlobalUser.Id.Value; newWishlist.CreatedDateUtc = DateTime.UtcNow; newWishlist.Name = $"{newWishlist.Type} Search"; @@ -54,8 +54,8 @@ public class WishlistsService : IWishlistsService var newMessage = new Message { Text = dto.FirstMessageText, - Role = MessageRoles.User.ToString(), - CreatedById = (ObjectId) GlobalUser.Id, + Role = MessageRoles.Application.ToString(), + CreatedById = GlobalUser.Id.Value, CreatedDateUtc = DateTime.UtcNow, WishlistId = createdWishlist.Id }; @@ -95,12 +95,12 @@ public class WishlistsService : IWishlistsService var openAiMessage = await _openAiService.GetChatCompletion(chatCompletionRequest, cancellationToken); wishlist = await _wishlistsRepository.UpdateWishlistNameAsync(wishlist.Id, - openAiMessage.Content, (ObjectId) GlobalUser.Id, cancellationToken); + openAiMessage.Content, GlobalUser.Id.Value, cancellationToken); return _mapper.Map(wishlist); } - public async Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageCreateDto dto, CancellationToken cancellationToken) + public async Task AddMessageToPersonalWishlistAsync(string wishlistId, MessageDto dto, CancellationToken cancellationToken) { var newMessage = _mapper.Map(dto); @@ -109,8 +109,7 @@ public class WishlistsService : IWishlistsService throw new InvalidDataException("Provided id is invalid."); } - newMessage.Role = MessageRoles.User.ToString(); - newMessage.CreatedById = (ObjectId) GlobalUser.Id; + newMessage.CreatedById = GlobalUser.Id.Value; newMessage.CreatedDateUtc = DateTime.UtcNow; newMessage.WishlistId = wishlistObjectId; @@ -168,7 +167,7 @@ public class WishlistsService : IWishlistsService await TryGetPersonalWishlist(wishlistObjectId, cancellationToken); - newProduct.CreatedById = (ObjectId) GlobalUser.Id; + newProduct.CreatedById = GlobalUser.Id.Value; newProduct.CreatedDateUtc = DateTime.UtcNow; newProduct.WishlistId = wishlistObjectId; diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 6a3c3a0..4d1e5d8 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -3,6 +3,7 @@ using ShoppingAssistantApi.Domain.Enums; using ShoppingAssistantApi.Application.Models.Dtos; using ShoppingAssistantApi.Application.Paging; using Newtonsoft.Json.Linq; +using MongoDB.Bson; namespace ShoppingAssistantApi.Tests.Tests; @@ -88,6 +89,30 @@ public class WishlistsTests : TestsBase Assert.NotNull(startWishlistResponse); + const string MessageText = "I want laptop"; + var mutation = new + { + query = @" + mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageDtoInput!) { + addMessageToPersonalWishlist(wishlistId: $wishlistId, dto: $dto) { + role, text, createdById + } + }", + variables = new + { + wishlistId = startWishlistResponse.Id, + dto = new + { + id = ObjectId.Empty, + text = MessageText, + role = MessageRoles.User.ToString(), + createdById = ObjectId.Empty, + } + } + }; + + await SendGraphQlRequestAsync(mutation); + var generateWishlistNameMutation = new { query = @" @@ -174,7 +199,7 @@ public class WishlistsTests : TestsBase var mutation = new { query = @" - mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageCreateDtoInput!) { + mutation addMessageToPersonalWishlist($wishlistId: String!, $dto: MessageDtoInput!) { addMessageToPersonalWishlist(wishlistId: $wishlistId, dto: $dto) { role, text, createdById } @@ -184,7 +209,10 @@ public class WishlistsTests : TestsBase wishlistId = TestingValidWishlistId, dto = new { - text = MessageText + id = ObjectId.Empty, + text = MessageText, + role = MessageRoles.User.ToString(), + createdById = ObjectId.Empty, } } }; @@ -242,7 +270,7 @@ public class WishlistsTests : TestsBase query = @" mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { - url, name, description, rating, imagesUrls, wasOpened + url, name, price, description, rating, imagesUrls, wasOpened } }", variables = new @@ -252,6 +280,7 @@ public class WishlistsTests : TestsBase { url = "https://www.amazon.com/url", name = "Generic name", + price = 1, description = "Generic description", rating = 4.8, imagesUrls = new string[] @@ -272,6 +301,7 @@ public class WishlistsTests : TestsBase Assert.Equal("Generic name", product.Name); Assert.Equal("Generic description", product.Description); Assert.Equal(4.8, product.Rating); + Assert.Equal(1, product.Price); Assert.Equal("https://www.amazon.com/image-url-1", product.ImagesUrls[0]); } diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 18b83ea..e5de43e 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -59,7 +59,7 @@ public class ProductTests _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) .ReturnsAsync(1); - _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) + _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) .Verifiable(); _wishListServiceMock @@ -135,7 +135,7 @@ public class ProductTests _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) .ReturnsAsync(3); - _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) + _wishListServiceMock.Setup(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) .Verifiable(); _wishListServiceMock @@ -186,7 +186,7 @@ public class ProductTests Assert.NotNull(actualSseEvents); Assert.Equal(expectedMessages, receivedMessages); Assert.Equal(expectedSuggestions, receivedSuggestions); - _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); + _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken), Times.Once); } @@ -276,6 +276,6 @@ public class ProductTests _wishListServiceMock.Verify(w => w.AddProductToPersonalWishlistAsync( It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync( - wishlistId, It.IsAny(), cancellationToken), Times.Once); + wishlistId, It.IsAny(), cancellationToken), Times.Once); } } \ No newline at end of file From b17cbc05f00d77b24b9cdb24c1ce238355fc9577 Mon Sep 17 00:00:00 2001 From: Serhii Shchoholiev <91877103+Shchoholiev@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:15:48 -0500 Subject: [PATCH 80/85] Update ChatCompletionRequest.cs --- .../Models/OpenAi/ChatCompletionRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs index 40f3972..6606d16 100644 --- a/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs +++ b/ShoppingAssistantApi.Application/Models/OpenAi/ChatCompletionRequest.cs @@ -2,7 +2,7 @@ namespace ShoppingAssistantApi.Application.Models.OpenAi; public class ChatCompletionRequest { - public string Model { get; set; } = "gpt-4"; + public string Model { get; set; } = "gpt-4-1106-preview"; public List Messages { get; set; } From 3dae306c75b91667f305a016033bf33bc58df17e Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Wed, 15 Nov 2023 23:58:49 +0200 Subject: [PATCH 81/85] Bug fixed --- .../Services/ProductService.cs | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index bb3d83d..a67809a 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -64,12 +64,24 @@ public class ProductService : IProductService foreach (var item in previousMessages.Items) { - messagesForOpenAI - .Add(new OpenAiMessage() - { - Role = item.Role.ToLower(), - Content = item.Text - }); + if (item.Role == "Application") + { + messagesForOpenAI + .Add(new OpenAiMessage() + { + Role = OpenAiRole.Assistant.RequestConvert(), + Content = item.Text + }); + } + else + { + messagesForOpenAI + .Add(new OpenAiMessage() + { + Role = item.Role.ToLower(), + Content = item.Text + }); + } } messagesForOpenAI.Add(new OpenAiMessage() From 5973598063afbca77332b94683928bc48e30acc1 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Sat, 18 Nov 2023 01:46:59 +0200 Subject: [PATCH 82/85] SA-143 all tests and issues fixed --- .../Repositories/BaseRepository.cs | 3 +- .../TestExtentions/DbInitializer.cs | 91 +++++++++++++++++++ .../Tests/WishlistsTests.cs | 11 ++- 3 files changed, 99 insertions(+), 6 deletions(-) diff --git a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs index e222f77..1087ee9 100644 --- a/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs +++ b/ShoppingAssistantApi.Persistance/Repositories/BaseRepository.cs @@ -55,7 +55,8 @@ public abstract class BaseRepository : IBaseRepository where T public async Task GetTotalCountAsync() { - return (int)(await this._collection.EstimatedDocumentCountAsync()); + var filter = Builders.Filter.Eq("IsDeleted", false); + return (int)(await this._collection.CountDocumentsAsync(x => !x.IsDeleted)); } public async Task GetCountAsync(Expression> predicate, CancellationToken cancellationToken) diff --git a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs index f4346d7..360aa2b 100644 --- a/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs +++ b/ShoppingAssistantApi.Tests/TestExtentions/DbInitializer.cs @@ -109,6 +109,7 @@ public class DbInitializer var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); var wishlistId3 = ObjectId.Parse("ab7c8c2d9edf39abcd1ef9ab"); var wishlistId4 = ObjectId.Parse("ab8c8c2d9edf39abcd1ef9ab"); + var wishlistId5 = ObjectId.Parse("65575253dbe88a3c118e1ca2"); var wishlists = new Wishlist[] { @@ -121,6 +122,14 @@ public class DbInitializer CreatedDateUtc = DateTime.UtcNow }, new Wishlist + { + Id = wishlistId5, + Name = "Gaming PC", + Type = WishlistTypes.Product.ToString(), + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Wishlist { Id = wishlistId2, Name = "Generic Wishlist Name", @@ -162,6 +171,8 @@ public class DbInitializer var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); var wishlistId3 = ObjectId.Parse("ab7c8c2d9edf39abcd1ef9ab"); var wishlistId4 = ObjectId.Parse("ab8c8c2d9edf39abcd1ef9ab"); + var wishlistId5 = ObjectId.Parse("65575253dbe88a3c118e1ca2"); + var messages = new Message[] { @@ -211,6 +222,51 @@ public class DbInitializer CreatedDateUtc = DateTime.UtcNow.AddSeconds(50) }, new Message + { + Text = "Message 1", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId5, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow + }, + new Message + { + Text = "Message 2", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId5, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(5) + }, + new Message + { + Text = "Message 3", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId5, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(20) + }, + new Message + { + Text = "Message 4", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId5, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(25) + }, + new Message + { + Text = "Message 5", + Role = MessageRoles.User.ToString(), + WishlistId = wishlistId5, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(45) + }, + new Message + { + Text = "Message 6", + Role = MessageRoles.Application.ToString(), + WishlistId = wishlistId5, + CreatedDateUtc = DateTime.UtcNow.AddSeconds(50) + }, + new Message { Text = "Prompt", Role = MessageRoles.User.ToString(), @@ -249,6 +305,7 @@ public class DbInitializer var wishlistId1 = ObjectId.Parse("ab79cde6f69abcd3efab65cd"); var wishlistId2 = ObjectId.Parse("ab6c2c2d9edf39abcd1ef9ab"); + var wishlistId3 = ObjectId.Parse("65575253dbe88a3c118e1ca2"); var products = new Product[] { @@ -285,6 +342,40 @@ public class DbInitializer WishlistId = wishlistId1, CreatedById = user1.Id, CreatedDateUtc = DateTime.UtcNow + }, + 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, + Price = 120, + 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 = wishlistId3, + 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, + Price = 153, + 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 = wishlistId3, + CreatedById = user1.Id, + CreatedDateUtc = DateTime.UtcNow }, }; diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 4d1e5d8..3ed5336 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -26,6 +26,7 @@ public class WishlistsTests : TestsBase private const string TestingValidWishlistId = "ab79cde6f69abcd3efab65cd"; + private const string TestingValidWishlistId2 = "65575253dbe88a3c118e1ca2"; public WishlistsTests(TestingFactory factory) : base(factory) @@ -178,7 +179,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = TestingValidWishlistId + wishlistId = TestingValidWishlistId2 } }; @@ -246,7 +247,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = TestingValidWishlistId, + wishlistId = TestingValidWishlistId2, pageNumber = 1, pageSize = 2 } @@ -823,7 +824,7 @@ public class WishlistsTests : TestsBase }", variables = new { - wishlistId = TestingValidWishlistId, + wishlistId = TestingValidWishlistId2, pageNumber = 100, pageSize = 2 } @@ -878,7 +879,7 @@ public class WishlistsTests : TestsBase 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 = TestingValidWishlistId, + wishlistId = TestingValidWishlistId2, pageNumber = 1, pageSize = 100 } @@ -890,7 +891,7 @@ public class WishlistsTests : TestsBase Assert.NotNull(pagedList); 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 ", pagedList.Items.ToList()[1].Name); - Assert.Equal(TestingValidWishlistId, pagedList.Items.ToList()[1].WishlistId); + Assert.Equal(TestingValidWishlistId2, pagedList.Items.ToList()[1].WishlistId); } [Fact] From 550d7e68e3b3069dabe974562a3ccd0665191c11 Mon Sep 17 00:00:00 2001 From: stasex Date: Tue, 21 Nov 2023 00:43:52 +0200 Subject: [PATCH 83/85] removed the addition to the database in the product search method. Also changed the unit tests --- .../Services/ProductService.cs | 12 ------------ ShoppingAssistantApi.UnitTests/ProductTests.cs | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs index a6f6ce1..24ad71f 100644 --- a/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs +++ b/ShoppingAssistantApi.Infrastructure/Services/ProductService.cs @@ -144,18 +144,6 @@ public class ProductService : IProductService Data = productBuffer.Name }; productBuffer.Name = string.Empty; - - //a complete description of the entity when the Amazon API is connected - await _wishlistsService.AddProductToPersonalWishlistAsync(wishlistId, new ProductCreateDto() - { - Url = "", - Name = productBuffer.Name, - Rating = 0, - Description = "", - Price = 0, - ImagesUrls = new []{"", ""}, - WasOpened = false - }, cancellationToken); break; } productBuffer.Name += data; diff --git a/ShoppingAssistantApi.UnitTests/ProductTests.cs b/ShoppingAssistantApi.UnitTests/ProductTests.cs index 9887d90..808c6ce 100644 --- a/ShoppingAssistantApi.UnitTests/ProductTests.cs +++ b/ShoppingAssistantApi.UnitTests/ProductTests.cs @@ -216,14 +216,6 @@ public class ProductTests _messagesRepositoryMock.Setup(m => m.GetCountAsync(It.IsAny>>(), It.IsAny())) .ReturnsAsync(3); - - _wishListServiceMock - .Setup(w => w.AddProductToPersonalWishlistAsync( - It.IsAny(), It.IsAny(), It.IsAny())) - .Verifiable(); - - _wishListServiceMock.Setup(w => w.AddProductToPersonalWishlistAsync(wishlistId, It.IsAny(), cancellationToken)) - .Verifiable(); _wishListServiceMock .Setup(w => w.GetMessagesPageFromPersonalWishlistAsync( @@ -273,8 +265,6 @@ public class ProductTests Assert.NotNull(actualSseEvents); Assert.Equal(expectedMessages, receivedMessages); Assert.Equal(expectedSuggestions, receivedSuggestions); - _wishListServiceMock.Verify(w => w.AddProductToPersonalWishlistAsync( - It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); _wishListServiceMock.Verify(w => w.AddMessageToPersonalWishlistAsync( wishlistId, It.IsAny(), cancellationToken), Times.Once); } From b93e9a88ba35b9be61b67c8bd9f7cccacdaedf82 Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Tue, 21 Nov 2023 00:56:22 +0200 Subject: [PATCH 84/85] SA-196 test fixed --- ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index 6a3c3a0..ba709df 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -242,7 +242,7 @@ public class WishlistsTests : TestsBase query = @" mutation addProductToPersonalWishlist($wishlistId: String!, $dto: ProductCreateDtoInput!) { addProductToPersonalWishlist (wishlistId: $wishlistId, dto: $dto) { - url, name, description, rating, imagesUrls, wasOpened + url, name, price, description, rating, imagesUrls, wasOpened } }", variables = new @@ -254,6 +254,7 @@ public class WishlistsTests : TestsBase name = "Generic name", description = "Generic description", rating = 4.8, + price = 1, imagesUrls = new string[] { "https://www.amazon.com/image-url-1", From 56a4168a412edfb55e886559912535a77dba37de Mon Sep 17 00:00:00 2001 From: Mykhailo Bilodid Date: Tue, 21 Nov 2023 01:23:28 +0200 Subject: [PATCH 85/85] all bugs fixed --- ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs index d1d0125..3ed5336 100644 --- a/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs +++ b/ShoppingAssistantApi.Tests/Tests/WishlistsTests.cs @@ -284,7 +284,6 @@ public class WishlistsTests : TestsBase price = 1, description = "Generic description", rating = 4.8, - price = 1, imagesUrls = new string[] { "https://www.amazon.com/image-url-1",