42 changed files with 224 additions and 746 deletions
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@ -1,24 +0,0 @@
-name: Publish JOBot on dev
-on: 
-  push:
-    branches:
-      - dev
-
-jobs:
-  build and deploy:
-    runs-on: host
-    name: Build and deploy
-    volumes:
-      
-    steps:
-      - name: Update repo
-        run: |
-          pwd
-          cd /home/dockeruser/jobot-stack
-          git checkout dev
-          git pull
-          docker compose -f compose.dev.yml up -d postgres
-          
-          cd /home/dockeruser/jobot-stack/JOBot.Backend
-          dotnet ef database update --connection "Host=localhost;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
-          docker compose up --build -d
--- a/.gitignore
+++ b/.gitignore
@ -404,7 +404,6 @@ FodyWeavers.xsd
 .docker

 # Secrets
-JOBot.Backend/appsettings.Development.json
 JOBot.TClient/appsettings.json
 /.idea/.idea.JOBot/Docker/compose.generated.override.yml
 /.idea/.idea.JOBot/Docker/compose.dev.generated.override.yml
--- a/JOBot.Backend/Controllers/HeadHunterHookController.cs
+++ b/JOBot.Backend/Controllers/HeadHunterHookController.cs
@ -1,22 +0,0 @@
-using JOBot.Backend.Services;
-using Microsoft.AspNetCore.Mvc;
-
-namespace JOBot.Backend.Controllers;
-
-[ApiController]
-[Route("auth")]
-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.UserNotFoundError => NotFound("Пользователь не найден."),
-            _ => BadRequest("Авторизация завершена с ошибкой. Вернитесь в Telegram для продолжения.") //TODO: Add resource
-        };
-    }
-}
--- a/JOBot.Backend/DAL/Context/AppDbContext.cs
+++ b/JOBot.Backend/DAL/Context/AppDbContext.cs
@ -1,8 +1,8 @@
-using JOBot.Backend.DAL.Models;
-using Microsoft.EntityFrameworkCore;
-
 namespace JOBot.Backend.DAL.Context;

