Have configured cache with redis, added handler to each response, fix…

…ed json settings, changed docker-compose.yml

WeatherBotApi.DatabaseApp/Core/DatabaseApp.Application/DependencyInjection.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using DatabaseApp.Application.Common.Behaviors;
 using DatabaseApp.Application.Common.Mapping;
+using DatabaseApp.Application.Users.Queries.GetAllUsers;
 using FluentValidation;
 using Mapster;
 using MapsterMapper;

WeatherBotApi.DatabaseApp/Infrastructure/DatabaseApp.IntegrationEvents/IntegrationEventHandlers/GetAllUsersRequestIntegrationEventHandler.cs

@@ -1,18 +1,20 @@
-using System.Text.Json;
 using DatabaseApp.Application.Users.Queries.GetAllUsers;
 using MediatR;
-using TelegramBotApp.Domain.Responses;
+using Microsoft.Extensions.DependencyInjection;
 using TelegramBotApp.Messaging.IntegrationContext;
 using TelegramBotApp.Messaging.IntegrationContext.UserIntegrationEvents;
+using TelegramBotApp.Messaging.IntegrationResponseContext.IntegrationResponses;
 
 namespace DatabaseApp.IntegrationEvents.IntegrationEventHandlers;
 
-public class GetAllUsersRequestIntegrationEventHandler(ISender mediator)
+public class GetAllUsersRequestIntegrationEventHandler(IServiceScopeFactory factory)
     : IIntegrationEventHandler<GetAllUsersRequestIntegrationEvent>
 {
-    public async Task<UniversalResponse?> Handle(GetAllUsersRequestIntegrationEvent @event)
+    public async Task<IResponseMessage?> Handle(GetAllUsersRequestIntegrationEvent @event)
     {
+        using var scope = factory.CreateScope();
+        var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
         var users = await mediator.Send(new GetAllUsersQuery());
-        return new(JsonSerializer.Serialize(users.Select(u => u.TelegramId)));
+        return new AllUsersResponse { UserTelegramIds = users.Select(u => u.TelegramId).ToList() };
     }
 }

WeatherBotApi.DatabaseApp/Presentation/DatabaseApp.WebApi/DatabaseApp.WebApi.csproj

@@ -20,6 +20,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\Core\DatabaseApp.Application\DatabaseApp.Application.csproj" />
+      <ProjectReference Include="..\..\Infrastructure\DatabaseApp.IntegrationEvents\DatabaseApp.IntegrationEvents.csproj" />
       <ProjectReference Include="..\..\Infrastructure\DatabaseApp.Persistence\DatabaseApp.Persistence.csproj" />
     </ItemGroup>
 

WeatherBotApi.DatabaseApp/Presentation/DatabaseApp.WebApi/Program.cs

@@ -1,11 +1,13 @@
 using System.Reflection;
 using DatabaseApp.Application;
+using DatabaseApp.IntegrationEvents;
 using DatabaseApp.Persistence;
 using DatabaseApp.Persistence.DatabaseContext;
 using DatabaseApp.WebApi.Middleware;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Any;
 using Serilog;
+using TelegramBotApp.Messaging;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -28,7 +30,7 @@
 builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
 builder.Services.AddProblemDetails();
 builder.Services.AddControllers();
-builder.Services.AddApplication().AddPersistence(builder.Configuration);
+builder.Services.AddApplication().AddPersistence(builder.Configuration).AddMessaging(builder.Configuration);
 
 var app = builder.Build();
 
@@ -54,6 +56,7 @@
     });
 }
 
+app.SubscribeToEvents();
 app.UseHttpsRedirection();
 app.UseExceptionHandler();
 app.UseSerilogRequestLogging();

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Application/TelegramBotApp.Application.csproj

@@ -14,6 +14,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\Infrastructure\TelegramBotApp.Messaging\TelegramBotApp.Messaging.csproj" />
+      <ProjectReference Include="..\TelegramBotApp.Domain\TelegramBotApp.Domain.csproj" />
     </ItemGroup>
 
 </Project>

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Application/TelegramBotContext/TelegramBot.cs

@@ -1,9 +1,9 @@
-using FluentResults;
 using Telegram.Bot;
 using Telegram.Bot.Exceptions;
 using Telegram.Bot.Polling;
 using Telegram.Bot.Types;
 using TelegramBotApp.Application.Factories;
+using TelegramBotApp.Domain.Models;
 using TelegramBotApp.Messaging;
 
 namespace TelegramBotApp.Application.TelegramBotContext;
@@ -83,6 +83,7 @@ ApiRequestException apiRequestException
         };
 
         Console.WriteLine(errorMessage);
+
         return Task.CompletedTask;
     }
 }

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Application/TelegramBotContext/TelegramBotInitializer.cs

@@ -1,6 +1,7 @@
 using Telegram.Bot;
 using Telegram.Bot.Polling;
 using Telegram.Bot.Types.Enums;
+using TelegramBotApp.Domain.Models;
 
 namespace TelegramBotApp.Application.TelegramBotContext;
 

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Application/TelegramCommands/TelegramCommands.cs

@@ -2,6 +2,7 @@
 using FluentResults;
 using TelegramBotApp.Messaging;
 using TelegramBotApp.Messaging.IntegrationContext.WeatherForecastIntegrationEvents;
+using TelegramBotApp.Messaging.IntegrationResponseContext.IntegrationResponses;
 
 namespace TelegramBotApp.Application.TelegramCommands;
 
@@ -36,7 +37,7 @@ public async Task<Result<string>> Execute(string command, string value, IEventBu
     {
         if (command != Command) throw new InvalidOperationException($"Invalid command {command}");
 
-        var response = await bus.Publish(new WeatherForecastRequestIntegrationEvent(value), ReplyNames.UniversalReply,
+        var response = await bus.Publish(new WeatherForecastRequestIntegrationEvent(value), nameof(UniversalResponse),
             cancellationToken);
 
         return response != null

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Application/TelegramBotContext/Interfaces.cs → WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Domain/Models/Interfaces.cs

@@ -2,7 +2,7 @@
 using Telegram.Bot.Types;
 using TelegramBotApp.Messaging;
 
-namespace TelegramBotApp.Application.TelegramBotContext;
+namespace TelegramBotApp.Domain.Models;
 
 public interface IBotInitializer
 {

WeatherBotApi.TelegramBotApp/Core/TelegramBotApp.Domain/TelegramBotApp.Domain.csproj

@@ -6,4 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Telegram.Bot" Version="20.0.0-alpha.1"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Infrastructure\TelegramBotApp.Messaging\TelegramBotApp.Messaging.csproj" />
+  </ItemGroup>
+
 </Project>

WeatherBotApi.TelegramBotApp/Infrastructure/TelegramBotApp.Caching/Caching/CacheService.cs

@@ -0,0 +1,20 @@
+using System.Text.Json;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace TelegramBotApp.Caching.Caching;
+
+public class CacheService(IDistributedCache distributedCache) : ICacheService
+{
+    public async Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default) where T : class
+    {
+        var value = await distributedCache.GetStringAsync(key, cancellationToken);
+
+        return value == null ? null : JsonSerializer.Deserialize<T>(value);
+    }
+
+    public async Task SetAsync<T>(string key, T value, CancellationToken cancellationToken = default) where T : class =>
+        await distributedCache.SetStringAsync(key, JsonSerializer.Serialize(value), cancellationToken);
+
+    public async Task RemoveAsync(string key, CancellationToken cancellationToken = default) =>
+        await distributedCache.RemoveAsync(key, cancellationToken);
+}

WeatherBotApi.TelegramBotApp/Infrastructure/TelegramBotApp.Caching/Caching/Interfaces.cs

@@ -0,0 +1,8 @@
+namespace TelegramBotApp.Caching.Caching;
+
+public interface ICacheService
+{
+    public Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default) where T : class;
+    public Task SetAsync<T>(string key, T value, CancellationToken cancellationToken = default) where T : class;
+    public Task RemoveAsync(string key, CancellationToken cancellationToken = default);
+}

WeatherBotApi.TelegramBotApp/Infrastructure/TelegramBotApp.Caching/DependencyInjection.cs

@@ -0,0 +1,14 @@
+using Microsoft.Extensions.DependencyInjection;
+using TelegramBotApp.Caching.Caching;
+
+namespace TelegramBotApp.Caching;
+
+public static class DependencyInjection
+{
+    // ReSharper disable once UnusedMethodReturnValue.Global
+    public static IServiceCollection AddCaching(this IServiceCollection services)
+    {
+        services.AddSingleton<ICacheService, CacheService>();
+        return services;
+    }
+}

WeatherBotApi.TelegramBotApp/Infrastructure/TelegramBotApp.Caching/TelegramBotApp.Caching.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1" />
+    </ItemGroup>
+
+</Project>

WeatherBotApi.TelegramBotApp/Infrastructure/TelegramBotApp.Messaging/DependencyInjection.cs

@@ -3,6 +3,7 @@
 using TelegramBotApp.Messaging.Connection;
 using TelegramBotApp.Messaging.EventBusContext;
 using TelegramBotApp.Messaging.IntegrationContext;
+using TelegramBotApp.Messaging.IntegrationResponseContext.IntegrationResponseHandlers;
 using TelegramBotApp.Messaging.Settings;
 
 namespace TelegramBotApp.Messaging;
@@ -30,4 +31,16 @@ public static IServiceCollection AddMessaging(this IServiceCollection services,
 
         return services;
     }
+
+    // ReSharper disable once UnusedMethodReturnValue.Global
+    public static IServiceCollection AddResponseHandlers(this IServiceCollection services)
+    {
+        var interfaceType = typeof(IResponseHandler);
+        foreach (var type in
+                 AppDomain.CurrentDomain.GetAssemblies()
+                     .SelectMany(s => s.GetTypes())
+                     .Where(p => interfaceType.IsAssignableFrom(p) && p.IsClass)) services.AddTransient(type);
+
+        return services;
+    }
 }