Структура

backend/src/Modules/Messaging/Infrastructure/Handlers/MessageSentDomainEventHandler.cs

@@ -1,15 +1,10 @@
-using MediatR;
-
-using Knot.Modules.Messaging.Domain;
-using Knot.Modules.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
 using Knot.Shared.Kernel;
+using MediatR;
 
 namespace Knot.Modules.Messaging.Infrastructure.Handlers;
 
-/// <summary>
-/// Обработчик доменного события отправки сообщения.
-/// Отправляет уведомление через SignalR всем участникам чата.
-/// </summary>
 public sealed class MessageSentDomainEventHandler : INotificationHandler<MessageSentDomainEvent>
 {
     private readonly IMessageNotifier _hubContext;
@@ -39,7 +34,6 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
             ? new { Id = userInfo.Id, Username = userInfo.Username, DisplayName = userInfo.DisplayName, Avatar = userInfo.Avatar }
             : new { Id = message.SenderId, Username = "unknown", DisplayName = "Unknown", Avatar = (string?)null };
 
-        // Fetch forwarded from info if exists
         object? forwardedFromObj = null;
         if (message.ForwardedFromId.HasValue)
         {
@@ -49,7 +43,6 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                 : new { Id = message.ForwardedFromId.Value, Username = "unknown", DisplayName = "Unknown", Avatar = (string?)null };
         }
 
-        // Fetch reply info if exists
         object? replyToObj = null;
         if (message.ReplyToId.HasValue)
         {
@@ -62,7 +55,7 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                     Id = replyMsg.Id,
                     Content = replyMsg.Content,
                     Quote = message.Quote,
-                    media = replyMsg.Media.Select(rm => new { rm.Id, rm.Type, rm.Url }).ToList(),
+                    media = replyMsg.Media.Select(rm => new { rm.Type, rm.Url }).ToList(),
                     Sender = replySenderInfo != null
                         ? new { Id = replySenderInfo.Id, Username = replySenderInfo.Username, DisplayName = replySenderInfo.DisplayName }
                         : new { Id = replyMsg.SenderId, Username = "unknown", DisplayName = "Unknown" }
@@ -70,34 +63,32 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
             }
         }
 
-        // Отправляем сообщение в "комнату" чата.
         await _hubContext.NotifyNewMessageAsync(notification.ChatId, new
+        {
+            id = message.Id,
+            chatId = message.ChatId,
+            senderId = message.SenderId,
+            content = message.Content,
+            type = message.Type,
+            createdAt = message.CreatedAt,
+            forwardedFromId = message.ForwardedFromId,
+            forwardedFrom = forwardedFromObj,
+            replyToId = message.ReplyToId,
+            replyTo = replyToObj,
+            quote = message.Quote,
+            media = message.Media.Select(m => new
             {
-                id = message.Id,
-                chatId = message.ChatId,
-                senderId = message.SenderId,
-                content = message.Content,
-                type = message.Type,
-                createdAt = message.CreatedAt,
-                forwardedFromId = message.ForwardedFromId,
-                forwardedFrom = forwardedFromObj,
-                replyToId = message.ReplyToId,
-                replyTo = replyToObj,
-                quote = message.Quote,
-                media = message.Media.Select(m => new
-                {
-                    id = m.Id,
-                    type = m.Type,
-                    url = m.Url,
-                    filename = m.Filename,
-                    size = m.Size
-                }).ToList(),
-                sender = senderObj,
-                readBy = new List<object>(),
-                storyId = message.StoryId,
-                storyMediaUrl = message.StoryMediaUrl,
-                storyMediaType = message.StoryMediaType
-            }, cancellationToken);
+                type = m.Type,
+                url = m.Url,
+                filename = m.FileId,
+                size = m.Size
+            }).ToList(),
+            sender = senderObj,
+            readBy = new List<object>(),
+            storyId = message.StoryId,
+            storyMediaUrl = message.StoryMediaUrl,
+            storyMediaType = message.StoryMediaType
+        }, cancellationToken);
     }
 }