Lisoveliy/JOBot
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: Lisoveliy:main
Branches Tags
Lisoveliy:main
Lisoveliy:8
Lisoveliy:dev
Lisoveliy:7
Lisoveliy:1
Lisoveliy:lisoveliy-patch-2
Lisoveliy:lisoveliy-patch-1
Lisoveliy:14
Lisoveliy:10
Lisoveliy:docs
Lisoveliy:fix_build
..
compare: Lisoveliy:14
Branches Tags
Lisoveliy:8
Lisoveliy:main
Lisoveliy:dev
Lisoveliy:7
Lisoveliy:1
Lisoveliy:lisoveliy-patch-2
Lisoveliy:lisoveliy-patch-1
Lisoveliy:14
Lisoveliy:10
Lisoveliy:docs
Lisoveliy:fix_build

No commits in common. "main" and "14" have entirely different histories.
main ... 14

43 changed files with 244 additions and 770 deletions
Show Stats Expand all files Collapse all files

24
.gitea/workflows/deploy-dev.yml
View File

@ -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

1
.gitignore vendored
View File

@ -404,7 +404,6 @@ FodyWeavers.xsd
.docker .docker
# Secrets # Secrets
JOBot.Backend/appsettings.Development.json
JOBot.TClient/appsettings.json JOBot.TClient/appsettings.json
/.idea/.idea.JOBot/Docker/compose.generated.override.yml /.idea/.idea.JOBot/Docker/compose.generated.override.yml
/.idea/.idea.JOBot/Docker/compose.dev.generated.override.yml /.idea/.idea.JOBot/Docker/compose.dev.generated.override.yml

22
JOBot.Backend/Controllers/HeadHunterHookController.cs
View File

@ -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
};
}
}

8
JOBot.Backend/DAL/Context/AppDbContext.cs
View File

@ -1,14 +1,14 @@
using JOBot.Backend.DAL.Models;
using Microsoft.EntityFrameworkCore;
namespace JOBot.Backend.DAL.Context; namespace JOBot.Backend.DAL.Context;
using Models;
using Microsoft.EntityFrameworkCore;
public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options) public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
{ {
public DbSet<User> Users { get; set; } public DbSet<User> Users { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)
{ {
base.OnModelCreating(modelBuilder); base.OnModelCreating(modelBuilder);
modelBuilder.Entity<User>() modelBuilder.Entity<User>()

10
JOBot.Backend/DAL/Models/User.cs
View File

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

14
JOBot.Backend/DTOs/HeadHunterHook/HeadHunterTokenResponseDto.cs
View File

@ -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
);

1
JOBot.Backend/Dockerfile
View File

@ -10,4 +10,5 @@ WORKDIR /app
COPY --from=build /app . COPY --from=build /app .
EXPOSE 5001 EXPOSE 5001
EXPOSE 5000 EXPOSE 5000
ENV ASPNETCORE_ENVIRONMENT Staging
ENTRYPOINT ["dotnet", "JOBot.Backend.dll"] ENTRYPOINT ["dotnet", "JOBot.Backend.dll"]

18
JOBot.Backend/Infrastructure/Config/HeadHunterConfig.cs
View File

@ -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; }
}
}

56
JOBot.Backend/JOBot.Backend.csproj
View File

@ -1,38 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.30.2"/> <PackageReference Include="Google.Protobuf" Version="3.30.2" />
<PackageReference Include="Grpc.AspNetCore" Version="2.71.0"/> <PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
<PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.71.0"/> <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.71.0" />
<PackageReference Include="Grpc.Tools" Version="2.71.0"> <PackageReference Include="Grpc.Tools" Version="2.71.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PrivateAssets>all</PrivateAssets>
<PrivateAssets>all</PrivateAssets> </PackageReference>
</PackageReference> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4"/> </ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="7.1.2"/>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Protobuf Include="..\Proto\*" GrpcServices="Server"></Protobuf> <Protobuf Include="..\Proto\*" GrpcServices="Server"></Protobuf>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Data\Migrations\"/> <Folder Include="Data\Migrations\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
</ItemGroup>
</Project> </Project>

136
JOBot.Backend/Services/HeadHunterService.cs
View File

