chore: cleanup

2025-07-25 16:37:42 +03:00 · 2025-07-25 16:37:42 +03:00 · b15a77557e
commit b15a77557e
parent 7ceb8f656e
28 changed files with 224 additions and 198 deletions
--- a/JOBot.Backend/Controllers/HeadHunterHookController.cs
+++ b/JOBot.Backend/Controllers/HeadHunterHookController.cs
@ -8,16 +8,17 @@ namespace JOBot.Backend.Controllers;
 public class HeadHunterHookController(HeadHunterService hhService)
    : ControllerBase
 {
-
    [HttpGet]
    public async Task<IActionResult> Get(int userId, string? error, string code)
    {
        var res = await hhService.AuthUser(userId, code, error);
        return res switch
        {
-            HeadHunterService.Status.Success =>  Ok("Авторизация завершена успешно. Вернитесь в Telegram для продолжения."),
+            HeadHunterService.Status.Success => Ok(
+                "Авторизация завершена успешно. Вернитесь в Telegram для продолжения."),
            HeadHunterService.Status.UserNotFoundError => NotFound("Пользователь не найден."),
-            _ => BadRequest("Авторизация завершена с ошибкой. Вернитесь в Telegram для продолжения.") //TODO: Add resource
+            _ => BadRequest(
+                "Авторизация завершена с ошибкой. Вернитесь в Telegram для продолжения.") //TODO: Add resource
        };
    }
 }
--- a/JOBot.Backend/DAL/Context/AppDbContext.cs
+++ b/JOBot.Backend/DAL/Context/AppDbContext.cs
@ -1,14 +1,14 @@
-namespace JOBot.Backend.DAL.Context;
-
-using Models;
+using JOBot.Backend.DAL.Models;
 using Microsoft.EntityFrameworkCore;

