Dev

.github/workflows/test_and_deploy.yml

@@ -10,6 +10,21 @@ jobs:
   tests-and-format:
     runs-on: ubuntu-latest
 
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_DB: vibik_test
+          POSTGRES_USER: vibik_user
+          POSTGRES_PASSWORD: vibik_pass
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd="pg_isready -U vibik_user"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -26,7 +41,13 @@ jobs:
         run: dotnet build --no-restore -c Release
 
       - name: Run tests
-        run: dotnet test --no-build --verbosity normal
+        env:
+          POSTGRES_DB: vibik_test
+          POSTGRES_USER: vibik_user
+          POSTGRES_PASSWORD: vibik_pass
+          POSTGRES_SERVER: localhost
+          POSTGRES_PORT: 5432
+        run: dotnet test --configuration Release --no-build --verbosity normal
 
       - name: Dotnet format whitespace (fix)
         run: dotnet format whitespace
@@ -91,4 +112,4 @@ jobs:
             cd vibik
             sudo docker compose pull
             sudo docker compose down
-            sudo docker compose up -d
+            sudo docker compose up -d

Api/Api.csproj

@@ -14,6 +14,7 @@
     <ItemGroup>
         <PackageReference Include="AWSSDK.S3" Version="4.0.11.3"/>
         <PackageReference Include="DotNetEnv" Version="3.1.1"/>
+        <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.0" />
         <PackageReference Include="MediatR" Version="13.0.0"/>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7"/>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6"/>

Api/Application/Common/Exceptions/ResultExtensions.cs

@@ -8,8 +8,10 @@ public static T EnsureSuccess<T>(this Result<T> result)
     {
         if (!result.IsSuccess)
         {
-            var error = result.Error ?? new Error("unknown", "Unknown error");
-            throw new ApiException(StatusCodes.Status500InternalServerError, error.Message);
+            throw new ApiException(
+                StatusCodes.Status503ServiceUnavailable,
+                result.Error?.Message ?? "External service unavailable"
+            );
         }
 
         return result.Value!;

Api/Application/Common/ServiceCollectionExtensions.cs

@@ -125,6 +125,8 @@ public static WebApplicationBuilder AddInfrastructureServices(this WebApplicatio
         builder.Services.AddScoped<IUserTable, UserTable>();
         builder.Services.AddScoped<IUsersTasksTable, UsersTasksTable>();
         builder.Services.AddScoped<IMetricsTable, MetricsTable>();
+        builder.Services.AddScoped<ITaskEvent, RandomTaskEvent>();
+
 
         return builder;
     }

Api/Application/Features/Auth/Refresh/RefreshHandler.cs

@@ -4,16 +4,16 @@
 
 namespace Api.Application.Features.Auth.Refresh;
 
-public class RefreshHandler(IUserTable users, IPasswordHasher hasher, ITokenService tokenService)
+public class RefreshHandler(ITokenService tokenService)
     : IRequestHandler<RefreshCommand, RefreshResponse>
 {
-    public async Task<RefreshResponse> Handle(RefreshCommand command,
+    public Task<RefreshResponse> Handle(RefreshCommand command,
         CancellationToken cancellationToken)
     {
         var username = command.Username;
-        return new RefreshResponse(
+        return Task.FromResult(new RefreshResponse(
             tokenService.GenerateAccessToken(username),
             tokenService.GenerateRefreshToken(username)
-        );
+        ));
     }
 }

Api/Application/Features/Moderation/ApproveTask/ChangeTaskStatusHandler.cs

@@ -1,24 +1,29 @@
+using Infrastructure.DataAccess;
 using Infrastructure.Interfaces;
 using MediatR;
 using Shared.Models.Enums;
 
 namespace Api.Application.Features.Moderation.ApproveTask;
 
-public class ChangeTaskStatusHandler(IUsersTasksTable tasks, IUserTable users) : IRequestHandler<ChangeTaskStatusQuery, bool>
+public class ChangeTaskStatusHandler(IUsersTasksTable tasks, IUserTable users)
+    : IRequestHandler<ChangeTaskStatusQuery, bool>
 {
     public async Task<bool> Handle(ChangeTaskStatusQuery request, CancellationToken cancellationToken)
     {
-        var userTaskId = request.UserTaskId;
-
+        var user = await users.GetUser(request.UserTaskId);
+        var reward = await tasks.GetReward(request.UserTaskId);
         if (request.Status == ModerationStatus.Approved)
         {
-            var reward = await tasks.GetReward(userTaskId);
-
-            await tasks.SetCompleted(userTaskId);
-            await users.ChangeExperience(userTaskId, 1);
-            await users.TryChangeLevel(userTaskId);
-            await users.ChangeMoney(userTaskId, reward);
+            await users.AddMoney(user.Username, reward);
+            if ((user.Experience + 1) % 5 == 0)
+            {
+                await users.AddLevel(user.Username, 1);
+                await users.AddExperience(user.Username, -4);
+            }
+            else
+                await users.AddExperience(user.Username, 1);
         }
-        return await tasks.ChangeModerationStatus(userTaskId, request.Status);
+
+        return await tasks.ChangeModerationStatus(request.UserTaskId, request.Status);
     }
 }

Api/Application/Features/Moderation/ModerationController.cs

@@ -44,7 +44,7 @@ public async Task<IActionResult> CheckModerator(long tgUserId)
     /// approve task
     /// </summary>
     [HttpPost("{userTaskId:int}/approve")]
-    [Authorize(Roles = UserRoleNames.TgBot)]
+    // [Authorize(Roles = UserRoleNames.TgBot)]
     public async Task<IActionResult> ApproveTask(int userTaskId)
     {
         if (userTaskId == -1)

Api/Application/Features/Photos/UploadPhoto/UploadPhotoHandler.cs

@@ -1,5 +1,6 @@
 using Amazon.S3;
 using Amazon.S3.Model;
+using ImageMagick;
 using MediatR;
 using Microsoft.Extensions.Options;
 using Shared.Models.Configs;
@@ -23,8 +24,18 @@ public async Task<string> Handle(UploadPhotoCommand request, CancellationToken c
     {
         var file = request.File;
 
+        await using var inputStream = file.OpenReadStream();
+        using var image = new MagickImage(inputStream);
+
+        image.Quality = 75;
+        image.Strip();
+
+        await using var compressedStream = new MemoryStream();
+        await image.WriteAsync(compressedStream, cancellationToken);
+        compressedStream.Position = 0;
+
         var fileName = $"{Guid.NewGuid()}{Path.GetExtension(file.FileName)}";
-        var contentType = file.ContentType;
+        const string contentType = "image/jpeg";
 
         var buckets = await s3Client.ListBucketsAsync(cancellationToken);
         if (buckets.Buckets.All(b => b.BucketName != bucket))
@@ -41,7 +52,7 @@ public async Task<string> Handle(UploadPhotoCommand request, CancellationToken c
         {
             BucketName = bucket,
             Key = fileName,
-            InputStream = stream,
+            InputStream = compressedStream,
             ContentType = contentType
         };
 

Api/Application/Features/Tasks/ChangeTask/ChangeTaskHandler.cs

@@ -5,7 +5,7 @@
 
 namespace Api.Application.Features.Tasks.ChangeTask;
 
-public class ChangeTaskHandler(IUsersTasksTable tasks, IUserTable users, IMetricsTable metrics)
+public class ChangeTaskHandler(IUsersTasksTable tasks, IUserTable users, IMetricsTable metrics, ITaskEvent taskEvent)
     : IRequestHandler<ChangeTaskQuery, TaskModel>
 {
     private const double Coefficient = 0.2;
@@ -14,10 +14,10 @@ public async Task<TaskModel> Handle(ChangeTaskQuery request, CancellationToken c
     {
         var username = request.Username;
         var taskId = request.TaskId;
-
-        var newTask = await tasks.ChangeUserTask(taskId);
+        //TODO потом перепишу и это надо в service
+        var newTask = await taskEvent.ChangeUserTask(taskId);
         var reward = tasks.GetReward(taskId);
-        await users.ChangeMoney(taskId, -(int)(reward.Result * Coefficient));
+        await users.AddMoney(username, -(int)(reward.Result * Coefficient));
 
         await metrics.AddRecord(username, MetricType.Change);
         return newTask;

Api/Application/Features/Tasks/GetTask/GetTaskHandler.cs

@@ -10,6 +10,8 @@ public class GetTaskHandler(IUsersTasksTable tasks) : IRequestHandler<GetTaskQue
     public async Task<TaskModel> Handle(GetTaskQuery request, CancellationToken cancellationToken)
     {
         var task = await tasks.GetTaskFullInfo(request.TaskId);
-        return task ?? throw new ApiException(StatusCodes.Status404NotFound, $"Task {request.TaskId} for {request.Username} not found");
+        return task ??
+               throw new ApiException(StatusCodes.Status404NotFound,
+                   $"Task {request.TaskId} for {request.Username} not found");
     }
 }

Api/Application/Features/Tasks/GetTasks/GetTasksHandler.cs

@@ -4,20 +4,21 @@
 
 namespace Api.Application.Features.Tasks.GetTasks;
 
-public class GetTasksHandler(IUsersTasksTable tasks) : IRequestHandler<GetTasksQuery, List<TaskModel>>
+public class GetTasksHandler(IUsersTasksTable tasks, ITaskEvent taskEvent) : IRequestHandler<GetTasksQuery, List<TaskModel>>
 {
     public async Task<List<TaskModel>> Handle(GetTasksQuery request,
         CancellationToken cancellationToken)
     {
         var username = request.Username;
         var tasksList = await tasks.GetListActiveUserTasks(username);
 
-        while (tasksList.Count != 4)
+        while (tasksList.Count < 4)
         {
-            var task = await tasks.AddUserTask(username);
+            var task = await taskEvent.AddUserTask(username);
             tasksList.Add(task);
+            await Task.Delay(200, cancellationToken);
         }
-        
+
         return tasksList;
     }
 }

Api/Application/Features/Tasks/SubmitTask/SubmitTaskHandler.cs

@@ -5,22 +5,23 @@
 
 namespace Api.Application.Features.Tasks.SubmitTask;
 
-public class SubmitTaskHandler(IUsersTasksTable tasks,IMetricsTable metrics, IMediator mediator)
+public class SubmitTaskHandler(IUsersTasksTable tasks, IMetricsTable metrics, IMediator mediator)
     : IRequestHandler<SubmitTaskQuery, List<string>>
 {
     public async Task<List<string>> Handle(SubmitTaskQuery request, CancellationToken cancellationToken)
     {
         var uploadedNames = new List<string>();
         var username = request.Username;
         var taskId = request.TaskId;
-
-        foreach (var file in request.Files)
+        var files = request.Files;
+        foreach (var file in files)
         {
             var name = await mediator.Send(new UploadPhotoCommand(file), cancellationToken);
-            await tasks.AddPhoto(taskId, name);
             uploadedNames.Add(name);
         }
-
+
+        await tasks.SetPhotos(taskId, uploadedNames.ToArray());
+
         await tasks.ChangeModerationStatus(taskId, ModerationStatus.Waiting);
 
         await metrics.AddRecord(username, MetricType.Submit);

Api/Application/Features/Weather/WeatherController.cs

@@ -1,4 +1,5 @@
-using Infrastructure.Interfaces;
+using Api.Application.Common.Exceptions;
+using Infrastructure.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Api.Application.Features.Weather;
@@ -13,7 +14,9 @@ public class WeatherController(IWeatherApi weatherService) : ControllerBase
     [HttpGet("current")]
     public async Task<IActionResult> GetCurrentWeather(CancellationToken cancellationToken)
     {
-        var weather = await weatherService.GetCurrentWeatherAsync(cancellationToken);
+        var weather = (await weatherService
+            .GetCurrentWeatherAsync(cancellationToken)).EnsureSuccess();
+
         return Ok(weather);
     }
 }

Api/Dockerfile

@@ -6,8 +6,9 @@ COPY Api/Api.csproj Api/
 COPY Application/Application.csproj Application/
 COPY Infrastructure/Infrastructure.csproj Infrastructure/
 COPY Client.Models/Client.Models.csproj Client.Models/
+COPY Test/Test.csproj Test/
 
-RUN dotnet restore Vibik.Server.sln
+RUN dotnet restore Api/Api.csproj
 
 COPY . .
 

Api/appsettings.json

@@ -7,7 +7,7 @@
   },
   "AllowedHosts": "*",
   "JwtSettings": {
-    "ExpiresAccess": "00:02:00",
+    "ExpiresAccess": "00:20:00",
     "ExpiresRefresh": "1.00:00:00",
     "SecretKey": "JwtSecretKey",
     "AllowNonExpiringTokens": true

Client.Models/Client.Models.csproj

@@ -7,4 +7,8 @@
         <RootNamespace>Shared</RootNamespace>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Folder Include="Models\Common\" />
+    </ItemGroup>
+
 </Project>

Client.Models/Models/Entities/User.cs

@@ -4,7 +4,7 @@ public class User
 {
     public required string Username { get; set; }
     public required string DisplayName { get; set; }
-    public int Level { get; set; } = 0;
-    public int Experience { get; set; } = 0;
-    public int Money { get; set; } = 0;
+    public int Level { get; set; }
+    public int Experience { get; set; }
+    public int Money { get; set; }
 }