Fixes and a lot of changes

Application/Abstractions/Application/IUploadIntentService.cs

@@ -1,23 +0,0 @@
-using Ardalis.Result;
-using Microsoft.Extensions.Logging;
-using Musify.Application.Configuration;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.Abstractions.Application;
-
-public interface IUploadIntentService
-{
-    Task<Result> CheckQuotaAsync(
-        UploadIntentConfiguration config,
-        ILogger logger,
-        Guid userId,
-        long requiredBytes,
-        int requiredIntentCount,
-        CancellationToken cancellationToken);
-
-    Task<Result<UploadIntent>> ValidateAndLoadAsync(
-        UploadIntentConfiguration config,
-        Guid intentId,
-        Guid userId,
-        CancellationToken cancellationToken);
-}

Application/Contracts/Application/IFileData.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Application
+namespace Musify.Application.Contracts.Application
 {
     public interface IFileData
     {

Application/Contracts/Infrastructure/IAudioTranscoderService.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IAudioTranscoderService
     {

Application/Contracts/Infrastructure/IDatabase.cs

@@ -1,7 +1,7 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Musify.Domain.Entities;
 
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IDatabase
     {

Application/Contracts/Infrastructure/IDatabaseTransaction.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IDatabaseTransaction : IAsyncDisposable
     {

Application/Contracts/Infrastructure/IEventBus.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IEventBus
     {

Application/Contracts/Infrastructure/IPictureService.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IPictureService
     {

Application/Contracts/Infrastructure/IStorageService.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public interface IStorageService
     {

Application/Contracts/Infrastructure/ObjectMetadata.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Abstractions.Infrastructure
+namespace Musify.Application.Contracts.Infrastructure
 {
     public record ObjectMetadata(string ContentType, long ContentLength);
 }

Application/Pagination/PaginatedResponse.cs

@@ -1,6 +1,6 @@
-using X.PagedList;
+using X.PagedList;
 
-namespace Musify.Application.Abstractions.Application
+namespace Musify.Application.Pagination
 {
     public record PaginatedResponse<T>(
         IReadOnlyCollection<T> Items,

Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs

@@ -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)

Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs

@@ -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;

Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs

@@ -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;

Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs

@@ -1,7 +1,7 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;

Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs

@@ -1,7 +1,7 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;

Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs

@@ -2,19 +2,18 @@ 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.Abstractions.Application;
 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(
+                var quotaCheck = await uploadIntentValidator.CheckQuotaAsync(
-                    uploadIntentConfiguration, logger,
+                    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
                 {

Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs

@@ -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)

Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs

@@ -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

Application/PlayLists/Queries/GetPlayListsQuery.cs

@@ -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

Application/Services/UploadIntentValidator.cs

@@ -1,20 +1,17 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
+using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Abstractions.Infrastructure;
-using Musify.Application.Abstractions.Application;
 using Musify.Application.Configuration;
 using Musify.Domain.Entities;
 
 namespace Musify.Application.Services;
 
-public sealed class UploadIntentService(
+public sealed class UploadIntentValidator(
     IDatabase database,
-    IStorageService storageService) : IUploadIntentService
+    IStorageService storageService)
 {
     public async Task<Result> CheckQuotaAsync(
         UploadIntentConfiguration config,
-        ILogger logger,
         Guid userId,
         long requiredBytes,
         int requiredIntentCount,
@@ -26,17 +23,11 @@ public sealed class UploadIntentService(
             .ToListAsync(cancellationToken);
 
         if (activeIntents.Count + requiredIntentCount > config.MaxActiveUploadIntentsPerUser)
-        {
-            logger.LogWarning("User {UserId} exceeded max active upload intents ({Max})", userId, config.MaxActiveUploadIntentsPerUser);
             return Result.Invalid(new ValidationError("Upload intent limit exceeded. Wait for existing uploads to complete or expire."));
-        }
 
         var activeBytes = activeIntents.Sum(i => i.ExpectedSizeBytes ?? config.DefaultExpectedPictureSizeBytes);
         if (activeBytes + requiredBytes > config.MaxActiveUploadBytesPerUser)
-        {
-            logger.LogWarning("User {UserId} exceeded max active upload bytes ({Max})", userId, config.MaxActiveUploadBytesPerUser);
             return Result.Invalid(new ValidationError("Upload byte quota exceeded. Wait for existing uploads to complete or expire."));
-        }
 
         return Result.Success();
     }

Application/Tracks/Handler/CreateTrackCommandHandler.cs

@@ -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.Tracks.Commands;
 using Musify.Application.Tracks.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.Tracks.Handler
@@ -17,7 +17,7 @@ namespace Musify.Application.Tracks.Handler
     public class CreateTrackCommandHandler(
         IDatabase database,
         IEventBus eventBus,
-        IUploadIntentService uploadIntentService,
+        UploadIntentValidator uploadIntentValidator,
         IStorageService storageService,
         ILogger<CreateTrackCommandHandler> logger,
         ApplicationStorageConfiguration storageConfiguration,
@@ -35,13 +35,13 @@ namespace Musify.Application.Tracks.Handler
                 return Result.NotFound($"User {request.UserId} not found");
             }
 
-            var pictureValidation = await uploadIntentService.ValidateAndLoadAsync(
+            var pictureValidation = await uploadIntentValidator.ValidateAndLoadAsync(
                 uploadIntentConfiguration,
                 request.PictureIntentId, request.UserId, cancellationToken);
             if (!pictureValidation.IsSuccess)
                 return pictureValidation.As<UploadIntent, TrackApplicationResponse>();
 
-            var audioValidation = await uploadIntentService.ValidateAndLoadAsync(
+            var audioValidation = await uploadIntentValidator.ValidateAndLoadAsync(
                 uploadIntentConfiguration,
                 request.AudioIntentId, request.UserId, cancellationToken);
             if (!audioValidation.IsSuccess)

Application/Tracks/Handler/DeleteTrackCommandHandler.cs

@@ -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.Tracks.Commands;
 using Musify.Domain.Entities;
 using Musify.Application.Events;

Application/Tracks/Handler/GetTrackByIdQueryHandler.cs

@@ -1,7 +1,7 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 

Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs

@@ -1,8 +1,8 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;

Application/Tracks/Handler/GetTracksQueryHandler.cs

@@ -1,8 +1,8 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;

Application/Tracks/Handler/RequestTrackUploadUrlsCommandHandler.cs

@@ -2,19 +2,18 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Abstractions.Infrastructure;
 using Musify.Application.Configuration;
+using Musify.Application.Services;
 using Musify.Application.Tracks.Commands;
 using Musify.Application.Tracks.Responses;
-using Musify.Application.UploadIntents;
 using Musify.Domain.Entities;
 
 namespace Musify.Application.Tracks.Handler
 {
     public class RequestTrackUploadUrlsCommandHandler(
         IDatabase database,
-        IUploadIntentService uploadIntentService,
+        UploadIntentValidator uploadIntentValidator,
         IStorageService storageService,
         ILogger<RequestTrackUploadUrlsCommandHandler> logger,
         ApplicationStorageConfiguration storageConfiguration,
@@ -22,9 +21,6 @@ namespace Musify.Application.Tracks.Handler
         UploadIntentConfiguration uploadIntentConfiguration)
         : ICommandHandler<RequestTrackUploadUrlsCommand, Result<TrackUploadUrlsResponse>>
     {
-        static readonly string[] AllowedPictureExtensions = [".webp", ".png", ".jpg", ".jpeg"];
-        static readonly string[] AllowedAudioExtensions = [".mp3", ".wav", ".m4a", ".flac", ".ogg", ".aac", ".opus"];
-
         public async ValueTask<Result<TrackUploadUrlsResponse>> Handle(RequestTrackUploadUrlsCommand request, CancellationToken cancellationToken)
         {
             var userExists = await database.Users
@@ -36,21 +32,13 @@ namespace Musify.Application.Tracks.Handler
                 return Result.NotFound($"User {request.UserId} not found");
             }
 
-            var pictureExtensionResult = UploadIntentHelpers.ValidateExtension(request.PictureFileType, AllowedPictureExtensions);
-            if (!pictureExtensionResult.IsSuccess)
-                return Result.Invalid(pictureExtensionResult.Errors.Select(error => new ValidationError(error)).ToArray());
-
-            var audioExtensionResult = UploadIntentHelpers.ValidateExtension(request.AudioFileType, AllowedAudioExtensions);
-            if (!audioExtensionResult.IsSuccess)
-                return Result.Invalid(audioExtensionResult.Errors.Select(error => new ValidationError(error)).ToArray());
-
             var effectivePictureSize = request.ExpectedPictureSizeBytes
                 ?? uploadIntentConfiguration.DefaultExpectedPictureSizeBytes;
             var effectiveAudioSize = request.ExpectedAudioSizeBytes
                 ?? uploadIntentConfiguration.DefaultExpectedAudioSizeBytes;
 
-            var pictureObjectName = Guid.NewGuid() + pictureExtensionResult.Value;
+            var pictureObjectName = $"{Guid.NewGuid()}.{request.PictureFileType.TrimStart('.').ToLowerInvariant()}";
-            var audioObjectName = Guid.NewGuid() + audioExtensionResult.Value;
+            var audioObjectName = $"{Guid.NewGuid()}.{request.AudioFileType.TrimStart('.').ToLowerInvariant()}";
 
             var tempPictureKey = trackConfiguration.Routes.BuildTempPicturePath(
                 uploadIntentConfiguration.TempRootPrefix, request.UserId, pictureObjectName);
@@ -80,11 +68,14 @@ namespace Musify.Application.Tracks.Handler
                 await using var transaction = await database.BeginTransactionAsync(
                     System.Data.IsolationLevel.Serializable, cancellationToken);
 
-                var quotaCheck = await uploadIntentService.CheckQuotaAsync(
+                var quotaCheck = await uploadIntentValidator.CheckQuotaAsync(
-                    uploadIntentConfiguration, logger,
+                    uploadIntentConfiguration,
                     request.UserId, effectivePictureSize + effectiveAudioSize, 2, cancellationToken);
                 if (!quotaCheck.IsSuccess)
+                {
+                    logger.LogWarning("User {UserId} failed upload intent quota check", request.UserId);
                     return quotaCheck;
+                }
 
                 var pictureIntent = new UploadIntent
                 {

Application/Tracks/Queries/GetTracksByUserIdQuery.cs

@@ -1,6 +1,6 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Mediator;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries

Application/Tracks/Queries/GetTracksQuery.cs

@@ -1,6 +1,6 @@
-using Ardalis.Result;
+using Ardalis.Result;
 using Mediator;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
 using Musify.Application.Tracks.Responses;
 
 namespace Musify.Application.Tracks.Queries

Application/UploadIntents/UploadIntentHelpers.cs

@@ -1,24 +0,0 @@
-using Ardalis.Result;
-
-namespace Musify.Application.UploadIntents
-{
-    internal static class UploadIntentHelpers
-    {
-        internal static Result<string> ValidateExtension(string fileType, string[] allowedExtensions)
-        {
-            var extension = fileType.Trim();
-            if (!extension.StartsWith('.'))
-                extension = "." + extension;
-
-            extension = extension.ToLowerInvariant();
-
-            if (extension.Contains('/') || extension.Contains('\\'))
-                return Result.Error("Invalid FileType");
-
-            if (!allowedExtensions.Contains(extension))
-                return Result.Error($"Unsupported FileType '{extension}'");
-
-            return Result.Success(extension);
-        }
-    }
-}

Application/Users/Handlers/CreateUserCommandHandler.cs

@@ -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.Users.Commands;
 using Musify.Application.Users.Responses;
 

Application/Users/Handlers/GetUserByIdQueryHandler.cs

@@ -1,7 +1,7 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 

Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs

@@ -1,7 +1,7 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 

Application/Users/Handlers/GetUsersQueryHandler.cs

@@ -1,8 +1,8 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 using X.PagedList.EF;

Application/Users/Queries/GetUsersQuery.cs

@@ -1,6 +1,6 @@
 using Ardalis.Result;
 using Mediator;
-using Musify.Application.Abstractions.Application;
+using Musify.Application.Pagination;
 using Musify.Application.Users.Responses;
 
 namespace Musify.Application.Users.Queries

Domain/Domain.csproj

@@ -11,4 +11,5 @@
 	<RepositoryUrl>https://github.com/XShine555/MusifyBackend</RepositoryUrl>
   </PropertyGroup>
 
+
 </Project>

Infrastructure/Jobs/TempUploadsCleanupJob.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 
 namespace Musify.Infrastructure.Jobs

Infrastructure/Jobs/UploadIntentExpirationJob.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Domain.Entities;
 

Infrastructure/MassTransit/Activities/Audio/GenerateAudioWorkflowPathsActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 

Infrastructure/MassTransit/Activities/Audio/TranscodeDashAudioActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;

Infrastructure/MassTransit/Activities/Audio/UpdateTrackAudioActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;

Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 

Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Amazon.S3;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using System.Net;
 

Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs

@@ -1,6 +1,6 @@
-using MassTransit;
+using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Arguments;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Files

Infrastructure/MassTransit/Activities/Files/TransferFilesToBucketActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 

Infrastructure/MassTransit/Activities/Files/UploadFileToBucketActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;
 

Infrastructure/MassTransit/Activities/Pictures/ResizePictureActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 

Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 

Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs

@@ -1,6 +1,6 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 

Infrastructure/MassTransit/Activities/PlayLists/DeletePlayListFromDbActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 
 namespace Musify.Infrastructure.MassTransit.Activities.PlayLists
 {

Infrastructure/MassTransit/Activities/PlayLists/MarkPlayListAsRemovingActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 
 namespace Musify.Infrastructure.MassTransit.Activities.PlayLists

Infrastructure/MassTransit/Activities/Tracks/DeleteTrackFromDbActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Tracks
 {

Infrastructure/MassTransit/Activities/Tracks/MarkTrackAsRemovingActivity.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 
 namespace Musify.Infrastructure.MassTransit.Activities.Tracks

Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs

@@ -1,7 +1,7 @@
-using MassTransit;
+using MassTransit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Persistence;
 

Infrastructure/MassTransit/EventBus/MassTransitEventBus.cs

@@ -1,5 +1,5 @@
-using MassTransit;
+using MassTransit;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 
 namespace Musify.Infrastructure.MassTransit
 {

Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using MassTransit.Courier.Contracts;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Infrastructure.MassTransit.Activities.Files;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;

Infrastructure/MassTransit/RoutingSlip/Builders/DeleteTrackRoutingSlipBuilder.cs

@@ -1,7 +1,7 @@
 using MassTransit;
 using MassTransit.Courier.Contracts;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Infrastructure.MassTransit.Activities.Files;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;

Infrastructure/Persistence/Database.cs

@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using MassTransit;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Configuration;
-using AppIDatabase = Musify.Application.Abstractions.Infrastructure.IDatabase;
+using AppIDatabase = Musify.Application.Contracts.Infrastructure.IDatabase;
 
 namespace Musify.Infrastructure.Persistence
 {

Infrastructure/Persistence/DatabaseDependencyInjection.cs

@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.Configuration;
 
 namespace Musify.Infrastructure.Persistence

Infrastructure/Services/AudioTranscoderService.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Infrastructure.Configuration;
 using System.Diagnostics;
 

Infrastructure/Services/PictureService.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 

Infrastructure/Services/ServicesDependencyInjection.cs

@@ -1,9 +1,8 @@
-using Amazon.S3;
+using Amazon.S3;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
-using Musify.Application.Abstractions.Application;
 using Musify.Application.Configuration;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.Jobs;
@@ -56,7 +55,7 @@ namespace Musify.Infrastructure.Services
             serviceDescriptors.AddSingleton(serviceProvider =>
                 serviceProvider.GetRequiredService<IOptions<UploadIntentConfiguration>>().Value);
 
-            serviceDescriptors.AddScoped<IUploadIntentService, UploadIntentService>();
+            serviceDescriptors.AddScoped<UploadIntentValidator>();
 
             return serviceDescriptors;
         }

Infrastructure/Services/StorageService.cs

@@ -3,10 +3,10 @@ using Amazon.S3.Model;
 using Amazon.S3.Transfer;
 using Microsoft.Extensions.Logging;
 using MimeMapping;
-using Musify.Application.Abstractions.Infrastructure;
+using Musify.Application.Contracts.Infrastructure;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Configuration;
-using ObjectMetadata = Musify.Application.Abstractions.Infrastructure.ObjectMetadata;
+using ObjectMetadata = Musify.Application.Contracts.Infrastructure.ObjectMetadata;
 
 namespace Musify.Infrastructure.Services
 {