+namespace JOBot.Backend.DAL.Context;
+
 public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
 {
    public DbSet<User> Users { get; set; }

    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {   
+    {
        base.OnModelCreating(modelBuilder);

        modelBuilder.Entity<User>()
--- a/JOBot.Backend/DAL/Models/User.cs
+++ b/JOBot.Backend/DAL/Models/User.cs
@ -9,12 +9,12 @@ public class User
 {
    public Guid Id { get; set; }

-    [Key]
-    public required long UserId { get; set; }
-    [MaxLength(255)]
-    public string? Username { get; set; }
+    [Key] public required long UserId { get; set; }
+
+    [MaxLength(255)] public string? Username { get; set; }
+
    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-    
+
    [MaxLength(255)] public string? AccessToken { get; set; } = null;
    [MaxLength(255)] public string? RefreshToken { get; set; } = null;

--- a/JOBot.Backend/DTOs/HeadHunterHook/HeadHunterTokenResponseDto.cs
+++ b/JOBot.Backend/DTOs/HeadHunterHook/HeadHunterTokenResponseDto.cs
@ -3,12 +3,12 @@ using System.Text.Json.Serialization;
 namespace JOBot.Backend.DTOs.HeadHunterHook;

 public record HeadHunterTokenResponseDto(
-    [property:JsonPropertyName("access_token")]
+    [property: JsonPropertyName("access_token")]
    string AccessToken,
-    [property:JsonPropertyName("expires_in")]
+    [property: JsonPropertyName("expires_in")]
    int ExpiresIn,
-    [property:JsonPropertyName("refresh_token")]
+    [property: JsonPropertyName("refresh_token")]
    string RefreshToken,
-    [property:JsonPropertyName("token_type")]
+    [property: JsonPropertyName("token_type")]
    string TokenType
-    );
+);
--- a/JOBot.Backend/JOBot.Backend.csproj
+++ b/JOBot.Backend/JOBot.Backend.csproj
@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>

-	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.30.2" />
-		<PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
-		<PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.71.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.71.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-		<PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Google.Protobuf" Version="3.30.2"/>
+        <PackageReference Include="Grpc.AspNetCore" Version="2.71.0"/>
+        <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.71.0"/>
+        <PackageReference Include="Grpc.Tools" Version="2.71.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4"/>
+        <PackageReference Include="RabbitMQ.Client" Version="7.1.2"/>
+    </ItemGroup>

-	<ItemGroup>
-		<Protobuf Include="..\Proto\*" GrpcServices="Server"></Protobuf>
-	</ItemGroup>
+    <ItemGroup>
+        <Protobuf Include="..\Proto\*" GrpcServices="Server"></Protobuf>
+    </ItemGroup>

-	<ItemGroup>
-	  <Folder Include="Data\Migrations\" />
-	</ItemGroup>
+    <ItemGroup>
+        <Folder Include="Data\Migrations\"/>
+    </ItemGroup>

 </Project>
--- a/JOBot.Backend/Services/HeadHunterService.cs
+++ b/JOBot.Backend/Services/HeadHunterService.cs
@ -10,28 +10,36 @@ using RabbitMQ.Client;
 namespace JOBot.Backend.Services;

 public class HeadHunterService(
-    IChannel channel, 
-    ILogger<HeadHunterService> logger, 
-    IOptions<HeadHunterConfig> config, 
+    IChannel channel,
+    ILogger<HeadHunterService> logger,
+    IOptions<HeadHunterConfig> config,
    AppDbContext dbContext)
 {
+    public enum Status
+    {
+        UserAuthRejectedError,
+        HeadHunterAuthRejectedError,
+        UserNotFoundError,
+        HeadHunterResponseDeserializationFailedError,
+        Success
+    }
+
    private readonly HeadHunterConfig _config = config.Value;

    /// <summary>
-    /// Generate HeadHunter oauth authorization link
+    ///     Generate HeadHunter oauth authorization link
    /// </summary>
    /// <param name="userId">Telegram UserId</param>
    /// <returns>Link for auth</returns>
    public string GenerateAuthLink(long userId)
    {
-        
        return string.Format(_config.Links.AuthLink, [_config.ClientId, GetRedirectUrl(userId)]);
    }

-    public async Task<Status> AuthUser(int userId, string authorizationCode, string? error)
+    public async Task<Status> AuthUser(int userId, string authorizationCode, string? error) //TODO: Разбить этот метод
    {
        logger.LogInformation($"Authorization for user {userId} in process...");
-        
+
        if (!string.IsNullOrEmpty(error))
        {
            logger.LogWarning($"User {userId} auth completed with error {error}");
@ -69,7 +77,7 @@ public class HeadHunterService(
            logger.LogWarning($"{res.Content.ReadAsStringAsync().Result}");
            return Status.HeadHunterAuthRejectedError;
        }
-        
+
        var responseDto = JsonSerializer.Deserialize<HeadHunterTokenResponseDto>(await res.Content.ReadAsStringAsync());

        if (responseDto == null)
@ -78,7 +86,7 @@ public class HeadHunterService(
                              $"{nameof(Status.HeadHunterResponseDeserializationFailedError)}");
            return Status.HeadHunterResponseDeserializationFailedError;
        }
-        
+
        var user = await dbContext.Users.FirstOrDefaultAsync(x => x.UserId == userId);

        if (user == null)
@ -86,20 +94,20 @@ public class HeadHunterService(
            logger.LogWarning($"User {userId} search completed with error {nameof(Status.UserNotFoundError)}");
            return Status.UserNotFoundError;
        }
-        
+
        user.AccessToken = responseDto.AccessToken;
        user.RefreshToken = responseDto.RefreshToken;
-        
+
        await dbContext.SaveChangesAsync();
-        
+
        logger.LogInformation($"User {userId} auth completed!");
-        
+
        await channel.BasicPublishAsync(
-            string.Empty, 
-            RabbitQueues.AuthQueue, 
+            string.Empty,
+            RabbitQueues.AuthQueue,
            Encoding.UTF8.GetBytes(userId.ToString()));
-        
-        logger.LogInformation($"RabbitMQ event was created");
+
+        logger.LogInformation("RabbitMQ event was created");

        return Status.Success;
    }
@ -114,13 +122,4 @@ public class HeadHunterService(
            Query = $"?userId={userId}"
        }.ToString();
    }
-
-    public enum Status
-    {
-        UserAuthRejectedError,
-        HeadHunterAuthRejectedError,
-        UserNotFoundError,
-        HeadHunterResponseDeserializationFailedError,
-        Success
-    }
 }
--- a/JOBot.Backend/Services/gRPC/UserService.cs
+++ b/JOBot.Backend/Services/gRPC/UserService.cs
@ -1,4 +1,3 @@
-using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using JOBot.Backend.DAL.Context;
 using JOBot.Backend.DAL.Models;
@ -11,7 +10,7 @@ namespace JOBot.Backend.Services.gRPC;
 public class UserService(AppDbContext dbContext, HeadHunterService hhService) : Proto.User.UserBase
 {
    /// <summary>
-    /// Create user
+    ///     Create user
    /// </summary>
    /// <param name="request"></param>
    /// <param name="_"></param>
@ -32,7 +31,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
    }

    /// <summary>
-    /// Get user for client
+    ///     Get user for client
    /// </summary>
    /// <param name="request"></param>
    /// <param name="_"></param>
@ -46,7 +45,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
    }

    /// <summary>
-    /// Accept EULA for user
+    ///     Accept EULA for user
    /// </summary>
    /// <param name="request"></param>
    /// <param name="_"></param>
@ -64,7 +63,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
    }

    public override Task<GetHeadHunterAuthHookResponse> GetHeadHunterAuthHook(
-        GetHeadHunterAuthHookRequest request, 
+        GetHeadHunterAuthHookRequest request,
        ServerCallContext context)
    {
        return Task.Run(() => new GetHeadHunterAuthHookResponse
@ -74,7 +73,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
    }

    /// <summary>
-    /// Throw RPCException if user not found
+    ///     Throw RPCException if user not found
    /// </summary>
    /// <param name="user"></param>
    /// <exception cref="RpcException"></exception>
--- a/JOBot.Backend/Startup.cs
+++ b/JOBot.Backend/Startup.cs
@ -13,7 +13,7 @@ public class Startup(IConfiguration configuration)

    public async Task ConfigureServices(IServiceCollection services)
    {
-        services.AddGrpc(); 
+        services.AddGrpc();
        services.AddGrpcReflection();
        services.AddControllers();
        services.AddLogging();
@ -23,9 +23,9 @@ public class Startup(IConfiguration configuration)
            HostName = "jobot-rabbitmq"
        }.CreateConnectionAsync();
        await using var channel = await rabbitMqConnection.CreateChannelAsync();
-        await channel.QueueDeclareAsync(RabbitQueues.AuthQueue, false, false, autoDelete: false);
+        await channel.QueueDeclareAsync(RabbitQueues.AuthQueue, false, false, false);
        services.AddSingleton(channel);
-        
+
        services.AddDbContext<AppDbContext>(options =>
            options.UseNpgsql(Configuration.GetConnectionString("PostgreSQL")));

--- a/JOBot.Backend/appsettings.json
+++ b/JOBot.Backend/appsettings.json
@ -1,35 +1,35 @@
 {
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
-        }
-    },
-    "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "PostgreSQL": "Host=postgres;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
-    },
-    "HeadHunter": {
-        "Links": {
-            "AuthLink": "https://hh.ru/oauth/authorize?response_type=code&client_id={0}&redirect_uri={1}",
-            "HookDomain": "jobot.lisoveliy.su",
-            "HookRoute": "/auth",
-            "HeadHunterApiDomain": "api.hh.ru",
-            "HeadHunterTokenRoute": "/token"
-        },
-        "ClientId": "",
-        "Secret": ""
-    },
-    "Kestrel": {
-        "Endpoints": {
-            "gRPC": {
-                "Url": "http://*:5001",
-                "Protocols": "Http2"
-            },
-            "REST": {
-                "Url": "http://*:5000",
-                "Protocols": "Http1"
-            }
-        }
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "PostgreSQL": "Host=postgres;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
+  },
+  "HeadHunter": {
+    "Links": {
+      "AuthLink": "https://hh.ru/oauth/authorize?response_type=code&client_id={0}&redirect_uri={1}",
+      "HookDomain": "jobot.lisoveliy.su",
+      "HookRoute": "/auth",
+      "HeadHunterApiDomain": "api.hh.ru",
+      "HeadHunterTokenRoute": "/token"
+    },
+    "ClientId": "",
+    "Secret": ""
+  },
+  "Kestrel": {
+    "Endpoints": {
+      "gRPC": {
+        "Url": "http://*:5001",
+        "Protocols": "Http2"
+      },
+      "REST": {
+        "Url": "http://*:5000",
+        "Protocols": "Http1"
+      }
+    }
+  }
 }
