Upgrade/12 channels

src/Directory.Packages.props

@@ -6,6 +6,7 @@
 
   <ItemGroup Label="Microsoft">
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
   </ItemGroup>
 

src/FillInTheTextBot.Api/DI/InternalServicesRegistration.cs

@@ -1,4 +1,5 @@
 using FillInTheTextBot.Services;
+using FillInTheTextBot.Services.BackgroundTasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace FillInTheTextBot.Api.DI
@@ -9,6 +10,14 @@ internal static void AddInternalServices(this IServiceCollection services)
         {
             services.AddTransient<IConversationService, ConversationService>();
             services.AddScoped<IDialogflowService, DialogflowService>();
+
+            // Продюсеры (IBackgroundTaskQueue) и обработчик (IBackgroundTaskReader) должны
+            // работать с одним и тем же каналом, поэтому оба интерфейса форвардятся на
+            // единственный экземпляр BackgroundTaskQueue.
+            services.AddSingleton<BackgroundTaskQueue>();
+            services.AddSingleton<IBackgroundTaskQueue>(provider => provider.GetRequiredService<BackgroundTaskQueue>());
+            services.AddSingleton<IBackgroundTaskReader>(provider => provider.GetRequiredService<BackgroundTaskQueue>());
+            services.AddHostedService<BackgroundTaskProcessor>();
         }
     }
 }

src/FillInTheTextBot.Messengers.Marusia.Tests/MarusiaServiceTests.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using AutoFixture;
 using FillInTheTextBot.Services;
+using FillInTheTextBot.Services.BackgroundTasks;
 using GranSteL.Helpers.Redis;
 using MailRu.Marusia.Models;
 using MailRu.Marusia.Models.Input;
@@ -22,6 +23,7 @@ public class MarusiaServiceTests
     {
         private Mock<IConversationService> _conversationService;
         private Mock<IRedisCacheService> _cache;
+        private Mock<IBackgroundTaskQueue> _backgroundTasks;
 
         private MarusiaService _target;
 
@@ -33,7 +35,18 @@ public void InitTest()
             _conversationService = new Mock<IConversationService>();
             _cache = new Mock<IRedisCacheService>();
 
-            _target = new MarusiaService(Mock.Of<ILogger<MarusiaService>>(), _conversationService.Object, _cache.Object);
+            _backgroundTasks = new Mock<IBackgroundTaskQueue>();
+
+            // Фоновые работы выполняются сразу, чтобы тест проверял результат, а не гонку
+            _backgroundTasks
+                .Setup(q => q.Enqueue(It.IsAny<string>(), It.IsAny<Func<Task>>()))
+                .Returns((string _, Func<Task> work) =>
+                {
+                    work().GetAwaiter().GetResult();
+                    return true;
+                });
+
+            _target = new MarusiaService(Mock.Of<ILogger<MarusiaService>>(), _conversationService.Object, _cache.Object, _backgroundTasks.Object);
 
             _fixture = new Fixture { OmitAutoProperties = true };
         }

src/FillInTheTextBot.Messengers.Marusia/MarusiaService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using FillInTheTextBot.Services;
-using FillInTheTextBot.Services.Extensions;
+using FillInTheTextBot.Services.BackgroundTasks;
 using GranSteL.Helpers.Redis;
 using MailRu.Marusia.Models;
 using MailRu.Marusia.Models.Input;
@@ -15,13 +15,16 @@ public class MarusiaService : MessengerService<InputModel, OutputModel>, IMarusi
         private const string PongResponse = "pong";
 
         private readonly IRedisCacheService _cache;
+        private readonly IBackgroundTaskQueue _backgroundTasks;
 
         public MarusiaService(
             ILogger<MarusiaService> log,
             IConversationService conversationService,
-            IRedisCacheService cache) : base(log, conversationService)
+            IRedisCacheService cache,
+            IBackgroundTaskQueue backgroundTasks) : base(log, conversationService)
         {
             _cache = cache;
+            _backgroundTasks = backgroundTasks;
         }
 
         protected override Models.Request Before(InputModel input)