@ -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();
}
}

20
JOBot.Backend/Services/gRPC/UserService.cs
View File

@ -7,10 +7,10 @@ using User = JOBot.Backend.DAL.Models.User;
namespace JOBot.Backend.Services.gRPC; namespace JOBot.Backend.Services.gRPC;
public class UserService(AppDbContext dbContext, HeadHunterService hhService) : Proto.User.UserBase public class UserService(AppDbContext dbContext) : Proto.User.UserBase
{ {
/// <summary> /// <summary>
/// Create user /// Create user
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="_"></param> /// <param name="_"></param>
@ -31,7 +31,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
} }
/// <summary> /// <summary>
/// Get user for client /// Get user for client
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="_"></param> /// <param name="_"></param>
@ -45,7 +45,7 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
} }
/// <summary> /// <summary>
/// Accept EULA for user /// Accept EULA for user
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="_"></param> /// <param name="_"></param>
@ -62,18 +62,8 @@ public class UserService(AppDbContext dbContext, HeadHunterService hhService) :
return new AcceptEulaResponse { Success = true }; 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> /// <summary>
/// Throw RPCException if user not found /// Throw RPCException if user not found
/// </summary> /// </summary>
/// <param name="user"></param> /// <param name="user"></param>
/// <exception cref="RpcException"></exception> /// <exception cref="RpcException"></exception>

39
JOBot.Backend/Startup.cs
View File

@ -1,53 +1,30 @@
using JOBot.Backend.DAL.Context; using JOBot.Backend.DAL.Context;
using JOBot.Backend.Infrastructure.Config;
using JOBot.Backend.Services;
using JOBot.Backend.Services.gRPC; using JOBot.Backend.Services.gRPC;
using JOBot.Infrastructure.Config;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using RabbitMQ.Client;
namespace JOBot.Backend; 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) public void ConfigureServices(IServiceCollection services)
{ {
services.AddGrpc(); services.AddGrpc();
services.AddGrpcReflection(); services.AddGrpcReflection();
services.AddControllers();
services.AddLogging();
services.AddDbContext<AppDbContext>(options => services.AddDbContext<AppDbContext>(options =>
options.UseNpgsql(Configuration.GetConnectionString("PostgreSQL"))); 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) public void Configure(WebApplication app, IWebHostEnvironment env)
{ {
app.MapGrpcReflectionService().AllowAnonymous(); app.MapGrpcReflectionService().AllowAnonymous();
app.MapGrpcService<UserService>(); app.MapGrpcService<UserService>();
app.MapControllers();
} }
} }

11
JOBot.Backend/appsettings.Development.json Normal file
View File

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

12
JOBot.Backend/appsettings.Staging.json Normal file
View File

@ -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"
}
}

51
JOBot.Backend/appsettings.json
View File

@ -1,35 +1,24 @@
{ {
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft.AspNetCore": "Warning" "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": "", "AllowedHosts": "*",
"Secret": "" "ConnectionStrings": {
}, "PostgreSQL": "Host=postgres;Port=5432;Database=jobot;Username=postgres;Password=LocalDbPass"
"Kestrel": { },
"Endpoints": { "Kestrel": {
"gRPC": { "Endpoints": {
"Url": "http://*:5001", "gRPC": {
"Protocols": "Http2" "Url": "http://*:5001",
}, "Protocols": "Http2"
"REST": { },
"Url": "http://*:5000", "REST": {
"Protocols": "Http1" "Url": "http://*:5000",
} "Protocols": "Http1"
}
}
} }
}
} }

6
JOBot.Infrastructure/Config/RabbitQueues.cs
View File

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

9
JOBot.Infrastructure/JOBot.Infrastructure.csproj
View File

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

13
JOBot.TClient/ButtonResource.resx
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
xmlns="">
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>
<resheader name="resmimetype"> <resheader name="resmimetype">
@ -14,14 +13,10 @@
<value>1.3</value> <value>1.3</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<data name="EULAAgrement" xml:space="preserve"> <data name="EULAAgrement" xml:space="preserve">
<value>Соглашаюсь с условиями использования ✅</value> <value>Соглашаюсь с условиями использования ✅</value>

5
JOBot.TClient/Commands/Buttons/EulaAgreementButtonCommand.cs
View File

@ -1,7 +1,9 @@
using JOBot.Proto; using JOBot.Proto;
using JOBot.TClient.Infrastructure.Attributes.Authorization; using JOBot.TClient.Infrastructure.Attributes.Authorization;
using JOBot.TClient.Services;
using JOBot.TClient.Statements; using JOBot.TClient.Statements;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using Telegram.Bot.Types.Enums;
namespace JOBot.TClient.Commands.Buttons; 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) public async Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct)
{ {
if (!user.Eula) await prepareUserState.AcceptEula(update, ct);
await prepareUserState.AcceptEula(user, update, ct);
} }
} }

5
JOBot.TClient/Commands/Commands/InfoCommand.cs
View File

@ -1,4 +1,3 @@
using JOBot.TClient.Infrastructure.Extensions;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
@ -9,7 +8,7 @@ public class InfoCommand(ITelegramBotClient bot) : ITelegramCommand
public async Task ExecuteAsync(Update update, CancellationToken ct) public async Task ExecuteAsync(Update update, CancellationToken ct)
{ {
ArgumentNullException.ThrowIfNull(update.Message?.From); 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);
} }
} }

11
JOBot.TClient/Commands/IAuthorizedTelegramCommand.cs
View File

@ -1,18 +1,17 @@
using JOBot.Proto; using JOBot.Proto;
using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
namespace JOBot.TClient.Commands; namespace JOBot.TClient.Commands;
public interface IAuthorizedTelegramCommand : ITelegramCommand public interface IAuthorizedTelegramCommand : ITelegramCommand
{ {
/// <exception cref="UnauthorizedAccessException"> public Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct);
/// Throws if you try to use ITelegramCommand.ExecuteAsync
/// instead of IAuthorizedTelegramCommand.ExecuteAsync /// <exception cref="UnauthorizedAccessException">Throws if you try to use ITelegramCommand.ExecuteAsync
/// </exception> /// instead of IAuthorizedTelegramCommand.ExecuteAsync</exception>
Task ITelegramCommand.ExecuteAsync(Update update, CancellationToken ct) Task ITelegramCommand.ExecuteAsync(Update update, CancellationToken ct)
{ {
throw new UnauthorizedAccessException("You do not have permission to access this command."); throw new UnauthorizedAccessException("You do not have permission to access this command.");
} }
public Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct);
} }

15
JOBot.TClient/Core/HostedServices/BotBackgroundService.cs
View File

@ -5,10 +5,10 @@ using JOBot.TClient.Infrastructure.Attributes.Authorization;
using JOBot.TClient.Infrastructure.Extensions; using JOBot.TClient.Infrastructure.Extensions;
using JOBot.TClient.Services; using JOBot.TClient.Services;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using Microsoft.Extensions.Hosting;
namespace JOBot.TClient.Core.HostedServices; namespace JOBot.TClient.Core.HostedServices;
@ -22,8 +22,8 @@ public sealed class BotBackgroundService(
protected override Task ExecuteAsync(CancellationToken stoppingToken) protected override Task ExecuteAsync(CancellationToken stoppingToken)
{ {
botClient.StartReceiving( botClient.StartReceiving(
HandleUpdateAsync, updateHandler: HandleUpdateAsync,
HandleErrorAsync, errorHandler: HandleErrorAsync,
cancellationToken: stoppingToken); cancellationToken: stoppingToken);
return Task.CompletedTask; return Task.CompletedTask;
@ -40,7 +40,7 @@ public sealed class BotBackgroundService(
["/info"] = scope.ServiceProvider.GetRequiredService<InfoCommand>(), ["/info"] = scope.ServiceProvider.GetRequiredService<InfoCommand>(),
//Buttons //Buttons
[ButtonResource.EULAAgrement] = scope.ServiceProvider.GetRequiredService<EulaAgreementButtonCommand>() [ButtonResource.EULAAgrement] = scope.ServiceProvider.GetRequiredService<EulaAgreementButtonCommand>(),
}; };
if (update.Message is { Text: { } text, From: not null }) if (update.Message is { Text: { } text, From: not null })
@ -69,15 +69,12 @@ public sealed class BotBackgroundService(
await authorizedTelegramCommand.ExecuteAsync(update, user, ct); await authorizedTelegramCommand.ExecuteAsync(update, user, ct);
} }
else else await command.ExecuteAsync(update, ct);
{
await command.ExecuteAsync(update, ct);
}
return; return;
} }
await bot.SendMessageRemK(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct); await bot.SendMessage(update.Message.From.Id, TextResource.CommandNotFound, cancellationToken: ct);
} }
} }