--- a/JOBot.TClient/ButtonResource.resx
+++ b/JOBot.TClient/ButtonResource.resx
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>

 <root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
+                xmlns="">
        <xsd:element name="root" msdata:IsDataSet="true">
-            
+
        </xsd:element>
    </xsd:schema>
    <resheader name="resmimetype">
@ -13,10 +14,14 @@
        <value>1.3</value>
    </resheader>
    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
    </resheader>
    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
    </resheader>
    <data name="EULAAgrement" xml:space="preserve">
        <value>Соглашаюсь с условиями использования ✅</value>
--- a/JOBot.TClient/Commands/Buttons/EulaAgreementButtonCommand.cs
+++ b/JOBot.TClient/Commands/Buttons/EulaAgreementButtonCommand.cs
@ -1,9 +1,7 @@
 using JOBot.Proto;
 using JOBot.TClient.Infrastructure.Attributes.Authorization;
-using JOBot.TClient.Services;
 using JOBot.TClient.Statements;
 using Telegram.Bot.Types;
-using Telegram.Bot.Types.Enums;

 namespace JOBot.TClient.Commands.Buttons;

--- a/JOBot.TClient/Commands/Commands/InfoCommand.cs
+++ b/JOBot.TClient/Commands/Commands/InfoCommand.cs
@ -8,7 +8,7 @@ public class InfoCommand(ITelegramBotClient bot) : ITelegramCommand
    public async Task ExecuteAsync(Update update, CancellationToken ct)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        