+using Models;
+using Microsoft.EntityFrameworkCore;
+
 public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
 {
    public DbSet<User> Users { get; set; }
--- a/JOBot.Backend/DAL/Models/User.cs
+++ b/JOBot.Backend/DAL/Models/User.cs
@ -9,10 +9,10 @@ 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;
--- a/JOBot.Backend/DTOs/HeadHunterHook/HeadHunterTokenResponseDto.cs
+++ b/JOBot.Backend/DTOs/HeadHunterHook/HeadHunterTokenResponseDto.cs
@ -1,14 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace JOBot.Backend.DTOs.HeadHunterHook;
-
-public record HeadHunterTokenResponseDto(
-    [property: JsonPropertyName("access_token")]
-    string AccessToken,
-    [property: JsonPropertyName("expires_in")]
-    int ExpiresIn,
-    [property: JsonPropertyName("refresh_token")]
-    string RefreshToken,
-    [property: JsonPropertyName("token_type")]
-    string TokenType
-);
--- a/JOBot.Backend/Dockerfile
+++ b/JOBot.Backend/Dockerfile
@ -10,4 +10,5 @@ WORKDIR /app
 COPY --from=build /app .
 EXPOSE 5001
 EXPOSE 5000
+ENV ASPNETCORE_ENVIRONMENT Staging
 ENTRYPOINT ["dotnet", "JOBot.Backend.dll"]
--- a/JOBot.Backend/Infrastructure/Config/HeadHunterConfig.cs
+++ b/JOBot.Backend/Infrastructure/Config/HeadHunterConfig.cs
@ -1,18 +0,0 @@
-namespace JOBot.Backend.Infrastructure.Config;
-
-public class HeadHunterConfig
-{
-    public const string SectionName = "HeadHunter";
-    public required HeadHunterLinksConfig Links { get; init; }
-    public required string ClientId { get; init; }
-    public required string Secret { get; init; }
-
-    public class HeadHunterLinksConfig
-    {
-        public required string AuthLink { get; init; }
-        public required string HookDomain { get; init; }
-        public required string HookRoute { get; init; }
-        public required string HeadHunterApiDomain { get; init; }
-        public required string HeadHunterTokenRoute { get; init; }
-    }
-}
--- a/JOBot.Backend/JOBot.Backend.csproj
+++ b/JOBot.Backend/JOBot.Backend.csproj
@ -7,20 +7,18 @@
 	</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="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"/>
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
 	</ItemGroup>

 	<ItemGroup>
@ -28,11 +26,7 @@
 	</ItemGroup>

 	<ItemGroup>
-        <Folder Include="Data\Migrations\"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
+	  <Folder Include="Data\Migrations\" />
 	</ItemGroup>

 </Project>
--- a/JOBot.Backend/Services/HeadHunterService.cs
+++ b/JOBot.Backend/Services/HeadHunterService.cs
@ -1,136 +0,0 @@
-using System.Text;
-using System.Text.Json;
-using JOBot.Backend.DAL.Context;
-using JOBot.Backend.DTOs.HeadHunterHook;
-using JOBot.Backend.Infrastructure.Config;
-using JOBot.Infrastructure.Config;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using RabbitMQ.Client;
-
-namespace JOBot.Backend.Services;
-
-public class HeadHunterService(
-    IChannel channel,
-    ILogger<HeadHunterService> logger,
-    IOptions<HeadHunterConfig> config,
-    IWebHostEnvironment env,
-    AppDbContext dbContext)
-{
-    public enum Status
-    {
-        UserAuthRejectedError,
-        HeadHunterAuthRejectedError,
-        UserNotFoundError,
-        HeadHunterResponseDeserializationFailedError,
-        Success
-    }
-
-    private readonly HeadHunterConfig _config = config.Value;
-
-    /// <summary>
-    ///     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) //TODO: Разбить этот метод
-    {
-        logger.LogInformation($"Authorization for user {userId} in process...");
-
-        if (!string.IsNullOrEmpty(error))
-        {
-            logger.LogWarning($"User {userId} auth completed with error {error}");
-            return Status.UserAuthRejectedError;
-        }
-
-        HeadHunterTokenResponseDto? responseDto;
-        if (!env.IsDevelopment()) //Production server
-        {
-            using var client = new HttpClient();
-            var form = new Dictionary<string, string>
-            {
-                { "client_id", _config.ClientId },
-                { "client_secret", _config.Secret },
-                { "code", authorizationCode },
-                { "grant_type", "authorization_code" },
-                { "redirect_uri", GetRedirectUrl(userId) }
-            };
-            client.BaseAddress = new UriBuilder(_config.Links.HeadHunterApiDomain)
-            {
-                Port = -1,
-                Scheme = "https"
-            }.Uri;
-            client.DefaultRequestHeaders.UserAgent.ParseAdd("Jobot BackEnd Service");
-
-            using var res = await client.SendAsync(
-                new HttpRequestMessage(
-                    HttpMethod.Post,
-                    _config.Links.HeadHunterTokenRoute)
-                {
-                    Content = new FormUrlEncodedContent(form)
-                });
-
-            if (!res.IsSuccessStatusCode)
-            {
-                logger.LogWarning($"Response of HttpRequest {_config.Links.HeadHunterApiDomain}" +
-                                  $"{_config.Links.HeadHunterTokenRoute} has unsuccessful status code {res.StatusCode}");
-                logger.LogWarning($"{res.Content.ReadAsStringAsync().Result}");
-                return Status.HeadHunterAuthRejectedError;
-            }
-
-            responseDto =
-                JsonSerializer.Deserialize<HeadHunterTokenResponseDto>(await res.Content.ReadAsStringAsync());
-
-            if (responseDto == null)
-            {
-                logger.LogWarning($"User {userId} auth completed with error " +
-                                  $"{nameof(Status.HeadHunterResponseDeserializationFailedError)}");
-                return Status.HeadHunterResponseDeserializationFailedError;
-            }
-        }
-        else
-        {
-            responseDto = new HeadHunterTokenResponseDto("testtoken", 0, "testtoken", "--");
-        }
-
-        var user = await dbContext.Users.FirstOrDefaultAsync(x => x.UserId == userId);
-
-        if (user == null)
-        {
-            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,
-            Encoding.UTF8.GetBytes(userId.ToString()));
-
-        logger.LogInformation("RabbitMQ event was created");
-
-        return Status.Success;
-    }
-
-    private string GetRedirectUrl(long userId)
-    {
-        return new UriBuilder(_config.Links.HookDomain)
-        {
-            Port = -1,
-            Scheme = "https",
-            Path = _config.Links.HookRoute,
-            Query = $"?userId={userId}"
-        }.ToString();
-    }
-}
--- a/JOBot.Backend/Services/gRPC/UserService.cs
+++ b/JOBot.Backend/Services/gRPC/UserService.cs
@ -7,7 +7,7 @@ using User = JOBot.Backend.DAL.Models.User;

 namespace JOBot.Backend.Services.gRPC;

-public class UserService(AppDbContext dbContext, HeadHunterService hhService) : Proto.User.UserBase
+public class UserService(AppDbContext dbContext) : Proto.User.UserBase
 {
    /// <summary>
    /// Create user
@ -62,16 +62,6 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
        return new AcceptEulaResponse { Success = true };
    }

-    public override Task<GetHeadHunterAuthHookResponse> GetHeadHunterAuthHook(
-        GetHeadHunterAuthHookRequest request,
-        ServerCallContext context)
-    {
-        return Task.Run(() => new GetHeadHunterAuthHookResponse
-        {
-            RegistrationUrl = hhService.GenerateAuthLink(request.UserId)
-        });
-    }
-
    /// <summary>
    /// Throw RPCException if user not found
    /// </summary>
--- a/JOBot.Backend/Startup.cs
+++ b/JOBot.Backend/Startup.cs
@ -1,53 +1,30 @@
 using JOBot.Backend.DAL.Context;
-using JOBot.Backend.Infrastructure.Config;
-using JOBot.Backend.Services;
 using JOBot.Backend.Services.gRPC;
-using JOBot.Infrastructure.Config;
 using Microsoft.EntityFrameworkCore;
-using RabbitMQ.Client;

 namespace JOBot.Backend;

-public class Startup(IConfiguration configuration)
+public class Startup
 {
-    private IConfiguration Configuration { get; } = configuration;
+    public Startup(IConfiguration configuration)
+    {
+        Configuration = configuration;
+    }
+
+    public IConfiguration Configuration { get; }

    public void ConfigureServices(IServiceCollection services)
    {
        services.AddGrpc(); 
        services.AddGrpcReflection();
-        services.AddControllers();
-        services.AddLogging();
        
        services.AddDbContext<AppDbContext>(options =>
            options.UseNpgsql(Configuration.GetConnectionString("PostgreSQL")));
-
-
-        services.AddSingleton<IChannel>(x =>
-        {
-            var rabbitMqConnection = new ConnectionFactory
-            {
-                HostName = "rabbitmq"
-            }.CreateConnectionAsync().Result;
-            var channel = rabbitMqConnection.CreateChannelAsync().Result;
-            channel.QueueDeclareAsync(
-                RabbitQueues.AuthQueue,
-                false,
-                false,
-                false,
-                arguments: null).Wait();
-            return channel;
-        });
-
-        services.Configure<HeadHunterConfig>(Configuration.GetSection(HeadHunterConfig.SectionName));
-
-        services.AddScoped<HeadHunterService>();
    }

    public void Configure(WebApplication app, IWebHostEnvironment env)
    {
        app.MapGrpcReflectionService().AllowAnonymous();
        app.MapGrpcService<UserService>();
-        app.MapControllers();
    }
 }
--- a/JOBot.Backend/appsettings.Development.json
+++ b/JOBot.Backend/appsettings.Development.json
@ -0,0 +1,11 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "PostgreSQL": "Host=localhost;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
+  }
+}
--- a/JOBot.Backend/appsettings.Staging.json
+++ b/JOBot.Backend/appsettings.Staging.json
@ -0,0 +1,12 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+    "AllowedHosts": "*",
+    "ConnectionStrings": {
+        "PostgreSQL": "Host=postgres;Port=5432;Database=jobot_test;Username=postgres;Password=LocalDbPass"
+    }
+}
--- a/JOBot.Backend/appsettings.json
+++ b/JOBot.Backend/appsettings.json
@ -9,17 +9,6 @@
    "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": {
--- a/JOBot.Infrastructure/Config/RabbitQueues.cs
+++ b/JOBot.Infrastructure/Config/RabbitQueues.cs
@ -1,6 +0,0 @@
-namespace JOBot.Infrastructure.Config;
-
-public static class RabbitQueues
-{
-    public const string AuthQueue = "auth";
-}
--- a/JOBot.Infrastructure/JOBot.Infrastructure.csproj
+++ b/JOBot.Infrastructure/JOBot.Infrastructure.csproj
@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-</Project>
--- a/JOBot.TClient/ButtonResource.resx
+++ b/JOBot.TClient/ButtonResource.resx
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <root>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
-                xmlns="">
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
        <xsd:element name="root" msdata:IsDataSet="true">
            
        </xsd:element>
@ -14,14 +13,10 @@
        <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,7 +1,9 @@
 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;

@ -10,7 +12,6 @@ public class EulaAgreementButtonCommand(PrepareUserState prepareUserState) : IAu
 {
    public async Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct)
    {
-        if (!user.Eula)
-            await prepareUserState.AcceptEula(user, update, ct);
+        await prepareUserState.AcceptEula(update, ct);
    }
 }
