Dev

Api/Application/Common/Exceptions/ResultExtensions.cs

@@ -1,4 +1,4 @@
-using Api.Application.Common.Results;
+using Client.Models.Models.Common.Results;
 
 namespace Api.Application.Common.Exceptions;
 

Api/Application/Common/ServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using Amazon.S3;
+using Client.Models.Models.Configs;
 using Infrastructure.Api;
 using Infrastructure.DataAccess;
 using Infrastructure.Interfaces;
@@ -9,7 +10,6 @@
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using Npgsql;
-using Shared.Models.Configs;
 
 namespace Api.Application.Common;
 

Api/Application/Features/Auth/AuthController.cs

@@ -1,11 +1,11 @@
 using Api.Application.Features.Auth.Login;
 using Api.Application.Features.Auth.Refresh;
 using Api.Application.Features.Auth.Register;
+using Client.Models.Models.DTO.Request;
 using Infrastructure.Security;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Shared.Models.DTO.Request;
 
 namespace Api.Application.Features.Auth;
 

Api/Application/Features/Auth/Login/LoginUserCommand.cs

@@ -1,5 +1,5 @@
+using Client.Models.Models.DTO.Response;
 using MediatR;
-using Shared.Models.DTO.Response;
 
 namespace Api.Application.Features.Auth.Login;
 

Api/Application/Features/Auth/Login/LoginUserHandler.cs

@@ -1,7 +1,7 @@
 using Api.Application.Common.Exceptions;
+using Client.Models.Models.DTO.Response;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.DTO.Response;
 
 namespace Api.Application.Features.Auth.Login;
 
@@ -20,6 +20,6 @@ public async Task<LoginUserResponse> Handle(LoginUserCommand command,
         if (loginStatus)
             return new LoginUserResponse(tokenService.GenerateAccessToken(username),
                 tokenService.GenerateRefreshToken(username));
-        throw new ApiException(StatusCodes.Status401Unauthorized, "Incorrect password or username");
+        throw new ApiException(StatusCodes.Status401Unauthorized, "Неверный логин или пароль");
     }
 }

Api/Application/Features/Auth/Login/LoginUserValidation.cs

@@ -7,12 +7,12 @@ public static class LoginUserValidation
     public static void Validate(LoginUserCommand command)
     {
         if (string.IsNullOrWhiteSpace(command.Username))
-            throw new ApiException(StatusCodes.Status400BadRequest, "Username is required");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Введите имя пользователя");
 
         if (string.IsNullOrWhiteSpace(command.Password))
-            throw new ApiException(StatusCodes.Status400BadRequest, "Password is required");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Введите пароль");
 
         if (command.Password.Length < 5)
-            throw new ApiException(StatusCodes.Status400BadRequest, "Password is too short");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Пароль слишком короткий");
     }
 }

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

@@ -1,5 +1,5 @@
+using Client.Models.Models.DTO.Response;
 using MediatR;
-using Shared.Models.DTO.Response;
 
 namespace Api.Application.Features.Auth.Refresh;
 

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

@@ -1,6 +1,6 @@
+using Client.Models.Models.DTO.Response;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.DTO.Response;
 
 namespace Api.Application.Features.Auth.Refresh;
 

Api/Application/Features/Auth/Register/RegisterUserCommand.cs

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.DTO.Response;
+using Client.Models.Models.DTO.Response;
+using MediatR;
 
 namespace Api.Application.Features.Auth.Register;
 

Api/Application/Features/Auth/Register/RegisterUserHandler.cs

@@ -1,7 +1,7 @@
 using Api.Application.Common.Exceptions;
+using Client.Models.Models.DTO.Response;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.DTO.Response;
 
 namespace Api.Application.Features.Auth.Register;
 

Api/Application/Features/Auth/Register/RegisterUserValidation.cs

