mirror of
https://github.com/Govor-team/Govor.git
synced 2026-07-21 11:44:56 +00:00
the basis for group and private messages
This commit is contained in:
Artemy
@@ -1,9 +1,16 @@
|
||||
using Govor.Application.Interfaces.Messages;
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
using Govor.Core.Models;
|
||||
|
||||
namespace Govor.API.Services;
|
||||
namespace Govor.Application.Interfaces;
|
||||
|
||||
public interface IGroupService : IMessageSendingService, IMessageManagementService
|
||||
public interface IGroupService
|
||||
{
|
||||
ChatGroup GetGroupByInvite(string code);
|
||||
Task<ChatGroup> GetGroupByIdAsync(Guid groupId);
|
||||
Task<ChatGroup> CreateGroupAsync(string name, Guid creatorId, IEnumerable<Guid> initialMemberIds);
|
||||
Task<Result> AddUserToGroupByInvitationAsync(Guid userId, string invitationCode);
|
||||
Task<Result> RemoveUserFromGroupAsync(Guid groupId, Guid userId, Guid removedByUserId);
|
||||
Task<Result> DeleteGroupAsync(Guid groupId, Guid userId);
|
||||
Task<List<User>> GetGroupMembersAsync(Guid groupId);
|
||||
Task<List<ChatGroup>>GetUserGroupsAsync(Guid userId);
|
||||
ChatGroup GetGroupByInviteCode(string code);
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
namespace Govor.Application.Interfaces.Messages;
|
||||
|
||||
public interface IChatService : IMessageSendingService, IMessageManagementService
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
namespace Govor.Application.Interfaces.Messages;
|
||||
|
||||
public interface IMessageManagementService
|
||||
{
|
||||
Task<Result> EditMessageAsync(Guid editorId, Guid messageId, string newContent);
|
||||
Task<Result> DeleteMessageAsync(Guid editorId, Guid messageId);
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
namespace Govor.Application.Interfaces.Messages;
|
||||
|
||||
public interface IMessageReactionService
|
||||
{
|
||||
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
namespace Govor.Application.Interfaces.Messages;
|
||||
|
||||
public interface IMessageSendingService
|
||||
{
|
||||
Task<Result> SendMessageAsync(SendMessage newMessage);
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
using Govor.Core.Models;
|
||||
|
||||
namespace Govor.Application.Interfaces.Messages;
|
||||
|
||||
// Combining IChatService and IGroupService functionalities relevant to messages
|
||||
public interface IMessageService
|
||||
{
|
||||
Task<SendMessageResult> SendMessageAsync(SendMessage messageParameters);
|
||||
Task<EditMessageResult> EditMessageAsync(EditMessage messageParameters);
|
||||
Task<DeleteMessageResult> DeleteMessageAsync(DeleteMessage messageParameters);
|
||||
|
||||
// Potentially other message-related methods like:
|
||||
// Task<GetMessagesResult> GetMessagesAsync(Guid userId, Guid chatId, RecipientType chatType, int pageNumber, int pageSize);
|
||||
// Task<Result> MarkMessageAsReadAsync(Guid userId, Guid messageId);
|
||||
}
|
||||
|
||||
// Define specific result types for clarity, including original message for notifications if needed
|
||||
|
||||
public record SendMessageResult(bool IsSuccess, Exception? Exception, Guid MessageId)
|
||||
: Result(IsSuccess, Exception, MessageId);
|
||||
|
||||
public record EditMessageResult(bool IsSuccess, Exception? Exception, Message? OriginalMessage)
|
||||
: Result(IsSuccess, Exception, OriginalMessage?.Id ?? Guid.Empty)
|
||||
{
|
||||
// OriginalMessage can be useful for the Hub to know details like RecipientType, RecipientId for notifications
|
||||
}
|
||||
|
||||
public record DeleteMessageResult(bool IsSuccess, Exception? Exception, Message? OriginalMessage)
|
||||
: Result(IsSuccess, Exception, OriginalMessage?.Id ?? Guid.Empty);
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
public record DeleteMessage(
|
||||
Guid DeleterId,
|
||||
Guid MessageId);
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
public record EditMessage(
|
||||
Guid EditorId,
|
||||
Guid MessageId,
|
||||
string NewContent,
|
||||
DateTime EditedAt);
|
||||
@@ -2,7 +2,4 @@ using Govor.Core.Models;
|
||||
|
||||
namespace Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
public record SendMedia(Guid Id,
|
||||
string EncryptedKey,
|
||||
MediaType Type,
|
||||
string MimeType);
|
||||
public record SendMedia(Guid MediaId, string EncryptedKey, MediaType Type, string MimeType);
|
||||
@@ -1,8 +1,11 @@
|
||||
using Govor.Core.Models;
|
||||
|
||||
namespace Govor.Application.Interfaces.Messages.Parameters;
|
||||
|
||||
public record SendMessage(
|
||||
string EncryptContent,
|
||||
Guid? ReplyToMessageId,
|
||||
RecipientType RecipientType,
|
||||
Guid RecipientId,
|
||||
Guid FromUserId,
|
||||
DateTime SendAt,
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
using Govor.Application.Interfaces;
|
||||
using Govor.Application.Interfaces.Messages;
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
using Govor.Core.Models;
|
||||
using Govor.Core.Repositories.Groups;
|
||||
using Govor.Core.Repositories.Messages;
|
||||
using Govor.Core.Repositories.Users;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Govor.Application.Services;
|
||||
|
||||
public class MessageService : IMessageService
|
||||
{
|
||||
private readonly IMessagesRepository _messagesRepository;
|
||||
private readonly IUsersRepository _usersRepository; // For validating user recipients
|
||||
private readonly IGroupsRepository _groupsRepository; // For validating group recipients and fetching members
|
||||
private readonly IVerifyFriendship _verifyFriendship; // For private messages
|
||||
private readonly ILogger<MessageService> _logger;
|
||||
|
||||
public MessageService(
|
||||
IMessagesRepository messagesRepository,
|
||||
IUsersRepository usersRepository,
|
||||
IGroupsRepository groupsRepository,
|
||||
IVerifyFriendship verifyFriendship,
|
||||
ILogger<MessageService> logger)
|
||||
{
|
||||
_messagesRepository = messagesRepository;
|
||||
_usersRepository = usersRepository;
|
||||
_groupsRepository = groupsRepository;
|
||||
_verifyFriendship = verifyFriendship;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<SendMessageResult> SendMessageAsync(SendMessage sendParams)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Validate recipient
|
||||
if (sendParams.RecipientType == RecipientType.User)
|
||||
{
|
||||
if (!await _usersRepository.ExistsByIdAsync(sendParams.RecipientId)) // Changed to ExistsByIdAsync
|
||||
{
|
||||
_logger.LogWarning("Attempt to send message to non-existent user {RecipientId}", sendParams.RecipientId);
|
||||
return new SendMessageResult(false, new KeyNotFoundException($"Recipient user {sendParams.RecipientId} not found."), Guid.Empty);
|
||||
}
|
||||
// Verify friendship for private messages
|
||||
await _verifyFriendship.VerifyAsync(sendParams.FromUserId, sendParams.RecipientId);
|
||||
}
|
||||
else if (sendParams.RecipientType == RecipientType.Group)
|
||||
{
|
||||
if (!_groupsRepository.Exists(sendParams.RecipientId))
|
||||
{
|
||||
_logger.LogWarning("Attempt to send message to non-existent group {GroupId}", sendParams.RecipientId);
|
||||
return new SendMessageResult(false, new KeyNotFoundException($"Recipient group {sendParams.RecipientId} not found."), Guid.Empty);
|
||||
}
|
||||
// TODO: Optionally, verify if sender is a member of the group
|
||||
// bool isMember = await _groupsRepository.IsUserMemberOfGroupAsync(sendParams.FromUserId, sendParams.RecipientId);
|
||||
// if (!isMember)
|
||||
// {
|
||||
// _logger.LogWarning("User {UserId} attempted to send message to group {GroupId} but is not a member", sendParams.FromUserId, sendParams.RecipientId);
|
||||
// return new SendMessageResult(false, new UnauthorizedAccessException("Sender is not a member of the group."), Guid.Empty);
|
||||
// }
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogError("Invalid recipient type specified: {RecipientType}", sendParams.RecipientType);
|
||||
return new SendMessageResult(false, new ArgumentException("Invalid recipient type."), Guid.Empty);
|
||||
}
|
||||
|
||||
var messageId = Guid.NewGuid();
|
||||
var message = new Message
|
||||
{
|
||||
Id = messageId,
|
||||
SenderId = sendParams.FromUserId,
|
||||
RecipientId = sendParams.RecipientId,
|
||||
RecipientType = sendParams.RecipientType,
|
||||
EncryptedContent = sendParams.EncryptContent,
|
||||
SentAt = sendParams.SendAt,
|
||||
IsEdited = false,
|
||||
ReplyToMessageId = sendParams.ReplyToMessageId,
|
||||
MediaAttachments = sendParams.Media?.Select(m => new MediaAttachments
|
||||
{
|
||||
Id = m.MediaId, // Assuming SendMedia provides Id or it's generated here/by repo
|
||||
MessageId = messageId,
|
||||
Type = m.Type,
|
||||
MimeType = m.MimeType,
|
||||
EncryptedKey = m.EncryptedKey,
|
||||
// FilePath will be set by storage service or handled by repository if media ID is pre-generated
|
||||
}).ToList() ?? new List<MediaAttachments>()
|
||||
};
|
||||
|
||||
await _messagesRepository.AddAsync(message);
|
||||
_logger.LogInformation("Message {MessageId} from {SenderId} to {RecipientId} ({RecipientType}) saved successfully.", messageId, sendParams.FromUserId, sendParams.RecipientId, sendParams.RecipientType);
|
||||
return new SendMessageResult(true, null, messageId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error sending message from {SenderId} to {RecipientId} ({RecipientType})", sendParams.FromUserId, sendParams.RecipientId, sendParams.RecipientType);
|
||||
return new SendMessageResult(false, ex, Guid.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<EditMessageResult> EditMessageAsync(EditMessage editParams)
|
||||
{
|
||||
try
|
||||
{
|
||||
var message = await _messagesRepository.FindByIdAsync(editParams.MessageId);
|
||||
|
||||
if (message.SenderId != editParams.EditorId)
|
||||
{
|
||||
_logger.LogWarning("User {EditorId} attempted to edit message {MessageId} not sent by them (sender was {SenderId})", editParams.EditorId, editParams.MessageId, message.SenderId);
|
||||
return new EditMessageResult(false, new UnauthorizedAccessException("User is not authorized to edit this message."), null);
|
||||
}
|
||||
|
||||
// TODO: Add a time limit for editing messages? e.g., if (message.SentAt < DateTime.UtcNow.AddMinutes(-15)) throw new Exception("Edit time limit exceeded");
|
||||
|
||||
// Keep a copy of the original message state for the result, if needed by Hub for notifications
|
||||
var originalMessageForNotification = new Message
|
||||
{
|
||||
Id = message.Id,
|
||||
SenderId = message.SenderId,
|
||||
RecipientId = message.RecipientId,
|
||||
RecipientType = message.RecipientType,
|
||||
// Populate other fields if necessary for the notification
|
||||
};
|
||||
|
||||
message.EncryptedContent = editParams.NewContent;
|
||||
message.IsEdited = true;
|
||||
message.EditedAt = editParams.EditedAt;
|
||||
|
||||
await _messagesRepository.UpdateAsync(message);
|
||||
_logger.LogInformation("Message {MessageId} edited successfully by user {EditorId}", editParams.MessageId, editParams.EditorId);
|
||||
return new EditMessageResult(true, null, originalMessageForNotification);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error editing message {MessageId} by user {EditorId}", editParams.MessageId, editParams.EditorId);
|
||||
return new EditMessageResult(false, ex, null);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<DeleteMessageResult> DeleteMessageAsync(DeleteMessage deleteParams)
|
||||
{
|
||||
try
|
||||
{
|
||||
var message = await _messagesRepository.FindByIdAsync(deleteParams.MessageId);
|
||||
|
||||
if (message.SenderId != deleteParams.DeleterId)
|
||||
{
|
||||
// TODO: Allow group admins to delete messages in their groups?
|
||||
// if (message.RecipientType == RecipientType.Group) {
|
||||
// bool isAdmin = await _groupsRepository.IsUserAdminOfGroupAsync(deleteParams.DeleterId, message.RecipientId);
|
||||
// if (!isAdmin) {
|
||||
// _logger.LogWarning("User {DeleterId} (not sender or admin) attempted to delete group message {MessageId}", deleteParams.DeleterId, deleteParams.MessageId);
|
||||
// return new DeleteMessageResult(false, new UnauthorizedAccessException("User is not authorized to delete this message."), null);
|
||||
// }
|
||||
// } else {
|
||||
_logger.LogWarning("User {DeleterId} attempted to delete message {MessageId} not sent by them (sender was {SenderId})", deleteParams.DeleterId, deleteParams.MessageId, message.SenderId);
|
||||
return new DeleteMessageResult(false, new UnauthorizedAccessException("User is not authorized to delete this message."), null);
|
||||
// }
|
||||
}
|
||||
|
||||
// Keep a copy of the original message state for the result, if needed by Hub for notifications
|
||||
var originalMessageForNotification = new Message
|
||||
{
|
||||
Id = message.Id,
|
||||
SenderId = message.SenderId,
|
||||
RecipientId = message.RecipientId,
|
||||
RecipientType = message.RecipientType,
|
||||
// Populate other fields if necessary for the notification
|
||||
};
|
||||
|
||||
await _messagesRepository.RemoveAsync(deleteParams.MessageId);
|
||||
|
||||
// TODO: Delete associated media attachments from storage if they are no longer referenced.
|
||||
|
||||
_logger.LogInformation("Message {MessageId} deleted successfully by user {DeleterId}", deleteParams.MessageId, deleteParams.DeleterId);
|
||||
return new DeleteMessageResult(true, null, originalMessageForNotification);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error deleting message {MessageId} by user {DeleterId}", deleteParams.MessageId, deleteParams.DeleterId);
|
||||
return new DeleteMessageResult(false, ex, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,69 +0,0 @@
|
||||
using Govor.Application.Interfaces;
|
||||
using Govor.Application.Interfaces.Messages;
|
||||
using Govor.Application.Interfaces.Messages.Parameters;
|
||||
using Govor.Core.Models;
|
||||
using Govor.Core.Repositories.Messages;
|
||||
using Govor.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace Govor.Application.Services;
|
||||
|
||||
public class PrivateChatService : IChatService
|
||||
{
|
||||
private readonly IVerifyFriendship _verifyFriendship;
|
||||
private readonly IMessagesRepository _messages;
|
||||
|
||||
public PrivateChatService(IMessagesRepository messages, IVerifyFriendship verifyFriendship)
|
||||
{
|
||||
_messages = messages;
|
||||
_verifyFriendship = verifyFriendship;
|
||||
}
|
||||
|
||||
public async Task<Result> SendMessageAsync(SendMessage newMessage)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _verifyFriendship.VerifyAsync(newMessage.FromUserId, newMessage.RecipientId);
|
||||
|
||||
var messageId = Guid.NewGuid();
|
||||
|
||||
var message = new Message()
|
||||
{
|
||||
Id = messageId,
|
||||
EncryptedContent = newMessage.EncryptContent,
|
||||
IsEdited = false,
|
||||
SenderId = newMessage.FromUserId,
|
||||
RecipientId = newMessage.RecipientId,
|
||||
RecipientType = RecipientType.User,
|
||||
ReplyToMessageId = newMessage.ReplyToMessageId,
|
||||
|
||||
MediaAttachments = newMessage.Media.Select(m => new MediaAttachments()
|
||||
{
|
||||
Id = m.Id,
|
||||
MessageId = messageId,
|
||||
Type = m.Type,
|
||||
MimeType = m.MimeType,
|
||||
EncryptedKey = m.EncryptedKey,
|
||||
}).ToList()
|
||||
};
|
||||
|
||||
await _messages.AddAsync(message);
|
||||
|
||||
return new Result(true, null, messageId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new Result(false, ex, Guid.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
public Task<Result> EditMessageAsync(Guid editorId, Guid messageId, string newContent)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public Task<Result> DeleteMessageAsync(Guid editorId, Guid messageId)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user