--- a/JOBot.TClient/Commands/Commands/InfoCommand.cs
+++ b/JOBot.TClient/Commands/Commands/InfoCommand.cs
@ -1,4 +1,3 @@
-using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;

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

 namespace JOBot.TClient.Commands;

 public interface IAuthorizedTelegramCommand : ITelegramCommand
 {
-    /// <exception cref="UnauthorizedAccessException">
-    ///     Throws if you try to use ITelegramCommand.ExecuteAsync
-    ///     instead of IAuthorizedTelegramCommand.ExecuteAsync
-    /// </exception>
+    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>
    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(
-            HandleUpdateAsync,
-            HandleErrorAsync,
+            updateHandler: HandleUpdateAsync,
+            errorHandler: 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,15 +69,12 @@ public sealed class BotBackgroundService(

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

                return;
            }

-            await bot.SendMessageRemK(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct);
+            await bot.SendMessage(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct);
        }
    }

--- a/JOBot.TClient/DependencyInjection.cs
+++ b/JOBot.TClient/DependencyInjection.cs
@ -0,0 +1,57 @@
+using Grpc.Core;
+using Grpc.Net.Client;
+using JOBot.Proto;
+using JOBot.TClient.Commands.Buttons;
+using JOBot.TClient.Commands.Commands;
+using JOBot.TClient.Core.HostedServices;
+using JOBot.TClient.Services;
+using JOBot.TClient.Statements;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Telegram.Bot;
+
+namespace JOBot.TClient;
+
+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")));
+        
+        #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") 
+                                  ?? 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,4 @@
 namespace JOBot.TClient.Infrastructure.Attributes.Authorization;