@@ -67,7 +70,10 @@ protected override Task<OutputModel> AfterAsync(InputModel input, Models.Respons
 
             output.AddToSessionState(Models.Response.ScopeStorageKey, response.ScopeKey);
 
-            _cache.AddAsync($"marusia:{input.Session?.UserId}", string.Empty, TimeSpan.FromDays(14)).Forget();
+            var cacheKey = $"marusia:{input.Session?.UserId}";
+
+            _backgroundTasks.Enqueue("marusia user mark",
+                () => _cache.AddAsync(cacheKey, string.Empty, TimeSpan.FromDays(14)));
 
             return Task.FromResult(output);
         }

src/FillInTheTextBot.Messengers.Sber.Tests/SberServiceTests.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoFixture;
+using FillInTheTextBot.Services.BackgroundTasks;
 using GranSteL.Helpers.Redis;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -20,6 +21,7 @@ public class SberServiceTests
     {
         private Mock<Services.IConversationService> _conversationService;
         private Mock<IRedisCacheService> _cache;
+        private Mock<IBackgroundTaskQueue> _backgroundTasks;
 
         private SberService _target;
 
@@ -31,7 +33,18 @@ public void InitTest()
             _conversationService = new Mock<Services.IConversationService>();
             _cache = new Mock<IRedisCacheService>();
 
-            _target = new SberService(Mock.Of<ILogger<SberService>>(), _conversationService.Object, _cache.Object);
+            _backgroundTasks = new Mock<IBackgroundTaskQueue>();
+
+            // Фоновые работы выполняются сразу, чтобы тест проверял результат, а не гонку
+            _backgroundTasks
+                .Setup(q => q.Enqueue(It.IsAny<string>(), It.IsAny<Func<Task>>()))
+                .Returns((string _, Func<Task> work) =>
+                {
+                    work().GetAwaiter().GetResult();
+                    return true;
+                });
+
+            _target = new SberService(Mock.Of<ILogger<SberService>>(), _conversationService.Object, _cache.Object, _backgroundTasks.Object);
 
             _fixture = new Fixture { OmitAutoProperties = true };
         }

src/FillInTheTextBot.Messengers.Sber/SberService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FillInTheTextBot.Services;
-using FillInTheTextBot.Services.Extensions;
+using FillInTheTextBot.Services.BackgroundTasks;
 using GranSteL.Helpers.Redis;
 using Microsoft.Extensions.Logging;
 using Sber.SmartApp.Models;
@@ -12,13 +12,16 @@ namespace FillInTheTextBot.Messengers.Sber
     public class SberService : MessengerService<Request, Response>, ISberService
     {
         private readonly IRedisCacheService _cache;
+        private readonly IBackgroundTaskQueue _backgroundTasks;
 
         public SberService(
             ILogger<SberService> log,
             IConversationService conversationService,
-            IRedisCacheService cache) : base(log, conversationService)
+            IRedisCacheService cache,
+            IBackgroundTaskQueue backgroundTasks) : base(log, conversationService)
         {
             _cache = cache;
+            _backgroundTasks = backgroundTasks;
         }
 
         protected override Models.Request Before(Request input)
@@ -76,7 +79,10 @@ private string TryGetSessionIdAsync(bool? newSession, string userHash)
             {
                 sessionId = Guid.NewGuid().ToString("N");
 
-                _cache.AddAsync(cacheKey, sessionId, TimeSpan.FromMinutes(5)).Forget();
+                var newSessionId = sessionId;
+
+                _backgroundTasks.Enqueue("sber session",
+                    () => _cache.AddAsync(cacheKey, newSessionId, TimeSpan.FromMinutes(5)));
             }
 
             return sessionId;