@@ -7,12 +7,12 @@ public static class RegisterUserValidation
     public static void Validate(RegisterUserCommand command)
     {
         if (string.IsNullOrWhiteSpace(command.Username))
-            throw new ApiException(StatusCodes.Status400BadRequest, "Username is required");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Введите имя пользователя");
 
         if (string.IsNullOrWhiteSpace(command.Password))
-            throw new ApiException(StatusCodes.Status400BadRequest, "Password is required");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Введите пароль");
 
         if (command.Password.Length < 5)
-            throw new ApiException(StatusCodes.Status400BadRequest, "Password is too short");
+            throw new ApiException(StatusCodes.Status400BadRequest, "Пароль слишком короткий");
     }
 }

Api/Application/Features/Metrics/GetMetrics/GetMetricsHandler.cs

@@ -1,6 +1,6 @@
+using Client.Models.Models.Entities;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Metrics.GetMetrics;
 

Api/Application/Features/Metrics/GetMetrics/GetMetricsQuery.cs

@@ -1,5 +1,5 @@
+using Client.Models.Models.Entities;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Metrics.GetMetrics;
 

Api/Application/Features/Metrics/MetricsController.cs

@@ -1,11 +1,12 @@
 using Api.Application.Features.Metrics.GetMetrics;
+using Client.Models.Models.Enums;
 
 namespace Api.Application.Features.Metrics;
 
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Shared.Models.Enums;
+
 [ApiController]
 [Route("api/")]
 public class MetricsController(

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

@@ -1,7 +1,6 @@
-using Infrastructure.DataAccess;
+using Client.Models.Models.Enums;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Enums;
 
 namespace Api.Application.Features.Moderation.ApproveTask;
 
@@ -14,7 +13,7 @@ public async Task<bool> Handle(ChangeTaskStatusQuery request, CancellationToken
         var reward = await tasks.GetReward(request.UserTaskId);
         if (request.Status == ModerationStatus.Approved)
         {
-            await users.AddMoney(user.Username, reward);
+            await users.AddMoney(user!.Username, reward);
             if ((user.Experience + 1) % 5 == 0)
             {
                 await users.AddLevel(user.Username, 1);

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

@@ -1,5 +1,5 @@
+using Client.Models.Models.Enums;
 using MediatR;
-using Shared.Models.Enums;
 
 namespace Api.Application.Features.Moderation.ApproveTask;
 

Api/Application/Features/Moderation/GetNextForModeration/GetNextForModerationHandler.cs

@@ -1,6 +1,6 @@
+using Client.Models.Models.Entities;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Moderation.GetNextForModeration;
 

Api/Application/Features/Moderation/GetNextForModeration/GetNextForModerationQuery.cs

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Moderation.GetNextForModeration;
 

Api/Application/Features/Moderation/ModerationController.cs

@@ -2,10 +2,10 @@
 using Api.Application.Features.Moderation.CheckModerator;
 using Api.Application.Features.Moderation.GetModerationStatus;
 using Api.Application.Features.Moderation.GetNextForModeration;
+using Client.Models.Models.Enums;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Shared.Models.Enums;
 
 namespace Api.Application.Features.Moderation;
 

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

@@ -1,9 +1,9 @@
 using Amazon.S3;
 using Amazon.S3.Model;
+using Client.Models.Models.Configs;
 using ImageMagick;
 using MediatR;
 using Microsoft.Extensions.Options;
-using Shared.Models.Configs;
 
 namespace Api.Application.Features.Photos.UploadPhoto;
 

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

@@ -1,7 +1,7 @@
-using Infrastructure.Interfaces;
+using Client.Models.Models.Entities;
+using Client.Models.Models.Enums;
+using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
-using Shared.Models.Enums;
 
 namespace Api.Application.Features.Tasks.ChangeTask;
 
@@ -20,6 +20,6 @@ public async Task<TaskModel> Handle(ChangeTaskQuery request, CancellationToken c
         await users.AddMoney(username, -(int)(reward.Result * Coefficient));
 
         await metrics.AddRecord(username, MetricType.Change);
-        return newTask;
+        return newTask!;
     }
 }

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

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Tasks.ChangeTask;
 

Api/Application/Features/Tasks/GetCompletedTasks/GetCompletedTasksHandler.cs

@@ -1,6 +1,6 @@
-using Infrastructure.Interfaces;
+using Client.Models.Models.Entities;
+using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Tasks.GetCompletedTasks;
 

Api/Application/Features/Tasks/GetCompletedTasks/GetCompletedTasksQuery.cs

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Tasks.GetCompletedTasks;
 

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

@@ -1,7 +1,7 @@
 using Api.Application.Common.Exceptions;
+using Client.Models.Models.Entities;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Tasks.GetTask;
 
@@ -12,6 +12,6 @@ public async Task<TaskModel> Handle(GetTaskQuery request, CancellationToken canc
         var task = await tasks.GetTaskFullInfo(request.TaskId);
         return task ??
                throw new ApiException(StatusCodes.Status404NotFound,
-                   $"Task {request.TaskId} for {request.Username} not found");
+                   $"Задача {request.TaskId} для пользователя {request.Username} не найдена");
     }
 }

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

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Tasks.GetTask;
 

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

@@ -1,6 +1,6 @@
-using Infrastructure.Interfaces;
+using Client.Models.Models.Entities;
+using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Tasks.GetTasks;
 

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

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Tasks.GetTasks;
 

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

@@ -1,7 +1,7 @@
 using Api.Application.Features.Photos.UploadPhoto;
+using Client.Models.Models.Enums;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Enums;
 
 namespace Api.Application.Features.Tasks.SubmitTask;
 

Api/Application/Features/Users/GetUser/GetUserHandler.cs

@@ -1,7 +1,7 @@
 using Api.Application.Common.Exceptions;
+using Client.Models.Models.Entities;
 using Infrastructure.Interfaces;
 using MediatR;
-using Shared.Models.Entities;
 
 namespace Api.Application.Features.Users.GetUser;
 
@@ -10,6 +10,6 @@ public class GetUserHandler(IUserTable users) : IRequestHandler<GetUserQuery, Us
     public async Task<User> Handle(GetUserQuery request, CancellationToken cancellationToken)
     {
         var user = await users.GetUser(request.Username);
-        return user ?? throw new ApiException(StatusCodes.Status404NotFound, "User not found");
+        return user ?? throw new ApiException(StatusCodes.Status404NotFound, "Пользователь не найден");
     }
 }

Api/Application/Features/Users/GetUser/GetUserQuery.cs

@@ -1,5 +1,5 @@
-using MediatR;
-using Shared.Models.Entities;
+using Client.Models.Models.Entities;
+using MediatR;
 
 namespace Api.Application.Features.Users.GetUser;
 

Api/Program.cs

@@ -1,8 +1,5 @@
 using Api.Application.Common;
 using Api.Middlewares;
-using Infrastructure.Interfaces;
-using Infrastructure.Security;
-using Shared.Models.Configs;
 
 
 var builder = WebApplication.CreateBuilder(args);

Client.Models/Client.Models.csproj

@@ -4,7 +4,6 @@
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>Shared</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

Client.Models/Models/Common/Results/Result.cs

@@ -1,4 +1,4 @@
-namespace Api.Application.Common.Results;
+namespace Client.Models.Models.Common.Results;
 
 public readonly record struct Error(string Code, string Message);
 

Client.Models/Models/Configs/MediatRConfig.cs

@@ -1,4 +1,4 @@
-namespace Shared.Models.Configs;
+namespace Client.Models.Models.Configs;
 
 public class MediatRConfig
 {

Client.Models/Models/Configs/WeatherConfig.cs

@@ -1,4 +1,4 @@
-namespace Shared.Models.Configs;
+namespace Client.Models.Models.Configs;
 
 public class WeatherConfig
 {

Client.Models/Models/Configs/YosConfig.cs

@@ -1,4 +1,4 @@
-namespace Shared.Models.Configs;
+namespace Client.Models.Models.Configs;
 
 public class YosConfig
 {

Client.Models/Models/DTO/Request/LoginRequest.cs

@@ -1,4 +1,4 @@
-namespace Shared.Models.DTO.Request;
+namespace Client.Models.Models.DTO.Request;
 
 public sealed class LoginRequest
 {