57
JOBot.TClient/DependencyInjection.cs Normal file
View File

@ -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;
}
}

3
JOBot.TClient/Infrastructure/Attributes/Authorization/AcceptNotPreparedAttribute.cs
View File

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

7
JOBot.TClient/Infrastructure/Exceptions/FallbackException.cs
View File

@ -1,18 +1,17 @@
using JOBot.TClient.Infrastructure.Extensions;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
namespace JOBot.TClient.Infrastructure.Exceptions; namespace JOBot.TClient.Infrastructure.Exceptions;
/// <summary> /// <summary>
/// Exception for fallback /// Exception for fallback
/// WARNING: Don't create new exception without throwing it /// WARNING: Don't create new exception without throwing it
/// </summary> /// </summary>
public class FallbackException : Exception public class FallbackException : Exception
{ {
public FallbackException(string message, Message botMessage, ITelegramBotClient botClient) : base(message) public FallbackException(string message, Message botMessage, ITelegramBotClient botClient) : base(message)
{ {
botClient.SendMessageRemK(botMessage.Chat.Id, botClient.SendMessage(chatId: botMessage.Chat.Id,
TextResource.FallbackMessage); TextResource.FallbackMessage);
} }
} }

7
JOBot.TClient/Infrastructure/Extensions/GRpcModelsExtensions.cs
View File

@ -4,9 +4,6 @@ namespace JOBot.TClient.Infrastructure.Extensions;
public static class GRpcModelsExtensions public static class GRpcModelsExtensions
{ {
public static bool IsPrepared(this GetUserResponse user) public static bool IsPrepared(this GetUserResponse user) => user is { Eula: true, IsLogged: true } &&
{ !string.IsNullOrEmpty(user.CVUrl);
return user is { Eula: true, IsLogged: true } &&
!string.IsNullOrEmpty(user.CVUrl);
}
} }

52
JOBot.TClient/Infrastructure/Extensions/TelegramBotClientExtensions.cs
View File

@ -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);
}
}

11
JOBot.TClient/JOBot.TClient.csproj
View File

@ -20,7 +20,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4"/> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4"/> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4"/>
<PackageReference Include="Microsoft.Extensions.Hosting" 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"/> <PackageReference Include="Telegram.Bot" Version="22.5.1"/>
</ItemGroup> </ItemGroup>
@ -58,14 +57,4 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JOBot.Infrastructure\JOBot.Infrastructure.csproj" />
</ItemGroup>
</Project> </Project>

1
JOBot.TClient/Program.cs
View File

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

24
JOBot.TClient/Queues/AuthQueue.cs
View File

@ -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);
}
}

10
JOBot.TClient/Services/MenuService.cs
View File

@ -1,15 +1,17 @@
using JOBot.TClient.Infrastructure.Extensions;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using User = JOBot.Proto.User;
namespace JOBot.TClient.Services; namespace JOBot.TClient.Services;
public class MenuService(ITelegramBotClient bot) 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); 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;
} }
} }

59
JOBot.TClient/Services/PrepareUserService.cs
View File

