Архитектура

backend/src/Modules/Chats/Application/Messages/SearchMessages/SearchMessagesQuery.cs

@@ -16,11 +16,13 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
 {
     private readonly IMessageRepository _messageRepository;
     private readonly IUserDisplayNameProvider _userProvider;
+    private readonly IMessageReactionRepository _reactionRepository;
 
-    public SearchMessagesQueryHandler(IMessageRepository messageRepository, IUserDisplayNameProvider userProvider)
+    public SearchMessagesQueryHandler(IMessageRepository messageRepository, IUserDisplayNameProvider userProvider, IMessageReactionRepository reactionRepository)
     {
         _messageRepository = messageRepository;
         _userProvider = userProvider;
+        _reactionRepository = reactionRepository;
     }
 
     public async Task<Result<List<SearchMessageDto>>> Handle(SearchMessagesQuery request, CancellationToken cancellationToken)
@@ -32,6 +34,10 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
         userIds.AddRange(messages.Where(message => message.ForwardedFromId.HasValue).Select(message => message.ForwardedFromId!.Value));
 
         var senders = await _userProvider.GetUsersInfoAsync(userIds.Distinct(), cancellationToken);
+        
+        var messageIds = messages.Select(m => m.Id).ToList();
+        var allReactions = await _reactionRepository.GetReactionsForMessagesAsync(messageIds, cancellationToken);
+        var reactionsByMessage = allReactions.GroupBy(r => r.MessageId).ToDictionary(g => g.Key, g => g.ToList());
 
         var result = messages.Select(message => new SearchMessageDto(
             message.Id,
@@ -44,15 +50,16 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
                 message.IsEdited,
                 message.IsDeleted,
                 message.CreatedAt,
+                message.SequenceId,
                 message.ForwardedFromId,
                 null, 
                 message.StoryId,
                 message.StoryMediaUrl,
                 message.StoryMediaType,
-                message.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList(),
+            message.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList(),
             senders.TryGetValue(message.SenderId, out var senderUser) ? new MessageSenderDto(senderUser.Id, senderUser.Username, senderUser.DisplayName, senderUser.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
-            message.Reactions.Select(reaction => new SimpleReactionDto(reaction.UserId, reaction.Emoji)).ToList(),
-            message.ReadBy.Select(readReceipt => new ReadByDto(readReceipt.UserId)).ToList()
+            reactionsByMessage.TryGetValue(message.Id, out var mr) ? mr.Select(reaction => new SimpleReactionDto(reaction.UserId, reaction.Emoji)).ToList() : new List<SimpleReactionDto>(),
+            new List<ReadByDto>()
         )).ToList();
 
         return Result.Success(result);