+
        await bot.SendMessage(update.Message.From.Id, TextResource.Info, cancellationToken: ct);
    }
 }
--- a/JOBot.TClient/Commands/IAuthorizedTelegramCommand.cs
+++ b/JOBot.TClient/Commands/IAuthorizedTelegramCommand.cs
@ -1,17 +1,18 @@
 using JOBot.Proto;
-using Telegram.Bot;
 using Telegram.Bot.Types;

 namespace JOBot.TClient.Commands;

 public interface IAuthorizedTelegramCommand : ITelegramCommand
 {
-    public Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct);
-
-    /// <exception cref="UnauthorizedAccessException">Throws if you try to use ITelegramCommand.ExecuteAsync
-    /// instead of IAuthorizedTelegramCommand.ExecuteAsync</exception>
+    /// <exception cref="UnauthorizedAccessException">
+    ///     Throws if you try to use ITelegramCommand.ExecuteAsync
+    ///     instead of IAuthorizedTelegramCommand.ExecuteAsync
+    /// </exception>
    Task ITelegramCommand.ExecuteAsync(Update update, CancellationToken ct)
    {
        throw new UnauthorizedAccessException("You do not have permission to access this command.");
    }
+
+    public Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct);
 }
--- a/JOBot.TClient/Core/HostedServices/BotBackgroundService.cs
+++ b/JOBot.TClient/Core/HostedServices/BotBackgroundService.cs
@ -5,10 +5,10 @@ using JOBot.TClient.Infrastructure.Attributes.Authorization;
 using JOBot.TClient.Infrastructure.Extensions;
 using JOBot.TClient.Services;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot;
 using Telegram.Bot.Types;
-using Microsoft.Extensions.Hosting;

 namespace JOBot.TClient.Core.HostedServices;