-/// <summary>
-///     Атрибут допуска к команде пользователя не завершившего стадию 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
@ -1,4 +1,3 @@
-using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;

@ -12,7 +11,7 @@ public class FallbackException : Exception
 {
    public FallbackException(string message, Message botMessage, ITelegramBotClient botClient) : base(message)
    {
-        botClient.SendMessageRemK(botMessage.Chat.Id,
+        botClient.SendMessage(chatId: botMessage.Chat.Id,
            TextResource.FallbackMessage);
    }
 }
--- a/JOBot.TClient/Infrastructure/Extensions/GRpcModelsExtensions.cs
+++ b/JOBot.TClient/Infrastructure/Extensions/GRpcModelsExtensions.cs
@ -4,9 +4,6 @@ namespace JOBot.TClient.Infrastructure.Extensions;

 public static class GRpcModelsExtensions
 {
-    public static bool IsPrepared(this GetUserResponse user)
-    {
-        return user is { Eula: true, IsLogged: true } &&
+    public static bool IsPrepared(this GetUserResponse user) => user is { Eula: true, IsLogged: true } &&
                                                                !string.IsNullOrEmpty(user.CVUrl);
-    }
 }
--- a/JOBot.TClient/Infrastructure/Extensions/TelegramBotClientExtensions.cs
+++ b/JOBot.TClient/Infrastructure/Extensions/TelegramBotClientExtensions.cs
@ -1,52 +0,0 @@
-using Telegram.Bot;
-using Telegram.Bot.Types;
-using Telegram.Bot.Types.Enums;
-using Telegram.Bot.Types.ReplyMarkups;
-
-namespace JOBot.TClient.Infrastructure.Extensions;
-
-public static class TelegramBotClientExtensions
-{
-    /// <summary>
-    /// Extension method for auto-remove of reply keyboard if is null
-    /// </summary>
-    /// <param name="bot"></param>
-    /// <param name="chatId"></param>
-    /// <param name="text"></param>
-    /// <param name="parseMode"></param>
-    /// <param name="replyParameters"></param>
-    /// <param name="replyMarkup"></param>
-    /// <param name="linkPreviewOptions"></param>
-    /// <param name="messageThreadId"></param>
-    /// <param name="entities"></param>
-    /// <param name="disableNotification"></param>
-    /// <param name="protectContent"></param>
-    /// <param name="messageEffectId"></param>
-    /// <param name="businessConnectionId"></param>
-    /// <param name="allowPaidBroadcast"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public static Task<Message> SendMessageRemK(
-        this ITelegramBotClient bot,
-        ChatId chatId,
-        string text,
-        ParseMode parseMode = default,
-        ReplyParameters? replyParameters = null,
-        ReplyMarkup? replyMarkup = null,
-        LinkPreviewOptions? linkPreviewOptions = null,
-        int? messageThreadId = null,
-        IEnumerable<MessageEntity>? entities = null,
-        bool disableNotification = false,
-        bool protectContent = false,
-        string? messageEffectId = null,
-        string? businessConnectionId = null,
-        bool allowPaidBroadcast = false,
-        CancellationToken cancellationToken = default)
-    {
-        replyMarkup ??= new ReplyKeyboardRemove();
-
-        return bot.SendMessage(chatId, text, parseMode, replyParameters, replyMarkup, linkPreviewOptions, messageThreadId,
-            entities, disableNotification, protectContent, messageEffectId, businessConnectionId, allowPaidBroadcast,
-            cancellationToken);
-    }
-}
--- a/JOBot.TClient/JOBot.TClient.csproj
+++ b/JOBot.TClient/JOBot.TClient.csproj
@ -20,7 +20,6 @@
        <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="Telegram.Bot" Version="22.5.1"/>
    </ItemGroup>