@ -1,6 +1,5 @@
using JOBot.Proto; using JOBot.Proto;
using JOBot.TClient.Infrastructure.Exceptions; using JOBot.TClient.Infrastructure.Exceptions;
using JOBot.TClient.Infrastructure.Extensions;
using Telegram.Bot; using Telegram.Bot;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using User = JOBot.Proto.User; using User = JOBot.Proto.User;
@ -13,13 +12,13 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
private readonly User.UserClient _userClient = userClient; private readonly User.UserClient _userClient = userClient;
/// <summary> /// <summary>
/// Get or register user on system /// Get or register user on system
/// </summary> /// </summary>
/// <param name="update">Telegram Update object</param> /// <param name="update">Telegram Update object</param>
/// <param name="ct">Cancellation Token</param> /// <param name="ct">Cancellation Token</param>
/// <returns>RPC User Response</returns> /// <returns>RPC User Response</returns>
/// <exception cref="FallbackException">If something in server logic went wrong</exception> /// <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) public async Task<GetUserResponse> RegisterUser(Update update, CancellationToken ct = default)
{ {
ArgumentNullException.ThrowIfNull(update.Message?.From); ArgumentNullException.ThrowIfNull(update.Message?.From);
@ -27,21 +26,21 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
var result = await _userClient.RegisterAsync(new RegisterRequest var result = await _userClient.RegisterAsync(new RegisterRequest
{ {
UserId = update.Message.From.Id, UserId = update.Message.From.Id,
Username = update.Message.From.Username Username = update.Message.From.Username,
}); });
if (!result.Success) if (!result.Success)
{ {
await _bot.SendMessageRemK(update.Message.Chat.Id, await _bot.SendMessage(chatId: update.Message.Chat.Id,
TextResource.FallbackMessage, TextResource.FallbackMessage,
cancellationToken: ct); cancellationToken: ct);
throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot); 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) if (user == null)
@ -51,23 +50,23 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
} }
/// <summary> /// <summary>
/// Get Eula Agreement from user /// Get Eula Agreement from user
/// </summary> /// </summary>
/// <param name="update">Telegram Update object</param> /// <param name="update">Telegram Update object</param>
/// <param name="ct">Cancellation Token</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) public async Task AskForEulaAgreement(Update update, CancellationToken ct = default)
{ {
ArgumentNullException.ThrowIfNull(update.Message?.From); ArgumentNullException.ThrowIfNull(update.Message?.From);
await _bot.SendMessageRemK( await _bot.SendMessage(
update.Message.From.Id, update.Message.From.Id,
TextResource.EULA, TextResource.EULA,
replyMarkup: new[] { ButtonResource.EULAAgrement }, cancellationToken: ct); replyMarkup: new[] { ButtonResource.EULAAgrement }, cancellationToken: ct);
} }
/// <summary> /// <summary>
/// Accept EULA for user /// Accept EULA for user
/// </summary> /// </summary>
/// <param name="update">Telegram update object</param> /// <param name="update">Telegram update object</param>
/// <param name="ct">Cancellation Token</param> /// <param name="ct">Cancellation Token</param>
@ -75,47 +74,13 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
public async Task AcceptEula(Update update, CancellationToken ct = default) public async Task AcceptEula(Update update, CancellationToken ct = default)
{ {
ArgumentNullException.ThrowIfNull(update.Message?.From); ArgumentNullException.ThrowIfNull(update.Message?.From);
var result = await _userClient.AcceptEulaAsync(new AcceptEulaRequest var result = await _userClient.AcceptEulaAsync(new()
{ {
EulaAccepted = true, EulaAccepted = true,
UserId = update.Message.From.Id UserId = update.Message.From.Id,
}); });
if (!result.Success) if (!result.Success)
throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot); 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
}
} }

5
JOBot.TClient/Services/UserService.cs
View File

@ -10,7 +10,7 @@ namespace JOBot.TClient.Services;
public class UserService(ITelegramBotClient bot, User.UserClient userClient) public class UserService(ITelegramBotClient bot, User.UserClient userClient)
{ {
/// <summary> /// <summary>
/// Get user /// Get user
/// </summary> /// </summary>
/// <param name="update">Telegram Update object</param> /// <param name="update">Telegram Update object</param>
/// <param name="ct">Cancellation Token</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() //Получаем пользователя user = await userClient.GetUserAsync(new GetUserRequest() //Получаем пользователя
{ {
UserId = update.Message.From.Id UserId = update.Message.From.Id,
}); });
} }
catch (RpcException e) //Пользователь не найден? catch (RpcException e) //Пользователь не найден?
@ -36,7 +36,6 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)
return null; return null;
} }
return user; return user;
} }
} }