@ -22,8 +22,8 @@ public sealed class BotBackgroundService(
    protected override Task ExecuteAsync(CancellationToken stoppingToken)
    {
        botClient.StartReceiving(
-            updateHandler: HandleUpdateAsync,
-            errorHandler: HandleErrorAsync,
+            HandleUpdateAsync,
+            HandleErrorAsync,
            cancellationToken: stoppingToken);

        return Task.CompletedTask;
@ -40,7 +40,7 @@ public sealed class BotBackgroundService(
            ["/info"] = scope.ServiceProvider.GetRequiredService<InfoCommand>(),

            //Buttons
-            [ButtonResource.EULAAgrement] = scope.ServiceProvider.GetRequiredService<EulaAgreementButtonCommand>(),
+            [ButtonResource.EULAAgrement] = scope.ServiceProvider.GetRequiredService<EulaAgreementButtonCommand>()
        };

        if (update.Message is { Text: { } text, From: not null })
@ -69,7 +69,10 @@ public sealed class BotBackgroundService(

                    await authorizedTelegramCommand.ExecuteAsync(update, user, ct);
                }
-                else await command.ExecuteAsync(update, ct);
+                else
+                {
+                    await command.ExecuteAsync(update, ct);
+                }

                return;
            }
--- a/JOBot.TClient/DependencyInjection.cs
+++ b/JOBot.TClient/DependencyInjection.cs
@ -18,39 +18,47 @@ public static class DependencyInjection
    public static IServiceCollection ConfigureServices(this IServiceCollection services, IConfiguration config)
    {
        services.AddSingleton(config);
-        
-        services.AddScoped<ChannelBase, GrpcChannel>(_ => GrpcChannel.ForAddress(config.GetValue<string>("BackendHost") 
-                                                                    ?? throw new MissingFieldException("Host is not defined")));
-        
+
+        services.AddScoped<ChannelBase, GrpcChannel>(_ => GrpcChannel.ForAddress(config.GetValue<string>("BackendHost")
+            ?? throw new MissingFieldException("Host is not defined")));
+
        #region Commands
+
        services.AddScoped<StartCommand>();
        services.AddScoped<MenuCommand>();
        services.AddScoped<InfoCommand>();
-        
+
        //buttons
        services.AddScoped<EulaAgreementButtonCommand>();
+
        #endregion
-        
+
        #region gRPC Clients
+
        services.AddGrpcClient<User.UserClient>(o => o.Address = new Uri("http://backend:5001"));
+
        #endregion
-        
+
        #region Services
+
        services.AddSingleton<UserService>();
        services.AddScoped<PrepareUserService>();
        services.AddScoped<MenuService>();
+
        #endregion
-        
+
        #region States
+
        services.AddScoped<PrepareUserState>();
+
        #endregion
-        
+
        // Bot service
        services.AddHostedService<BotBackgroundService>();
-        services.AddSingleton<ITelegramBotClient>(_ => 
-            new TelegramBotClient(config.GetValue<string>("TelegramToken") 
+        services.AddSingleton<ITelegramBotClient>(_ =>
+            new TelegramBotClient(config.GetValue<string>("TelegramToken")
                                  ?? throw new MissingFieldException("TelegramToken is not set")));
-        
+
        services.AddLogging(builder => builder.AddConsole());
        return services;
    }
--- a/JOBot.TClient/Infrastructure/Attributes/Authorization/AcceptNotPreparedAttribute.cs
+++ b/JOBot.TClient/Infrastructure/Attributes/Authorization/AcceptNotPreparedAttribute.cs
@ -1,7 +1,7 @@
 namespace JOBot.TClient.Infrastructure.Attributes.Authorization;

 /// <summary>
-///Атрибут допуска к команде пользователя не завершившего стадию PrepareUser
+///     Атрибут допуска к команде пользователя не завершившего стадию PrepareUser
 /// </summary>
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
 public class AcceptNotPreparedAttribute : Attribute;
--- a/JOBot.TClient/Infrastructure/Exceptions/FallbackException.cs
+++ b/JOBot.TClient/Infrastructure/Exceptions/FallbackException.cs
@ -4,14 +4,14 @@ using Telegram.Bot.Types;
 namespace JOBot.TClient.Infrastructure.Exceptions;

 /// <summary>
-/// Exception for fallback
-/// WARNING: Don't create new exception without throwing it
+///     Exception for fallback
+///     WARNING: Don't create new exception without throwing it
 /// </summary>
 public class FallbackException : Exception
 {
    public FallbackException(string message, Message botMessage, ITelegramBotClient botClient) : base(message)
    {
-        botClient.SendMessage(chatId: botMessage.Chat.Id,
+        botClient.SendMessage(botMessage.Chat.Id,
            TextResource.FallbackMessage);
    }
 }
--- a/JOBot.TClient/Infrastructure/Extensions/GRpcModelsExtensions.cs
+++ b/JOBot.TClient/Infrastructure/Extensions/GRpcModelsExtensions.cs
@ -4,6 +4,9 @@ namespace JOBot.TClient.Infrastructure.Extensions;

 public static class GRpcModelsExtensions
 {
-    public static bool IsPrepared(this GetUserResponse user) => user is { Eula: true, IsLogged: true } &&
-                                                                !string.IsNullOrEmpty(user.CVUrl);
+    public static bool IsPrepared(this GetUserResponse user)
+    {
+        return user is { Eula: true, IsLogged: true } &&
+               !string.IsNullOrEmpty(user.CVUrl);
+    }
 }
--- a/JOBot.TClient/JOBot.TClient.csproj
+++ b/JOBot.TClient/JOBot.TClient.csproj
@ -20,7 +20,7 @@
        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4"/>
        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4"/>
        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4"/>
-        <PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
+        <PackageReference Include="RabbitMQ.Client" Version="7.1.2"/>
        <PackageReference Include="Telegram.Bot" Version="22.5.1"/>
    </ItemGroup>

@ -59,9 +59,9 @@
    </ItemGroup>

    <ItemGroup>
-      <Content Include="appsettings.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
+        <Content Include="appsettings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
    </ItemGroup>

 </Project>
--- a/JOBot.TClient/Program.cs
+++ b/JOBot.TClient/Program.cs
@ -6,7 +6,6 @@ var host = Host.CreateDefaultBuilder(args)
    {
        // Настройка DI
        services.ConfigureServices(context.Configuration);
-        
    })
    .Build();

--- a/JOBot.TClient/Services/MenuService.cs
+++ b/JOBot.TClient/Services/MenuService.cs
@ -1,6 +1,5 @@
 using Telegram.Bot;
 using Telegram.Bot.Types;
-using User = JOBot.Proto.User;

 namespace JOBot.TClient.Services;

@ -9,7 +8,7 @@ public class MenuService(ITelegramBotClient bot)
    public async Task RenderMenu(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        
-        await bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
+
+        await bot.SendMessage(update.Message.From.Id, "PrepareUser stage is done.", cancellationToken: ct);
    }
 }
--- a/JOBot.TClient/Services/PrepareUserService.cs
+++ b/JOBot.TClient/Services/PrepareUserService.cs
@ -12,7 +12,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    private readonly User.UserClient _userClient = userClient;

    /// <summary>
-    /// Get or register user on system
+    ///     Get or register user on system
    /// </summary>
    /// <param name="update">Telegram Update object</param>
    /// <param name="ct">Cancellation Token</param>
@ -26,21 +26,21 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
        var result = await _userClient.RegisterAsync(new RegisterRequest
        {
            UserId = update.Message.From.Id,
-            Username = update.Message.From.Username,
+            Username = update.Message.From.Username
        });

        if (!result.Success)
        {
-            await _bot.SendMessage(chatId: update.Message.Chat.Id,
+            await _bot.SendMessage(update.Message.Chat.Id,
                TextResource.FallbackMessage,
                cancellationToken: ct);

            throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot);
        }

-        var user = await _userClient.GetUserAsync(new GetUserRequest()
+        var user = await _userClient.GetUserAsync(new GetUserRequest
        {
-            UserId = update.Message.From.Id,
+            UserId = update.Message.From.Id
        });

        if (user == null)
@ -50,7 +50,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    }

    /// <summary>
-    /// Get Eula Agreement from user
+    ///     Get Eula Agreement from user
    /// </summary>
    /// <param name="update">Telegram Update object</param>
    /// <param name="ct">Cancellation Token</param>
@ -66,7 +66,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    }

    /// <summary>
-    /// Accept EULA for user
+    ///     Accept EULA for user
    /// </summary>
    /// <param name="update">Telegram update object</param>
    /// <param name="ct">Cancellation Token</param>
@ -74,10 +74,10 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    public async Task AcceptEula(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        var result = await _userClient.AcceptEulaAsync(new()
+        var result = await _userClient.AcceptEulaAsync(new AcceptEulaRequest
        {
            EulaAccepted = true,
-            UserId = update.Message.From.Id,
+            UserId = update.Message.From.Id
        });

        if (!result.Success)
@ -87,22 +87,23 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    public async Task Auth(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        
-        var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest()
+
+        var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest
        {
            UserId = update.Message.From.Id
        });

        await _bot.SendMessage(
-            update.Message.From.Id, 
-            string.Format(TextResource.AskForAuth, [url.RegistrationUrl]), 
+            update.Message.From.Id,
+            string.Format(TextResource.AskForAuth, [url.RegistrationUrl]),
            cancellationToken: ct);
    }

    public async Task SelectCv(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        
-        await _bot.SendMessage(update.Message.From.Id, "Давайте выберем одно из доступных резюме:", cancellationToken: ct); //TODO: https://git.lisoveliy.su/Lisoveliy/JOBot/issues/9
+
+        await _bot.SendMessage(update.Message.From.Id, "Давайте выберем одно из доступных резюме:",
+            cancellationToken: ct); //TODO: https://git.lisoveliy.su/Lisoveliy/JOBot/issues/9
    }
 }
--- a/JOBot.TClient/Services/UserService.cs
+++ b/JOBot.TClient/Services/UserService.cs
@ -10,7 +10,7 @@ namespace JOBot.TClient.Services;
 public class UserService(ITelegramBotClient bot, User.UserClient userClient)
 {
    /// <summary>
-    /// Get user
+    ///     Get user
    /// </summary>
    /// <param name="update">Telegram Update object</param>
    /// <param name="ct">Cancellation Token</param>
@ -26,7 +26,7 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)
        {
            user = await userClient.GetUserAsync(new GetUserRequest() //Получаем пользователя
            {
-                UserId = update.Message.From.Id,
+                UserId = update.Message.From.Id
            });
        }
        catch (RpcException e) //Пользователь не найден?
@ -36,6 +36,7 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)

            return null;
        }
+
        return user;
    }
 }
--- a/JOBot.TClient/Statements/PrepareUserState.cs
+++ b/JOBot.TClient/Statements/PrepareUserState.cs
@ -7,7 +7,7 @@ namespace JOBot.TClient.Statements;
 public class PrepareUserState(PrepareUserService prepareUserService, MenuService menuService)
 {
    /// <summary>
-    /// Try to prepare user if is not registered
+    ///     Try to prepare user if is not registered
    /// </summary>
    /// <param name="update">Update telegram object</param>
    /// <param name="ct">Cancellation token</param>
@ -20,24 +20,24 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
            await prepareUserService.AskForEulaAgreement(update, ct);
            return; //interrupt while eula isn't accepted
        }
-        
+
        await OnUserEulaValidStage(user, update, ct);
    }

    /// <summary>
-    /// Signal for accepted eula
+    ///     Signal for accepted eula
    /// </summary>
    /// <param name="user"></param>
    /// <param name="update"></param>
    /// <param name="ct"></param>
    public async Task AcceptEula(GetUserResponse user, Update update, CancellationToken ct = default)
    {
-        await prepareUserService.AcceptEula(update, ct: ct);
+        await prepareUserService.AcceptEula(update, ct);
        await OnUserEulaValidStage(user, update, ct);
    }

    /// <summary>
-    /// Check user logged
+    ///     Check user logged
    /// </summary>
    /// <param name="user"></param>
    /// <param name="update"></param>
@ -49,21 +49,19 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
            await prepareUserService.Auth(update, ct);
            return;
        }
+
        await OnAuthStage(user, update, ct);
    }
-    
+
    /// <summary>
-    /// Check user selected CV
+    ///     Check user selected CV
    /// </summary>
    /// <param name="user"></param>
    /// <param name="update"></param>
    /// <param name="ct"></param>
    private async Task OnAuthStage(GetUserResponse user, Update update, CancellationToken ct = default)
    {
-        if (string.IsNullOrEmpty(user.CVUrl))
-        {
-            await prepareUserService.SelectCv(update, ct);
-        }
+        if (string.IsNullOrEmpty(user.CVUrl)) await prepareUserService.SelectCv(update, ct);
        await menuService.RenderMenu(update, ct); //boilerplate
    }
 }
--- a/JOBot.TClient/TextResource.resx
+++ b/JOBot.TClient/TextResource.resx
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>

 <root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
+                xmlns="">
        <xsd:element name="root" msdata:IsDataSet="true">
-            
+
        </xsd:element>
    </xsd:schema>
    <resheader name="resmimetype">
@ -13,10 +14,14 @@
        <value>1.3</value>
    </resheader>
    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
    </resheader>
    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
    </resheader>
    <data name="EULA" xml:space="preserve">
        <value>Продолжая, вы принимаете политику конфиденциальности и правила сервиса
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ Telegram-бот для автоматизации поиска работы че

 ## 🔥 Возможности

