Фиксы

backend/Tests/Conversations/UnitTests/Chats/CreateChatCommandHandlerTests.cs

@@ -7,9 +7,8 @@ using FluentAssertions;
 using NSubstitute;
 using Xunit;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
-using Knot.Modules.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Chats.Create;
 
 namespace Knot.Modules.Conversations.UnitTests.Chats;

backend/Tests/Conversations/UnitTests/Chats/GetChatsQueryHandlerTests.cs

@@ -7,9 +7,10 @@ using FluentAssertions;
 using NSubstitute;
 using Xunit;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
-using Knot.Modules.Messaging.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.Chats.GetChats;
 using Knot.Modules.Conversations.Application.DTOs;
 

backend/Tests/Conversations/UnitTests/GetOrCreateFavoritesCommandHandlerTests.cs

@@ -1,9 +1,8 @@
 using FluentAssertions;
 using NSubstitute;
-using Knot.Modules.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Chats.GetOrCreateFavorites;
-using Knot.Modules.Conversations.Domain;
+using Knot.Contracts.Conversations.Domain;
-using Knot.Modules.Messaging.Domain;
 using Knot.Shared.Kernel;
 using Xunit;
 

backend/Tests/Conversations/UnitTests/Knot.Modules.Conversations.UnitTests.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Modules\Chats\Knot.Modules.Conversations.csproj" />
+    <ProjectReference Include="..\..\..\src\Contracts\Conversations\Knot.Contracts.Conversations.csproj" />
     <ProjectReference Include="..\..\..\src\Modules\Messaging\Knot.Modules.Messaging.csproj" />
     <ProjectReference Include="..\..\..\src\Modules\Conversations\Knot.Modules.Conversations.csproj" />
     <ProjectReference Include="..\..\..\src\Modules\Settings\Knot.Modules.Settings.csproj" />

backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs

@@ -5,15 +5,17 @@ using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using MediatR;
+using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Xunit;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Shared.Kernel;
-using Knot.Modules.Conversations.Domain;
-using Knot.Modules.Messaging.Domain;
-using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Messages.Send;
-using Knot.Modules.Settings.Application.Settings.Abstractions;
+using Knot.Contracts.Settings.Application.Abstractions;
-using Knot.Modules.Settings.Application.Settings.DTOs;
+using Knot.Contracts.Settings.Application.DTOs;
 
 namespace Knot.Modules.Conversations.UnitTests.Messages;
 
@@ -24,6 +26,8 @@ public class SendMessageCommandHandlerTests
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly IMediator _mediator;
     private readonly IMessagesSettings _messagesSettings;
+    private readonly IIdempotencyStore _idempotencyStore;
+    private readonly ILogger<SendMessageCommandHandler> _logger;
     private readonly SendMessageCommandHandler _handler;
 
     public SendMessageCommandHandlerTests()
@@ -33,11 +37,13 @@ public class SendMessageCommandHandlerTests
         _unitOfWork = Substitute.For<IChatsUnitOfWork>();
         _mediator = Substitute.For<IMediator>();
         _messagesSettings = Substitute.For<IMessagesSettings>();
+        _idempotencyStore = Substitute.For<IIdempotencyStore>();
+        _logger = Substitute.For<ILogger<SendMessageCommandHandler>>();
         
-        var config = new Knot.Modules.Settings.Application.Settings.DTOs.MessagesConfig();
+        var config = new MessagesConfig();
         _messagesSettings.Current.Returns(config);
 
-        _handler = new SendMessageCommandHandler(_chatRepository, _messageRepository, _unitOfWork, _mediator, _messagesSettings);
+        _handler = new SendMessageCommandHandler(_chatRepository, _messageRepository, _unitOfWork, _mediator, _messagesSettings, _idempotencyStore, _logger);
     }
 
     [Fact]

backend/src/Contracts/Conversations/Application/Abstractions/IIdempotencyStore.cs

@@ -0,0 +1,17 @@
+namespace Knot.Contracts.Conversations.Application.Abstractions;
+
+/// <summary>
+/// Хранилище для обеспечения идемпотентности операций.
+/// Если ключ уже существует — возвращает сохранённый результат без повторного выполнения.
+/// </summary>
+public interface IIdempotencyStore
+{
+    /// <summary>
+    /// Возвращает сохранённый результат по ключу или выполняет factory, сохраняет и возвращает результат.
+    /// </summary>
+    Task<T> GetOrCreateAsync<T>(
+        string key,
+        Func<CancellationToken, Task<T>> factory,
+        TimeSpan? expiration = null,
+        CancellationToken cancellationToken = default);
+}

backend/src/Host/Host.csproj

@@ -24,7 +24,6 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
-    <PackageReference Include="DKNet.AspCore.Idempotency" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

backend/src/Host/Program.cs

@@ -12,7 +12,6 @@ using Knot.Modules.Conversations;
 using Knot.Modules.Conversations.Infrastructure.Persistence;
 using Knot.Modules.Conversations.Infrastructure.SignalR;
 using Knot.Modules.Conversations.Presentation.Endpoints;
-using Knot.Modules.Conversations.Presentation.Middleware;
 using Knot.Modules.Federation;
 using Knot.Modules.Federation.Presentation.Endpoints;
 using Knot.Modules.Klipy;
@@ -141,7 +140,6 @@ builder.Services.AddRouting(options =>
 
 builder.Services.AddMemoryCache();
 builder.Services.AddHttpClient();
-builder.Services.AddIdempotency(); // DKNet.AspCore.Idempotency DI registration
 
 builder.Services.ConfigureHttpJsonOptions(options =>
 {
@@ -244,7 +242,6 @@ if (app.Environment.IsDevelopment())
 // Не раздаем статические файлы, так как теперь используем MinIO
 
 app.UseAuthentication();
-app.UseIdempotency(); // DKNet.AspCore.Idempotency middleware
 app.UseAuthorization();
 
 // Регистрация эндпоинтов

backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs

@@ -41,6 +41,7 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly MediatR.IMediator _mediator;
     private readonly IMessagesSettings _messagesSettings;
+    private readonly IIdempotencyStore _idempotencyStore;
     private readonly ILogger<SendMessageCommandHandler> _logger;
 
     public SendMessageCommandHandler(
@@ -49,6 +50,7 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         IChatsUnitOfWork unitOfWork,
         MediatR.IMediator mediator,
         IMessagesSettings messagesSettings,
+        IIdempotencyStore idempotencyStore,
         ILogger<SendMessageCommandHandler> logger)
     {
         _chatRepository = chatRepository;
@@ -56,10 +58,25 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         _unitOfWork = unitOfWork;
         _mediator = mediator;
         _messagesSettings = messagesSettings;
+        _idempotencyStore = idempotencyStore;
         _logger = logger;
     }
 
     public async Task<Result<Guid>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
+    {
+        if (!string.IsNullOrWhiteSpace(request.IdempotencyKey))
+        {
+            var key = $"send_msg:{request.ChatId}:{request.IdempotencyKey}";
+            return await _idempotencyStore.GetOrCreateAsync(
+                key,
+                factory: ct => ExecuteAsync(request, ct),
+                cancellationToken: cancellationToken);
+        }
+
+        return await ExecuteAsync(request, cancellationToken);
+    }
+
+    private async Task<Result<Guid>> ExecuteAsync(SendMessageCommand request, CancellationToken cancellationToken)
     {
         // 1. Проверка существования чата
         var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
@@ -68,40 +85,30 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
             return Result.Failure<Guid>(ChatErrors.ChatsNotFound);
         }
 
-        // 2. ���������, �������� �� ����������� ����������
+        // 2. Проверка, является ли отправитель участником чата
         if (!chat.Members.Any(m => m.UserId == request.SenderId))
         {
             return Result.Failure<Guid>(ChatErrors.ChatsForbidden);
         }
 
-        // 3. ������� ���������
+        // 3. Создание сообщения
         Message message;
         if (request.Type == "story_reply" || request.Type == "story_reaction")
         {
             if (!_messagesSettings.Current.AllowMedia) return Result.Failure<Guid>(ChatErrors.MediaDisabled);
 
-
             var parsedStoryMediaType = Enum.TryParse<MediaType>(request.StoryMediaType, true, out var sTypeEnum) ? sTypeEnum : MediaType.Image;
             message = new StoryMessage(
                 Guid.NewGuid(),
-
                 request.ChatId,
-
                 request.SenderId,
-
                 request.StoryId ?? Guid.Empty,
-
                 request.StoryMediaUrl ?? string.Empty,
                 request.StoryMediaType,
-
                 request.Content,
-
                 request.ReplyToId,
-
                 request.ForwardedFromId,
-
                 DateTime.UtcNow,
-
                 false);
         }
         else if (request.Attachments != null && request.Attachments.Any())
@@ -111,26 +118,17 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
             var firstAtt = request.Attachments.First();
             var parsedType = Enum.TryParse<MediaType>(firstAtt.Type, true, out var mTypeEnum) ? mTypeEnum : MediaType.File;
 
-
             message = new MediaMessage(
                 Guid.NewGuid(),
-
                 request.ChatId,
-
                 request.SenderId,
                 parsedType,
-
                 request.Content,
-
                 request.ReplyToId,
-
                 request.ForwardedFromId,
-
                 DateTime.UtcNow,
-
                 false);
 
-
             foreach (var att in request.Attachments)
             {
                 var pType = Enum.TryParse<MediaType>(att.Type, true, out var tEnum) ? tEnum : MediaType.File;
@@ -172,25 +170,17 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         {
             message = new TextMessage(
                 Guid.NewGuid(),
-
                 request.ChatId,
-
                 request.SenderId,
-
                 request.Content ?? string.Empty,
-
                 request.ReplyToId,
-
                 request.Quote,
-
                 request.ForwardedFromId,
-
                 DateTime.UtcNow,
-
                 false);
         }
 
-        // 4. ������������������ ��������� High-Water Mark
+        // 4. Обновление High-Water Mark
         chat.IncrementSequenceId();
         message.SetSequenceId(chat.LastMessageSequenceId);
 
@@ -204,13 +194,9 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
 
         await _mediator.Publish(new MessageSentDomainEvent(
             message.Id,
-
             message.ChatId,
-
             message.SenderId,
-
             message.Content),
-
             cancellationToken);
 
         return Result.Success(message.Id);

backend/src/Modules/Conversations/DependencyInjection.cs

@@ -2,7 +2,9 @@ using Knot.Contracts.Conversations.Application.Abstractions;
 using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
 using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Modules.Conversations.Infrastructure.Idempotency;
 using Knot.Modules.Conversations.Infrastructure.Persistence;
+using Knot.Modules.Conversations.Infrastructure.Persistence.Mongo;
 using Knot.Modules.Conversations.Infrastructure.Services;
 using Knot.Shared.Kernel;
 using Microsoft.EntityFrameworkCore;
@@ -42,6 +44,9 @@ public static class DependencyInjection
         services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserStatusService, UserStatusService>();
         services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserDeleterService, UserDeleterService>();
 
+        services.AddMemoryCache();
+        services.AddSingleton<Knot.Contracts.Conversations.Application.Abstractions.IIdempotencyStore, MemoryCacheIdempotencyStore>();
+
         return services;
     }
 }

backend/src/Modules/Conversations/Infrastructure/Idempotency/MemoryCacheIdempotencyStore.cs

@@ -0,0 +1,54 @@
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Knot.Modules.Conversations.Infrastructure.Idempotency;
+
+/// <summary>
+/// Реализация хранилища идемпотентности на основе IMemoryCache.
+/// Использует семафор для предотвращения race condition при одновременных запросах с одинаковым ключом.
+/// </summary>
+public sealed class MemoryCacheIdempotencyStore : IIdempotencyStore
+{
+    private readonly IMemoryCache _cache;
+    private readonly SemaphoreSlim _semaphore = new(1, 1);
+
+    public MemoryCacheIdempotencyStore(IMemoryCache cache)
+    {
+        _cache = cache;
+    }
+
+    public async Task<T> GetOrCreateAsync<T>(
+        string key,
+        Func<CancellationToken, Task<T>> factory,
+        TimeSpan? expiration = null,
+        CancellationToken cancellationToken = default)
+    {
+        if (_cache.TryGetValue(key, out T? cachedValue) && cachedValue is not null)
+        {
+            return cachedValue;
+        }
+
+        await _semaphore.WaitAsync(cancellationToken);
+        try
+        {
+            // Double-check после получения блокировки
+            if (_cache.TryGetValue(key, out cachedValue) && cachedValue is not null)
+            {
+                return cachedValue;
+            }
+
+            var value = await factory(cancellationToken);
+
+            var options = new MemoryCacheEntryOptions()
+                .SetAbsoluteExpiration(expiration ?? TimeSpan.FromHours(24))
+                .SetPriority(CacheItemPriority.Normal);
+
+            _cache.Set(key, value, options);
+            return value;
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+}

backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj

@@ -29,7 +29,6 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
     <PackageReference Include="MongoDB.Driver" Version="3.2.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageReference Include="DKNet.AspCore.Idempotency" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,6 +37,7 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+    <InternalsVisibleTo Include="Knot.Modules.Conversations.UnitTests" />
   </ItemGroup>
 
 </Project>