Fixes and a lot of changes

This commit is contained in:
2026-05-14 22:13:22 +02:00
parent 80f44422a0
commit f62cf057d2
62 changed files with 113 additions and 182 deletions
@@ -3,13 +3,13 @@ using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Configuration;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Events;
using Musify.Application.PlayLists.Commands;
using Musify.Application.PlayLists.Responses;
using Musify.Application.UploadIntents;
using Musify.Application.Extensions;
using Musify.Application.Abstractions.Application;
using Musify.Application.Services;
using Musify.Domain.Entities;
namespace Musify.Application.PlayLists.Handlers
@@ -17,7 +17,7 @@ namespace Musify.Application.PlayLists.Handlers
public class CreatePlayListCommandHandler(
IEventBus eventBus,
IDatabase database,
IUploadIntentService uploadIntentService,
UploadIntentValidator uploadIntentValidator,
IStorageService storageService,
ILogger<CreatePlayListCommandHandler> logger,
ApplicationStorageConfiguration storageConfiguration,
@@ -41,7 +41,7 @@ namespace Musify.Application.PlayLists.Handlers
if (request.PictureIntentId.HasValue)
{
var validation = await uploadIntentService.ValidateAndLoadAsync(
var validation = await uploadIntentValidator.ValidateAndLoadAsync(
uploadIntentConfiguration,
request.PictureIntentId.Value, request.UserId, cancellationToken);
if (!validation.IsSuccess)
@@ -2,7 +2,7 @@ using Ardalis.Result;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Events;
using Musify.Application.PlayLists.Commands;
using Musify.Domain.Entities;
@@ -1,6 +1,6 @@
using Ardalis.Result;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.PlayLists.Responses;
using Musify.Application.PlayLists.Queries;
using Mediator;
@@ -1,7 +1,7 @@
using Ardalis.Result;
using Ardalis.Result;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Abstractions.Application;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Pagination;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.PlayLists.Responses;
using Musify.Application.PlayLists.Queries;
using X.PagedList.EF;
@@ -1,7 +1,7 @@
using Ardalis.Result;
using Ardalis.Result;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Abstractions.Application;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Pagination;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.PlayLists.Responses;
using Musify.Application.PlayLists.Queries;
using X.PagedList.EF;
@@ -2,19 +2,18 @@ using Ardalis.Result;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Abstractions.Application;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Configuration;
using Musify.Application.PlayLists.Commands;
using Musify.Application.PlayLists.Responses;
using Musify.Application.UploadIntents;
using Musify.Application.Services;
using Musify.Domain.Entities;
namespace Musify.Application.PlayLists.Handlers
{
public class RequestPlayListPictureUploadCommandHandler(
IDatabase database,
IUploadIntentService uploadIntentService,
UploadIntentValidator uploadIntentValidator,
IStorageService storageService,
ILogger<RequestPlayListPictureUploadCommandHandler> logger,
ApplicationStorageConfiguration storageConfiguration,
@@ -22,8 +21,6 @@ namespace Musify.Application.PlayLists.Handlers
UploadIntentConfiguration uploadIntentConfiguration)
: ICommandHandler<RequestPlayListPictureUploadCommand, Result<PlayListPictureUploadResponse>>
{
static readonly string[] AllowedExtensions = [".webp", ".png", ".jpg", ".jpeg"];
public async ValueTask<Result<PlayListPictureUploadResponse>> Handle(RequestPlayListPictureUploadCommand request, CancellationToken cancellationToken)
{
var userExists = await database.Users
@@ -35,14 +32,10 @@ namespace Musify.Application.PlayLists.Handlers
return Result.NotFound($"User {request.UserId} not found");
}
var extensionResult = UploadIntentHelpers.ValidateExtension(request.FileType, AllowedExtensions);
if (!extensionResult.IsSuccess)
return Result.Invalid(extensionResult.Errors.Select(error => new ValidationError(error)).ToArray());
var effectiveSizeBytes = request.ExpectedSizeBytes
?? uploadIntentConfiguration.DefaultExpectedPictureSizeBytes;
var objectName = Guid.NewGuid() + extensionResult.Value;
var objectName = $"{Guid.NewGuid()}.{request.FileType.TrimStart('.').ToLowerInvariant()}";
var tempKey = playListConfiguration.Routes.BuildTempPicturePath(
uploadIntentConfiguration.TempRootPrefix, request.UserId, objectName);
@@ -59,11 +52,14 @@ namespace Musify.Application.PlayLists.Handlers
await using var transaction = await database.BeginTransactionAsync(
System.Data.IsolationLevel.Serializable, cancellationToken);
var quotaCheck = await uploadIntentService.CheckQuotaAsync(
uploadIntentConfiguration, logger,
var quotaCheck = await uploadIntentValidator.CheckQuotaAsync(
uploadIntentConfiguration,
request.UserId, effectiveSizeBytes, 1, cancellationToken);
if (!quotaCheck.IsSuccess)
{
logger.LogWarning("User {UserId} failed upload intent quota check", request.UserId);
return quotaCheck;
}
var intent = new UploadIntent
{
@@ -3,13 +3,13 @@ using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Musify.Application.Configuration;
using Musify.Application.Abstractions.Infrastructure;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Events;
using Musify.Application.PlayLists.Commands;
using Musify.Application.PlayLists.Responses;
using Musify.Application.UploadIntents;
using Musify.Application.Extensions;
using Musify.Application.Abstractions.Application;
using Musify.Application.Services;
using Musify.Domain.Entities;
namespace Musify.Application.PlayLists.Handlers
@@ -17,7 +17,7 @@ namespace Musify.Application.PlayLists.Handlers
public class UpdatePlayListCommandHandler(
IEventBus eventBus,
IDatabase database,
IUploadIntentService uploadIntentService,
UploadIntentValidator uploadIntentValidator,
IStorageService storageService,
ILogger<UpdatePlayListCommandHandler> logger,
ApplicationStorageConfiguration storageConfiguration,
@@ -53,7 +53,7 @@ namespace Musify.Application.PlayLists.Handlers
if (request.NewPictureIntentId.HasValue)
{
var validation = await uploadIntentService.ValidateAndLoadAsync(
var validation = await uploadIntentValidator.ValidateAndLoadAsync(
uploadIntentConfiguration,
request.NewPictureIntentId.Value, request.UserId, cancellationToken);
if (!validation.IsSuccess)
@@ -1,6 +1,6 @@
using Ardalis.Result;
using Ardalis.Result;
using Mediator;
using Musify.Application.Abstractions.Application;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
namespace Musify.Application.PlayLists.Queries
@@ -1,6 +1,6 @@
using Ardalis.Result;
using Ardalis.Result;
using Mediator;
using Musify.Application.Abstractions.Application;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
namespace Musify.Application.PlayLists.Queries