-  Привяжите аккаунт HeadHunter для доступа к резюме и вакансиям.
+Привяжите аккаунт HeadHunter для доступа к резюме и вакансиям.

 - **Отклик по предпочтениям**

@ -16,7 +16,7 @@ Telegram-бот для автоматизации поиска работы че
 - **Проверка резюме**

  Правка резюме, под ваши приоритеты.
- **Аналитика**  
+- **Аналитика**

  Статистика по откликам и приглашениям.

@ -25,36 +25,42 @@ Telegram-бот для автоматизации поиска работы че
 - **Backend**: .NET 8 + gRPC
 - **Frontend** Telegram клиент через Telegram.Bot
 - **БД**: PostgreSQL
- **Авторизация**: OAuth 2.0 (HH API), Telegram API 
+- **Авторизация**: OAuth 2.0 (HH API), Telegram API
 - **Инфраструктура**: Docker / Docker compose

 ## 🚀 Запуск

 ### Требования
+
 - .NET 8 SDK
 - Docker (для работы с БД)
 - Аккаунт разработчика на [dev.hh.ru](https://dev.hh.ru)

 ### 1. Настройка конфигурации
+
 Создайте `appsettings.json` в `JOBot.TClient` на основе `appsettings.Example.json`

 ### 2. Запуск через Docker
+
 ```
 docker-compose up -d --build
 ```

 ## 📌 Команды бота
-|Команда|Описание|
-|-------|--------|
-|/start	|Начало работы|
-|/menu|Настройка откликов и резюме по предпочтениям|
-|/info|Информация о боте|
+
+| Команда | Описание                                     |
+|---------|----------------------------------------------|
+| /start	 | Начало работы                                |
+| /menu   | Настройка откликов и резюме по предпочтениям |
+| /info   | Информация о боте                            |

 📄 Лицензия
 MIT License. Подробнее в файле LICENSE.

 ## Отказ от ответственности

-Продолжая, вы принимаете [политику конфиденциальности](https://hh.ru/article/personal_data?backurl=%2F&role=applicant) и [правила сервиса](https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&role=applicant) hh.ru
+Продолжая, вы принимаете [политику конфиденциальности](https://hh.ru/article/personal_data?backurl=%2F&role=applicant)
+и [правила сервиса](https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&role=applicant)
+hh.ru

 Этот сервис никак не связан с HeadHunter™ (далее hh.ru), не выдаёт себя за hh.ru и не является hh.ru
--- a/compose.dev.yml
+++ b/compose.dev.yml
@ -45,7 +45,7 @@ services:

 networks:
  jobot:
-    
+
 volumes:
  postgres_data:
  rabbitmq_data:
--- a/compose.yml
+++ b/compose.yml
@ -11,7 +11,7 @@ services:
    image: postgres:15
    environment:
      POSTGRES_PASSWORD: LocalDbPass
-      POSTGRES_DB: jobot  
+      POSTGRES_DB: jobot
    volumes:
      - postgres_data:/var/lib/postgresql/data
    networks:
@ -40,7 +40,7 @@ services:

 networks:
  jobot:
-    
+

 volumes:
  postgres_data: