Merge pull request '#7' (#28) from dev into main

Reviewed-on: #28

.gitea/workflows/deploy-dev.yml

@@ -20,6 +20,5 @@ jobs:
           docker compose -f compose.dev.yml up -d postgres
           
           cd /home/dockeruser/jobot-stack/JOBot.Backend
-          dotnet ef database update -- --environment Development
+          dotnet ef database update --connection "Host=localhost;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
           docker compose up --build -d
-          

.gitignore

@@ -404,6 +404,7 @@ 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

JOBot.Backend/Controllers/HeadHunterHookController.cs

@@ -8,7 +8,6 @@ namespace JOBot.Backend.Controllers;
 public class HeadHunterHookController(HeadHunterService hhService)
     : ControllerBase
 {
-
     [HttpGet]
     public async Task<IActionResult> Get(int userId, string? error, string code)
     {

JOBot.Backend/DAL/Context/AppDbContext.cs

@@ -1,8 +1,8 @@
-namespace JOBot.Backend.DAL.Context;
+using JOBot.Backend.DAL.Models;
-
-using Models;
 using Microsoft.EntityFrameworkCore;
 
+namespace JOBot.Backend.DAL.Context;
+
 public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
 {
     public DbSet<User> Users { get; set; }

JOBot.Backend/DAL/Models/User.cs

@@ -9,10 +9,10 @@ public class User
 {
     public Guid Id { get; set; }
 
-    [Key]
+    [Key] public required long UserId { get; set; }
-    public required long UserId { get; set; }
+
-    [MaxLength(255)]
+    [MaxLength(255)] public string? Username { get; set; }
-    public string? Username { get; set; }
+
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     [MaxLength(255)] public string? AccessToken { get; set; } = null;

JOBot.Backend/JOBot.Backend.csproj

@@ -20,6 +20,7 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4"/>
+        <PackageReference Include="RabbitMQ.Client" Version="7.1.2"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -30,4 +31,8 @@
         <Folder Include="Data\Migrations\"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
+    </ItemGroup>
+
 </Project>

JOBot.Backend/Services/HeadHunterService.cs

@@ -1,15 +1,31 @@
+using System.Text;
 using System.Text.Json;
-using System.Web;
 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(ILogger<HeadHunterService> logger, IOptions<HeadHunterConfig> config, AppDbContext dbContext)
+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>
@@ -19,11 +35,10 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
     /// <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...");
 
@@ -33,6 +48,9 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
             return Status.UserAuthRejectedError;
         }
 
+        HeadHunterTokenResponseDto? responseDto;
+        if (!env.IsDevelopment()) //Production server
+        {
             using var client = new HttpClient();
             var form = new Dictionary<string, string>
             {
@@ -65,7 +83,8 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
                 return Status.HeadHunterAuthRejectedError;
             }
 
-        var responseDto = JsonSerializer.Deserialize<HeadHunterTokenResponseDto>(await res.Content.ReadAsStringAsync());
+            responseDto =
+                JsonSerializer.Deserialize<HeadHunterTokenResponseDto>(await res.Content.ReadAsStringAsync());
 
             if (responseDto == null)
             {
@@ -73,6 +92,11 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
                                   $"{nameof(Status.HeadHunterResponseDeserializationFailedError)}");
                 return Status.HeadHunterResponseDeserializationFailedError;
             }
+        }
+        else
+        {
+            responseDto = new HeadHunterTokenResponseDto("testtoken", 0, "testtoken", "--");
+        }
 
         var user = await dbContext.Users.FirstOrDefaultAsync(x => x.UserId == userId);
 
@@ -88,6 +112,14 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
         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;
     }
 
@@ -101,13 +133,4 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
             Query = $"?userId={userId}"
         }.ToString();
     }
-
-    public enum Status
-    {
-        UserAuthRejectedError,
-        HeadHunterAuthRejectedError,
-        UserNotFoundError,
-        HeadHunterResponseDeserializationFailedError,
-        Success
-    }
 }

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;

JOBot.Backend/Startup.cs

@@ -2,7 +2,9 @@ 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;
 
@@ -20,6 +22,23 @@ public class Startup(IConfiguration configuration)
         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>();

JOBot.Backend/appsettings.Development.json

@@ -1,11 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "ConnectionStrings": {
-    "PostgreSQL": "Host=localhost;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
-  }
-}

JOBot.Infrastructure/Config/RabbitQueues.cs

@@ -0,0 +1,6 @@
+namespace JOBot.Infrastructure.Config;
+
+public static class RabbitQueues
+{
+    public const string AuthQueue = "auth";
+}

JOBot.Infrastructure/JOBot.Infrastructure.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>

JOBot.TClient/ButtonResource.resx

@@ -1,7 +1,8 @@
 <?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>
@@ -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>

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;
 

JOBot.TClient/Commands/Commands/InfoCommand.cs

@@ -1,3 +1,4 @@
+using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
@@ -9,6 +10,6 @@ public class InfoCommand(ITelegramBotClient bot) : ITelegramCommand
     {
         ArgumentNullException.ThrowIfNull(update.Message?.From);
 
-        await bot.SendMessage(update.Message.From.Id, TextResource.Info, cancellationToken: ct);
+        await bot.SendMessageRemK(update.Message.From.Id, TextResource.Info, cancellationToken: ct);
     }
 }

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
-    /// <exception cref="UnauthorizedAccessException">Throws if you try to use ITelegramCommand.ExecuteAsync
+    ///     instead of IAuthorizedTelegramCommand.ExecuteAsync
-    /// instead of IAuthorizedTelegramCommand.ExecuteAsync</exception>
+    /// </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);
 }

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,
+            HandleUpdateAsync,
-            errorHandler: HandleErrorAsync,
+            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,12 +69,15 @@ 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.SendMessage(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct);
+            await bot.SendMessageRemK(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct);
         }
     }
 

JOBot.TClient/DependencyInjection.cs

@@ -1,57 +0,0 @@
-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;
-    }
-}

JOBot.TClient/Infrastructure/Attributes/Authorization/AcceptNotPreparedAttribute.cs

@@ -1,4 +1,7 @@
 namespace JOBot.TClient.Infrastructure.Attributes.Authorization;
 
+/// <summary>
+///     Атрибут допуска к команде пользователя не завершившего стадию PrepareUser
+/// </summary>
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
 public class AcceptNotPreparedAttribute : Attribute;

JOBot.TClient/Infrastructure/Exceptions/FallbackException.cs

@@ -1,3 +1,4 @@
+using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
@@ -11,7 +12,7 @@ public class FallbackException : Exception
 {
     public FallbackException(string message, Message botMessage, ITelegramBotClient botClient) : base(message)
     {
-        botClient.SendMessage(chatId: botMessage.Chat.Id,
+        botClient.SendMessageRemK(botMessage.Chat.Id,
             TextResource.FallbackMessage);
     }
 }

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 } &&
+    public static bool IsPrepared(this GetUserResponse user)
+    {
+        return user is { Eula: true, IsLogged: true } &&
                !string.IsNullOrEmpty(user.CVUrl);
     }
+}

JOBot.TClient/Infrastructure/Extensions/TelegramBotClientExtensions.cs

@@ -0,0 +1,52 @@
+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);
+    }
+}

JOBot.TClient/JOBot.TClient.csproj

@@ -20,6 +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="Telegram.Bot" Version="22.5.1"/>
     </ItemGroup>
 
@@ -63,4 +64,8 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
+    </ItemGroup>
+
 </Project>

JOBot.TClient/Program.cs

@@ -6,7 +6,6 @@ var host = Host.CreateDefaultBuilder(args)
     {
         // Настройка DI
         services.ConfigureServices(context.Configuration);
-        
     })
     .Build();
 

JOBot.TClient/Queues/AuthQueue.cs

@@ -0,0 +1,24 @@
+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);
+    }
+}

JOBot.TClient/Services/MenuService.cs

@@ -1,6 +1,6 @@
+using JOBot.TClient.Infrastructure.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;
-using User = JOBot.Proto.User;
 
 namespace JOBot.TClient.Services;
 
@@ -10,6 +10,6 @@ public class MenuService(ITelegramBotClient bot)
     {
         ArgumentNullException.ThrowIfNull(update.Message?.From);
 
-        await bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
+        await bot.SendMessageRemK(update.Message.From.Id, "PrepareUser stage is done.", cancellationToken: ct);
     }
 }

JOBot.TClient/Services/PrepareUserService.cs

@@ -1,5 +1,6 @@
 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;
@@ -18,7 +19,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">If update.Message is null</exception>
+    /// <exception cref="ArgumentNullException">update.Message is null</exception>
     public async Task<GetUserResponse> RegisterUser(Update update, CancellationToken ct = default)
     {
         ArgumentNullException.ThrowIfNull(update.Message?.From);
@@ -26,21 +27,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.SendMessageRemK(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)
@@ -54,12 +55,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">If update.Message is null</exception>
+    /// <exception cref="ArgumentNullException">update.Message is null</exception>
     public async Task AskForEulaAgreement(Update update, CancellationToken ct = default)
     {
         ArgumentNullException.ThrowIfNull(update.Message?.From);
 
-        await _bot.SendMessage(
+        await _bot.SendMessageRemK(
             update.Message.From.Id,
             TextResource.EULA,
             replyMarkup: new[] { ButtonResource.EULAAgrement }, cancellationToken: ct);
@@ -74,10 +75,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)
@@ -88,14 +89,33 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
     {
         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(
+        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
+    }
 }

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,6 +36,7 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)
 
             return null;
         }
+
         return user;
     }
 }

JOBot.TClient/Startup.cs

@@ -0,0 +1,87 @@
+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;
+    }
+}

JOBot.TClient/Statements/PrepareUserState.cs

@@ -1,7 +1,6 @@
 using JOBot.Proto;
 using JOBot.TClient.Services;
 using Telegram.Bot.Types;
-using User = JOBot.Proto.User;
 
 namespace JOBot.TClient.Statements;
 
@@ -33,12 +32,12 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
     /// <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>
-    /// Continue prepare stage
+    ///     Check user logged
     /// </summary>
     /// <param name="user"></param>
     /// <param name="update"></param>
@@ -50,6 +49,19 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
             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
     }
 }

JOBot.TClient/TextResource.resx

@@ -1,7 +1,8 @@
 <?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>
@@ -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>Продолжая, вы принимаете политику конфиденциальности и правила сервиса

JOBot.sln

@@ -7,6 +7,8 @@ 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
@@ -41,6 +43,18 @@ 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

README.md

@@ -31,21 +31,25 @@ 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   | Информация о боте                            |
@@ -55,6 +59,8 @@ 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

compose.dev.yml

@@ -1,6 +1,17 @@
 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:
@@ -19,6 +30,7 @@ services:
       dockerfile: JOBot.Backend/Dockerfile
     depends_on:
       - postgres
+      - rabbitmq
     ports:
       - "5000:5000"
       - "5001:5001"
@@ -39,3 +51,4 @@ networks:
 
 volumes:
   postgres_data:
+  rabbitmq_data:

compose.yml

@@ -1,6 +1,14 @@
 version: '3.8'
 
 services:
+  rabbitmq:
+    hostname: jobot-rabbit
+    image: rabbitmq:4
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq/
+    networks:
+      - jobot
+  
   postgres:
     image: postgres:15
     environment:
@@ -17,6 +25,7 @@ services:
       dockerfile: JOBot.Backend/Dockerfile
     depends_on:
       - postgres
+      - rabbitmq
     ports:
       - "5000:5000"
     networks:
@@ -37,3 +46,4 @@ networks:
 
 volumes:
   postgres_data:
+  rabbitmq_data: