mirror of
https://github.com/Govor-team/Govor.git
synced 2026-07-21 11:44:56 +00:00
Refactor: migrate Core -> Domain and reorganize projects
Large refactor that renames/moves core types into a new Govor.Domain surface and reorganizes the Application layer. Models, configurations, migrations and many files moved from Govor.Core/Govor.Data to Govor.Domain; numerous Application services, interfaces and implementations were relocated or added (authentication, friends, messages, medias, push notifications, user sessions, storage, synching, private chats, etc.). Tests updated to use Govor.Domain namespaces and adjusted project references (removed Govor.Data reference from API tests). Also updated API, Hub and mapping code and project files to reflect the new structure and naming. This is primarily a codebase-wide namespace and module reorganization to establish a Domain project and restructure application services.
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace Govor.Application.Medias;
|
||||
|
||||
public class AccesserToDownloadMediaService : IAccesserToDownloadMedia
|
||||
{
|
||||
private readonly GovorDbContext _dbContext;
|
||||
|
||||
public AccesserToDownloadMediaService(GovorDbContext dbContext)
|
||||
{
|
||||
_dbContext = dbContext;
|
||||
}
|
||||
|
||||
public async Task<bool> HasAccessAsync(Guid mediaId, Guid userId)
|
||||
{
|
||||
var media = await _dbContext.MediaFiles
|
||||
.AsNoTracking()
|
||||
.Where(m => m.Id == mediaId)
|
||||
.Select(m => new { m.OwnerType, m.OwnerId, m.UploaderId })
|
||||
.FirstOrDefaultAsync();
|
||||
|
||||
if (media is null)
|
||||
return false;
|
||||
|
||||
return media.OwnerType switch
|
||||
{
|
||||
MediaOwnerType.Avatar => true, // media.OwnerId == userId
|
||||
MediaOwnerType.GroupAvatar => await _dbContext.GroupMemberships
|
||||
.AnyAsync(gm => gm.GroupId == media.OwnerId && gm.UserId == userId),
|
||||
|
||||
MediaOwnerType.Message => await _dbContext.MediaAttachments
|
||||
.AnyAsync(ma =>
|
||||
ma.MediaFileId == mediaId &&
|
||||
(
|
||||
ma.Message.SenderId == userId ||
|
||||
ma.Message.RecipientId == userId ||
|
||||
_dbContext.GroupMemberships.Any(gm =>
|
||||
gm.GroupId == ma.Message.RecipientId && gm.UserId == userId)
|
||||
)),
|
||||
|
||||
MediaOwnerType.System => true,
|
||||
_ => false
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Govor.Application.Medias;
|
||||
|
||||
public interface IAccesserToDownloadMedia
|
||||
{
|
||||
Task<bool> HasAccessAsync(Guid mediaFileId, Guid userId);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain.Models.Messages;
|
||||
|
||||
namespace Govor.Application.Medias;
|
||||
|
||||
public interface IMediaService
|
||||
{
|
||||
public Task<MediaUploadResult> UploadMediaAsync(Media file);
|
||||
public Task DeleteMediaAsync(Guid fileId);
|
||||
public Task<Media> GetMediaByUrlAsync(string url);
|
||||
public Task<Media> GetMediaByIdAsync(Guid mediaId);
|
||||
public Task<bool> HasMediaAsync(Guid mediaId);
|
||||
public Task<bool> HasMediaByUrlAsync(string url);
|
||||
Task AttachToMessageAsync(Guid mediaId, Guid messageId);
|
||||
}
|
||||
|
||||
public record Media(Guid UploaderId,
|
||||
DateTime UploadedOn,
|
||||
string FileName,
|
||||
byte[] Data,
|
||||
MediaType Type,
|
||||
string MimeType,
|
||||
string EncryptedKey,
|
||||
MediaOwnerType OwnerType,
|
||||
Guid? OwnerId);
|
||||
|
||||
public record MediaUploadResult(Guid MediaId, string Url);
|
||||
@@ -0,0 +1,143 @@
|
||||
using Govor.Application.Storage;
|
||||
using Govor.Domain.Models;
|
||||
using Govor.Domain;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Govor.Application.Medias;
|
||||
|
||||
public class MediaService : IMediaService
|
||||
{
|
||||
private ILogger<MediaService> _logger;
|
||||
private IStorageService _storageService;
|
||||
private GovorDbContext _dbContext;
|
||||
|
||||
public MediaService(IStorageService storageService, GovorDbContext dbContext, ILogger<MediaService> logger)
|
||||
{
|
||||
_storageService = storageService;
|
||||
_dbContext = dbContext;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<MediaUploadResult> UploadMediaAsync(Media file)
|
||||
{
|
||||
try
|
||||
{
|
||||
var url = await _storageService.SaveAsync(file.Data, file.FileName);
|
||||
|
||||
var mediaId = Guid.NewGuid();
|
||||
|
||||
_dbContext.MediaFiles.Add(new MediaFile()
|
||||
{
|
||||
Id = mediaId,
|
||||
UploaderId = file.UploaderId,
|
||||
DateCreated = file.UploadedOn,
|
||||
MediaType = file.Type,
|
||||
MineType = file.MimeType,
|
||||
Url = url,
|
||||
OwnerType = file.OwnerType,
|
||||
OwnerId = file.OwnerId,
|
||||
});
|
||||
|
||||
await _dbContext.SaveChangesAsync();
|
||||
|
||||
_logger.LogInformation($"Media uploaded: {url} with id: {mediaId} by {file.UploaderId}");
|
||||
|
||||
return new MediaUploadResult(mediaId, url);
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
throw new InvalidOperationException($"An error occured while uploading the media file: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
public async Task DeleteMediaAsync(Guid mediaId)
|
||||
{
|
||||
var mediaFile = await _dbContext.MediaFiles
|
||||
.FirstOrDefaultAsync(x => x.Id == mediaId)
|
||||
?? throw new KeyNotFoundException($"No media found by given id {mediaId}");
|
||||
|
||||
await _storageService.RemoveAsync(mediaFile.Url);
|
||||
|
||||
_dbContext.MediaFiles.Remove(mediaFile);
|
||||
|
||||
await _dbContext.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public Task<Media> GetMediaByUrlAsync(string url)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public async Task<Media> GetMediaByIdAsync(Guid mediaId)
|
||||
{
|
||||
try
|
||||
{
|
||||
var mediaFile = await _dbContext.MediaFiles
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(x => x.Id == mediaId)
|
||||
?? throw new KeyNotFoundException($"No media found by given id {mediaId}");
|
||||
|
||||
// Загрузить бинарные данные из хранилища
|
||||
Stream dataStream = await _storageService.LoadAsync(mediaFile.Url);
|
||||
|
||||
// Считать поток в byte[]
|
||||
using var memoryStream = new MemoryStream();
|
||||
await dataStream.CopyToAsync(memoryStream);
|
||||
var contentBytes = memoryStream.ToArray();
|
||||
|
||||
_logger.LogInformation($"Media found: {mediaFile.MediaType} with id: {mediaFile.Id} and url: {mediaFile.Url}");
|
||||
|
||||
// Вернуть объект Media
|
||||
return new Media(
|
||||
mediaFile.UploaderId,
|
||||
mediaFile.DateCreated,
|
||||
mediaFile.MediaType.ToString(),
|
||||
contentBytes,
|
||||
mediaFile.MediaType,
|
||||
mediaFile.MineType,
|
||||
string.Empty,
|
||||
mediaFile.OwnerType,
|
||||
mediaFile.OwnerId
|
||||
);
|
||||
}
|
||||
catch (FileNotFoundException ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Media file not found on storage.");
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<bool> HasMediaAsync(Guid mediaId)
|
||||
{
|
||||
return await _dbContext.MediaFiles.AsNoTracking()
|
||||
.FirstOrDefaultAsync(x => x.Id == mediaId) is not null;
|
||||
}
|
||||
|
||||
public async Task<bool> HasMediaByUrlAsync(string url)
|
||||
{
|
||||
return await _dbContext.MediaFiles.AsNoTracking()
|
||||
.FirstOrDefaultAsync(x => x.Url == url) is not null;
|
||||
}
|
||||
|
||||
public async Task AttachToMessageAsync(Guid mediaId, Guid messageId)
|
||||
{
|
||||
var mediaFile = await _dbContext.MediaFiles
|
||||
.FirstOrDefaultAsync(x => x.Id == mediaId)
|
||||
?? throw new KeyNotFoundException($"No media found by given id {mediaId}");
|
||||
|
||||
if (mediaFile.OwnerType != MediaOwnerType.Message)
|
||||
{
|
||||
_logger.LogWarning("Attempt to attach already owned media {MediaId}", mediaId);
|
||||
throw new InvalidOperationException($"Media {mediaId} is already attached to {mediaFile.OwnerType}");
|
||||
}
|
||||
|
||||
mediaFile.OwnerType = MediaOwnerType.Message;
|
||||
mediaFile.OwnerId = messageId;
|
||||
|
||||
_dbContext.MediaFiles.Update(mediaFile);
|
||||
await _dbContext.SaveChangesAsync();
|
||||
|
||||
_logger.LogInformation("Media {MediaId} successfully attached to message {MessageId}", mediaId, messageId);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user