87
JOBot.TClient/Startup.cs
View File

@ -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;
}
}

42
JOBot.TClient/Statements/PrepareUserState.cs
View File

@ -1,13 +1,13 @@
using JOBot.Proto;
using JOBot.TClient.Services; using JOBot.TClient.Services;
using Telegram.Bot.Types; using Telegram.Bot.Types;
using User = JOBot.Proto.User;
namespace JOBot.TClient.Statements; namespace JOBot.TClient.Statements;
public class PrepareUserState(PrepareUserService prepareUserService, MenuService menuService) public class PrepareUserState(PrepareUserService prepareUserService, MenuService menuService)
{ {
/// <summary> /// <summary>
/// Try to prepare user if is not registered /// Try to prepare user if is not registered
/// </summary> /// </summary>
/// <param name="update">Update telegram object</param> /// <param name="update">Update telegram object</param>
/// <param name="ct">Cancellation token</param> /// <param name="ct">Cancellation token</param>
@ -20,48 +20,28 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
await prepareUserService.AskForEulaAgreement(update, ct); await prepareUserService.AskForEulaAgreement(update, ct);
return; //interrupt while eula isn't accepted return; //interrupt while eula isn't accepted
} }
await OnUserEulaValidStage(user, update, ct); await OnUserEulaValidStage(update, ct);
} }
/// <summary> /// <summary>
/// Signal for accepted eula /// Signal for accepted eula
/// </summary> /// </summary>
/// <param name="user"></param>
/// <param name="update"></param> /// <param name="update"></param>
/// <param name="ct"></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 prepareUserService.AcceptEula(update, ct: ct);
await OnUserEulaValidStage(user, update, ct); await OnUserEulaValidStage(update, ct);
} }
/// <summary> /// <summary>
/// Check user logged /// Continue prepare stage
/// </summary> /// </summary>
/// <param name="user"></param>
/// <param name="update"></param> /// <param name="update"></param>
/// <param name="ct"></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 await menuService.RenderMenu(update, ct); //boilerplate
} }
} }

16
JOBot.TClient/TextResource.Designer.cs generated
View File

@ -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> /// <summary>
/// Looks up a localized string similar to Команда не найдена, попробуйте что-то другое. /// Looks up a localized string similar to Команда не найдена, попробуйте что-то другое.
/// </summary> /// </summary>
@ -78,11 +69,8 @@ namespace JOBot.TClient {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Продолжая, вы принимаете политику конфиденциальности и правила сервиса /// Looks up a localized string similar to Продолжая, вы принимаете политику конфиденциальности и правила сервиса \nhttps://hh.ru/article/personal_data?backurl=%2F&amp;role=applicant
/// ///\nhttps://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&amp;role=applicant&quot;.
///https://hh.ru/article/personal_data?backurl=%2F&amp;role=applicant
///
///https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&amp;role=applicant&quot;.
/// </summary> /// </summary>
public static string EULA { public static string EULA {
get { get {

23
JOBot.TClient/TextResource.resx
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
xmlns="">
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>
<resheader name="resmimetype"> <resheader name="resmimetype">
@ -14,21 +13,14 @@
<value>1.3</value> <value>1.3</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<data name="EULA" xml:space="preserve"> <data name="EULA" xml:space="preserve">
<value>Продолжая, вы принимаете политику конфиденциальности и правила сервиса <value>Продолжая, вы принимаете политику конфиденциальности и правила сервиса \nhttps://hh.ru/article/personal_data?backurl=%2F&amp;role=applicant
\nhttps://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&amp;role=applicant"</value>
https://hh.ru/article/personal_data?backurl=%2F&amp;role=applicant
https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&amp;role=applicant"</value>
</data> </data>
<data name="FallbackMessage" xml:space="preserve"> <data name="FallbackMessage" xml:space="preserve">
<value>Something went REALLY wrong. Service can't continue process.</value> <value>Something went REALLY wrong. Service can't continue process.</value>
@ -39,7 +31,4 @@ https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26
<data name="Info" xml:space="preserve"> <data name="Info" xml:space="preserve">
<value>Это бот для упрощения поиска работы на HH.ru</value> <value>Это бот для упрощения поиска работы на HH.ru</value>
</data> </data>
<data name="AskForAuth" xml:space="preserve">
<value>Авторизируйтесь на сайте HeadHunter для получения доступа к резюме и вакансиям {0}</value>
</data>
</root> </root>

14
JOBot.sln
View File

@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.Backend", "JOBot.Back
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.TClient", "JOBot.TClient\JOBot.TClient.csproj", "{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.TClient", "JOBot.TClient\JOBot.TClient.csproj", "{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JOBot.Infrastructure", "JOBot.Infrastructure\JOBot.Infrastructure.csproj", "{32006B71-E6F7-4264-A8B4-AC3A6B77CC54}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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|x64.Build.0 = Release|Any CPU
{4526BCB1-DAD3-430C-BD7C-9C114DFE9A2A}.Release|x86.ActiveCfg = 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 {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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

14
Proto/user.proto
View File

@ -1,16 +1,14 @@
syntax = "proto3"; syntax = "proto3";
option csharp_namespace = "JOBot.Proto"; option csharp_namespace = "JOBot.Proto";
import "google/protobuf/wrappers.proto";
import "google/protobuf/empty.proto";
service User { service User {
rpc Register (RegisterRequest) returns (RegisterResponse); rpc Register (RegisterRequest) returns (RegisterResponse);
rpc GetUser (GetUserRequest) returns (GetUserResponse); rpc GetUser (GetUserRequest) returns (GetUserResponse);
rpc AcceptEula (AcceptEulaRequest) returns (AcceptEulaResponse); rpc AcceptEula (AcceptEulaRequest) returns (AcceptEulaResponse);
rpc GetHeadHunterAuthHook(GetHeadHunterAuthHookRequest) returns (GetHeadHunterAuthHookResponse);
} }
import "google/protobuf/wrappers.proto";
message RegisterRequest{ message RegisterRequest{
int64 user_id = 1; int64 user_id = 1;
google.protobuf.StringValue username = 2; google.protobuf.StringValue username = 2;
@ -39,12 +37,4 @@ message AcceptEulaRequest {
message AcceptEulaResponse{ message AcceptEulaResponse{
bool success = 1; bool success = 1;
}
message GetHeadHunterAuthHookRequest{
int64 user_id = 1;
}
message GetHeadHunterAuthHookResponse{
string registration_url = 1;
} }

54
README.md
View File

@ -5,62 +5,58 @@ Telegram-бот для автоматизации поиска работы че
## 🔥 Возможности ## 🔥 Возможности
Привяжите аккаунт HeadHunter для доступа к резюме и вакансиям. - **Авторизация через HH**
Привяжите аккаунт HeadHunter для доступа к резюме и вакансиям.
- **Отклик по предпочтениям** - **Умные отклики**
Выбор откликаемых вакансий по предпочтениям.
- **Умные отклики**
Автоматическая отправка откликов на подходящие вакансии. Автоматическая отправка откликов на подходящие вакансии.
- **Проверка резюме** - **Проверка резюме**
Уведомления, если резюме требует обновления.
Правка резюме, под ваши приоритеты. - **Аналитика**
- **Аналитика**
Статистика по откликам и приглашениям. Статистика по откликам и приглашениям.
## 🛠 Технологии ## 🛠 Технологии
- **Backend**: .NET 8 + gRPC - **Backend**: .NET 8 + gRPC
- **Frontend** Telegram клиент через Telegram.Bot - **База данных**: PostgreSQL
- **БД**: PostgreSQL - **Авторизация**: OAuth 2.0 (HH API)
- **Авторизация**: OAuth 2.0 (HH API), Telegram API - **Инфраструктура**: Docker + Kubernetes (опционально)
- **Инфраструктура**: Docker / Docker compose
## 🚀 Запуск ## 🚀 Запуск
### Требования ### Требования
- .NET 8 SDK - .NET 8 SDK
- Docker (для работы с БД) - Docker (для работы с БД)
- Аккаунт разработчика на [dev.hh.ru](https://dev.hh.ru) - Аккаунт разработчика на [dev.hh.ru](https://dev.hh.ru)
### 1. Настройка конфигурации ### 1. Настройка конфигурации
Создайте `appsettings.json` в `JOBot.TClient` на основе `appsettings.Example.json` Создайте `appsettings.json` в `JOBot.TClient` на основе `appsettings.Example.json`
### 2. Запуск через Docker ### 2. Запуск через Docker
``` ```
docker-compose up -d --build docker-compose up -d
dotnet run --project JoBot.Backend
dotnet run --project JoBot.Client
``` ```
## 📌 Команды бота ## 📌 Команды бота
|Команда|Описание|
|-------|--------|
|/start |Начало работы|
|/connect_hh|Привязать аккаунт HH|
|/jobs |Поиск вакансий|
|/profile|Проверить резюме|
|/stats |Статистика откликов|
| Команда | Описание | ## 🔒 Безопасность
|---------|----------------------------------------------| Токены пользователей шифруются (AES-256)
| /start | Начало работы |
| /menu | Настройка откликов и резюме по предпочтениям | Все данные передаются через HTTPS
| /info | Информация о боте |
📄 Лицензия 📄 Лицензия
MIT License. Подробнее в файле LICENSE. MIT License. Подробнее в файле LICENSE.
## Отказ от ответственности ## Отказ от ответственности
Продолжая, вы принимаете [политику конфиденциальности](https://hh.ru/article/personal_data?backurl=%2F&role=applicant) Продолжая, вы принимаете [политику конфиденциальности](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/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26role%3Dapplicant&role=applicant)
hh.ru
Этот сервис никак не связан с HeadHunter™ (далее hh.ru), не выдаёт себя за hh.ru и не является hh.ru Этот сервис никак не связан с HeadHunter™ (далее hh.ru), не выдаёт себя за hh.ru и не является hh.ru

21
compose.dev.yml
View File

@ -1,17 +1,6 @@
version: '3.8' version: '3.8'
services: services:
rabbitmq:
hostname: jobot-rabbit
image: rabbitmq:4
ports:
- "5672:5672"
- "15672:15672"
volumes:
- rabbitmq_data:/var/lib/rabbitmq/
networks:
- jobot
postgres: postgres:
image: postgres:15 image: postgres:15
environment: environment:
@ -20,7 +9,7 @@ services:
ports: ports:
- "5432:5432" - "5432:5432"
volumes: volumes:
- postgres_data:/var/lib/postgresql/data - ./.docker/postgres_data:/var/lib/postgresql/data
networks: networks:
- jobot - jobot
@ -30,9 +19,7 @@ services:
dockerfile: JOBot.Backend/Dockerfile dockerfile: JOBot.Backend/Dockerfile
depends_on: depends_on:
- postgres - postgres
- rabbitmq
ports: ports:
- "5000:5000"
- "5001:5001" - "5001:5001"
networks: networks:
- jobot - jobot
@ -47,8 +34,4 @@ services:
- jobot - jobot
networks: networks:
jobot: jobot:
volumes:
postgres_data:
rabbitmq_data:

20
compose.yml
View File

@ -1,21 +1,13 @@
version: '3.8' version: '3.8'
services: services:
rabbitmq:
hostname: jobot-rabbit
image: rabbitmq:4
volumes:
- rabbitmq_data:/var/lib/rabbitmq/
networks:
- jobot
postgres: postgres:
image: postgres:15 image: postgres:15
environment: environment:
POSTGRES_PASSWORD: LocalDbPass POSTGRES_PASSWORD: LocalDbPass
POSTGRES_DB: jobot POSTGRES_DB: jobot
volumes: volumes:
- postgres_data:/var/lib/postgresql/data - ./.docker/postgres_data:/var/lib/postgresql/data
networks: networks:
- jobot - jobot
@ -25,9 +17,6 @@ services:
dockerfile: JOBot.Backend/Dockerfile dockerfile: JOBot.Backend/Dockerfile
depends_on: depends_on:
- postgres - postgres
- rabbitmq
ports:
- "5000:5000"
networks: networks:
- jobot - jobot
@ -41,9 +30,4 @@ services:
- jobot - jobot
networks: networks:
jobot: jobot:
volumes:
postgres_data:
rabbitmq_data:

0
sad.proto Normal file
View File