@ -58,14 +57,4 @@
        </EmbeddedResource>
    </ItemGroup>

-    <ItemGroup>
-        <Content Include="appsettings.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
-    </ItemGroup>
-
 </Project>
--- a/JOBot.TClient/Program.cs
+++ b/JOBot.TClient/Program.cs
@ -6,6 +6,7 @@ var host = Host.CreateDefaultBuilder(args)
    {
        // Настройка DI
        services.ConfigureServices(context.Configuration);
+        
    })
    .Build();

--- a/JOBot.TClient/Queues/AuthQueue.cs
+++ b/JOBot.TClient/Queues/AuthQueue.cs
@ -1,24 +0,0 @@
-using System.Text;
-using JOBot.Infrastructure.Config;
-using JOBot.TClient.Services;
-using Microsoft.Extensions.Hosting;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Events;
-
-namespace JOBot.TClient.Queues;
-
-public class AuthQueue(IChannel channel, PrepareUserService prepareUserService) : BackgroundService
-{
-
-    private async Task OnDataReceivedAsync(object sender, BasicDeliverEventArgs eventArgs)
-    {
-        await prepareUserService.AuthHookReceived(Convert.ToInt64(Encoding.UTF8.GetString(eventArgs.Body.ToArray())));
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        var consumer = new AsyncEventingBasicConsumer(channel);
-        consumer.ReceivedAsync += OnDataReceivedAsync;
-        await channel.BasicConsumeAsync(RabbitQueues.AuthQueue, autoAck: true, consumer: consumer, cancellationToken: stoppingToken);
-    }
-}
--- a/JOBot.TClient/Services/MenuService.cs
+++ b/JOBot.TClient/Services/MenuService.cs
@ -1,15 +1,17 @@
-using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
+using User = JOBot.Proto.User;

 namespace JOBot.TClient.Services;

 public class MenuService(ITelegramBotClient bot)
 {
-    public async Task RenderMenu(Update update, CancellationToken ct = default)
+    public Task RenderMenu(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
        
-        await bot.SendMessageRemK(update.Message.From.Id, "PrepareUser stage is done.", cancellationToken: ct);
+        bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
+        
+        return Task.CompletedTask;
    }
 }
--- a/JOBot.TClient/Services/PrepareUserService.cs
+++ b/JOBot.TClient/Services/PrepareUserService.cs
@ -1,6 +1,5 @@
 using JOBot.Proto;
 using JOBot.TClient.Infrastructure.Exceptions;
-using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 using User = JOBot.Proto.User;
@ -19,7 +18,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    /// <param name="ct">Cancellation Token</param>
    /// <returns>RPC User Response</returns>
    /// <exception cref="FallbackException">If something in server logic went wrong</exception>
-    /// <exception cref="ArgumentNullException">update.Message is null</exception>
+    /// <exception cref="ArgumentNullException">If update.Message is null</exception>
    public async Task<GetUserResponse> RegisterUser(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);
@ -27,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.SendMessageRemK(update.Message.Chat.Id,
+            await _bot.SendMessage(chatId: 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)
@ -55,12 +54,12 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
    /// </summary>
    /// <param name="update">Telegram Update object</param>
    /// <param name="ct">Cancellation Token</param>
-    /// <exception cref="ArgumentNullException">update.Message is null</exception>
+    /// <exception cref="ArgumentNullException">If update.Message is null</exception>
    public async Task AskForEulaAgreement(Update update, CancellationToken ct = default)
    {
        ArgumentNullException.ThrowIfNull(update.Message?.From);

-        await _bot.SendMessageRemK(
+        await _bot.SendMessage(
            update.Message.From.Id,
            TextResource.EULA,
            replyMarkup: new[] { ButtonResource.EULAAgrement }, cancellationToken: ct);
@ -75,47 +74,13 @@ 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 AcceptEulaRequest
+        var result = await _userClient.AcceptEulaAsync(new()
        {
            EulaAccepted = true,
-            UserId = update.Message.From.Id
+            UserId = update.Message.From.Id,
        });

        if (!result.Success)
            throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot);
    }
-
-    public async Task Auth(Update update, CancellationToken ct = default)
-    {
-        ArgumentNullException.ThrowIfNull(update.Message?.From);
-
-        var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest
-        {
-            UserId = update.Message.From.Id
-        });
-
-        await _bot.SendMessageRemK(
-            update.Message.From.Id,
-            string.Format(TextResource.AskForAuth, [url.RegistrationUrl]),
-            cancellationToken: ct);
-    }
-
-    public async Task AuthHookReceived(long userId, CancellationToken ct = default)
-    {
-        await _bot.SendMessageRemK(userId, "✅ Авторизация завершена успешно!", cancellationToken: ct);
-        await SelectCv(userId, ct);
-    }
-
-    public async Task SelectCv(Update update, CancellationToken ct = default)
-    {
-        ArgumentNullException.ThrowIfNull(update.Message?.From);
-        
-        await SelectCv(update.Message.From.Id, ct);
-    }
-
-    public async Task SelectCv(long userId, CancellationToken ct = default)
-    {
-        await _bot.SendMessageRemK(userId, "Давайте выберем одно из доступных резюме:",
-            cancellationToken: ct); //TODO: https://git.lisoveliy.su/Lisoveliy/JOBot/issues/9
-    }
 }
--- a/JOBot.TClient/Services/UserService.cs
+++ b/JOBot.TClient/Services/UserService.cs
@ -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,7 +36,6 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)

            return null;
        }
-
        return user;
    }
 }
--- a/JOBot.TClient/Startup.cs
+++ b/JOBot.TClient/Startup.cs
@ -1,87 +0,0 @@
-using Grpc.Core;
-using Grpc.Net.Client;
-using JOBot.Infrastructure.Config;
-using JOBot.Proto;
-using JOBot.TClient.Commands.Buttons;
-using JOBot.TClient.Commands.Commands;
-using JOBot.TClient.Core.HostedServices;
-using JOBot.TClient.Queues;
-using JOBot.TClient.Services;
-using JOBot.TClient.Statements;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Events;
-using Telegram.Bot;
-
-namespace JOBot.TClient;
-
-public static class Startup
-{
-    public static IServiceCollection ConfigureServices(this IServiceCollection services, IConfiguration config)
-    {
-        services.AddSingleton(config);
-
-        services.AddSingleton(_ => GrpcChannel.ForAddress(config.GetValue<string>("BackendHost")
-                                                ?? throw new MissingFieldException("Host is not defined")));
-
-        #region Commands
-
-        services.AddSingleton<StartCommand>();
-        services.AddSingleton<MenuCommand>();
-        services.AddSingleton<InfoCommand>();
-
-        //buttons
-        services.AddSingleton<EulaAgreementButtonCommand>();
-
-        #endregion
-
-        #region gRPC Clients
-
-        services.AddGrpcClient<User.UserClient>(o => o.Address = new Uri("http://backend:5001"));
-
-        #endregion
-
-        #region Services
-
-        services.AddSingleton<UserService>();
-        services.AddSingleton<PrepareUserService>();
-        services.AddSingleton<MenuService>();
-
-        #endregion
-
-        #region States
-
-        services.AddSingleton<PrepareUserState>();
-
-        #endregion
-
-        #region RabbitMQ Clients
-
-        var factory = new ConnectionFactory { HostName = "rabbitmq" };
-        var connection = factory.CreateConnectionAsync().Result;
-        var channel = connection.CreateChannelAsync().Result;
-
-        channel.QueueDeclareAsync(
-            RabbitQueues.AuthQueue,
-            false,
-            false,
-            false,
-            arguments: null).Wait();
-        
-        services.AddSingleton(channel);
-        services.AddHostedService<AuthQueue>();
-
-        #endregion
-
-        // Bot service
-        services.AddHostedService<BotBackgroundService>();
-        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/Statements/PrepareUserState.cs
+++ b/JOBot.TClient/Statements/PrepareUserState.cs
@ -1,6 +1,6 @@
-using JOBot.Proto;
 using JOBot.TClient.Services;
 using Telegram.Bot.Types;
+using User = JOBot.Proto.User;

 namespace JOBot.TClient.Statements;

@ -21,47 +21,27 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
            return; //interrupt while eula isn't accepted
        }
        
-        await OnUserEulaValidStage(user, update, ct);
+        await OnUserEulaValidStage(update, ct);
    }

    /// <summary>
    /// 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)
+    public async Task AcceptEula(Update update, CancellationToken ct = default)
    {
-        await prepareUserService.AcceptEula(update, ct);
-        await OnUserEulaValidStage(user, update, ct);
+        await prepareUserService.AcceptEula(update, ct: ct);
+        await OnUserEulaValidStage(update, ct);
    }
    
    /// <summary>
-    ///     Check user logged
+    /// Continue prepare stage
    /// </summary>
-    /// <param name="user"></param>
    /// <param name="update"></param>
    /// <param name="ct"></param>
-    private async Task OnUserEulaValidStage(GetUserResponse user, Update update, CancellationToken ct = default)
+    private async Task OnUserEulaValidStage(Update update, CancellationToken ct = default)
    {
-        if (!user.IsLogged)
-        {
-            await prepareUserService.Auth(update, ct);
-            return;
-        }
-
-        await OnAuthStage(user, update, ct);
-    }
-
-    /// <summary>
-    ///     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);
        await menuService.RenderMenu(update, ct); //boilerplate
    }
 }
--- a/JOBot.TClient/TextResource.Designer.cs
+++ b/JOBot.TClient/TextResource.Designer.cs
@ -59,15 +59,6 @@ namespace JOBot.TClient {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Авторизируйтесь на сайте HeadHunter для получения доступа к резюме и вакансиям {0}.
-        /// </summary>
-        public static string AskForAuth {
-            get {
-                return ResourceManager.GetString("AskForAuth", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Команда не найдена, попробуйте что-то другое.
        /// </summary>
--- a/JOBot.TClient/TextResource.resx
+++ b/JOBot.TClient/TextResource.resx
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <root>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
-                xmlns="">
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
        <xsd:element name="root" msdata:IsDataSet="true">
            
        </xsd:element>
@ -14,14 +13,10 @@
        <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>Продолжая, вы принимаете политику конфиденциальности и правила сервиса
@ -39,7 +34,4 @@ https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26
    <data name="Info" xml:space="preserve">
        <value>Это бот для упрощения поиска работы на HH.ru</value>
    </data>
-    <data name="AskForAuth" xml:space="preserve">
-        <value>Авторизируйтесь на сайте HeadHunter для получения доступа к резюме и вакансиям {0}</value>
-    </data>
 </root>
--- a/JOBot.sln
+++ b/JOBot.sln
@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.Backend", "JOBot.Back
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.TClient", "JOBot.TClient\JOBot.TClient.csproj", "{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.Infrastructure", "JOBot.Infrastructure\JOBot.Infrastructure.csproj", "{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -43,18 +41,6 @@ Global
 		{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}.Release|x64.Build.0 = Release|Any CPU
 		{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}.Release|x86.ActiveCfg = Release|Any CPU
 		{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}.Release|x86.Build.0 = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|x64.Build.0 = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Debug|x86.Build.0 = Debug|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|x64.ActiveCfg = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|x64.Build.0 = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|x86.ActiveCfg = Release|Any CPU
-		{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Proto/user.proto
+++ b/Proto/user.proto
@ -1,16 +1,14 @@
 syntax = "proto3";
 option csharp_namespace = "JOBot.Proto";

-import "google/protobuf/wrappers.proto";
-import "google/protobuf/empty.proto";
-
 service User {
 	rpc Register (RegisterRequest) returns (RegisterResponse);
 	rpc GetUser (GetUserRequest) returns (GetUserResponse);
 	rpc AcceptEula (AcceptEulaRequest) returns (AcceptEulaResponse);
-	rpc GetHeadHunterAuthHook(GetHeadHunterAuthHookRequest) returns (GetHeadHunterAuthHookResponse);
 }

+import "google/protobuf/wrappers.proto";
+
 message RegisterRequest{
 	int64 user_id = 1;
 	google.protobuf.StringValue username = 2;
@ -40,11 +38,3 @@ message AcceptEulaRequest {
 message AcceptEulaResponse{
 	bool success = 1;
 }
-
-message GetHeadHunterAuthHookRequest{
-	int64 user_id = 1;
-}
-
-message GetHeadHunterAuthHookResponse{
-	string registration_url = 1;
-}
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ Telegram-бот для автоматизации поиска работы че

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

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

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

@ -31,36 +31,30 @@ Telegram-бот для автоматизации поиска работы че
 ## 🚀 Запуск

 ### Требования
-
 - .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
@ -1,17 +1,6 @@
 version: '3.8'

 services:
-  rabbitmq:
-    hostname: jobot-rabbit
-    image: rabbitmq:4
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq/
-    networks:
-      - jobot
-
  postgres:
    image: postgres:15
    environment:
@ -20,7 +9,7 @@ services:
    ports:
      - "5432:5432"
    volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - ./.docker/postgres_data:/var/lib/postgresql/data
    networks:
      - jobot
  
@ -30,9 +19,7 @@ services:
      dockerfile: JOBot.Backend/Dockerfile
    depends_on:
      - postgres
-      - rabbitmq
    ports:
-      - "5000:5000"
      - "5001:5001"
    networks:
      - jobot
@ -48,7 +35,3 @@ services:

 networks:
  jobot:
-
-volumes:
-  postgres_data:
-  rabbitmq_data:
--- a/compose.yml
+++ b/compose.yml
@ -1,21 +1,13 @@
 version: '3.8'

 services:
-  rabbitmq:
-    hostname: jobot-rabbit
-    image: rabbitmq:4
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq/
-    networks:
-      - jobot
-  
  postgres:
    image: postgres:15
    environment:
      POSTGRES_PASSWORD: LocalDbPass
      POSTGRES_DB: jobot
    volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - ./.docker/postgres_data:/var/lib/postgresql/data
    networks:
      - jobot
  
@ -25,9 +17,6 @@ services:
      dockerfile: JOBot.Backend/Dockerfile
    depends_on:
      - postgres
-      - rabbitmq
-    ports:
-      - "5000:5000"
    networks:
      - jobot
  
@ -42,8 +31,3 @@ services:

 networks:
  jobot:
-
-
-volumes:
-  postgres_data:
-  rabbitmq_data: