Update structure

Application/Common/ImageSize.cs

@@ -1,4 +1,4 @@
-namespace Musify.Application.Events
+namespace Musify.Application.Common
 {
     public record ImageSize(
         string SavePath,

Application/Contracts/Application/IFileData.cs

@@ -1,13 +0,0 @@
-namespace Musify.Application.Contracts.Application
-{
-    public interface IFileData
-    {
-        Stream FileStream { get; }
-
-        string FileName { get; }
-
-        string FileType { get; }
-
-        string ContentType { get; }
-    }
-}

Application/Contracts/IAudioTranscoderService.cs

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

Application/Contracts/IDatabase.cs

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

Application/Contracts/IDatabaseTransaction.cs

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

Application/Contracts/IEventBus.cs

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

Application/Contracts/IPictureService.cs

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

Application/Contracts/IStorageService.cs

@@ -1,11 +1,11 @@
-namespace Musify.Application.Contracts.Infrastructure
+namespace Musify.Application.Contracts
 {
     public interface IStorageService
     {
         Task<Stream> GetFileAsync(string bucket, string key, CancellationToken cancellationToken);
 
         // Returns null if the object does not exist
-        Task<ObjectMetadata?> HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken);
+        Task<ObjectMetaData?> HeadObjectAsync(string bucket, string key, CancellationToken cancellationToken);
 
         Task<string> GetUrlAsync(string bucket, string key, TimeSpan ExpirationTime, CancellationToken cancellationToken);
 

Application/Contracts/Infrastructure/ObjectMetadata.cs

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

Application/Contracts/ObjectMetaData.cs

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

Application/Events/CreatePlayListResourcesEvent.cs

@@ -1,3 +1,5 @@
+using Musify.Application.Common;
+
 namespace Musify.Application.Events
 {
     public record CreatePlayListResourcesEvent(

Application/Events/CreateTrackResourcesEvent.cs

@@ -1,3 +1,5 @@
+using Musify.Application.Common;
+
 namespace Musify.Application.Events
 {
     public record CreateTrackResourcesEvent(

Application/Events/UpdatePlayListPictureEvent.cs

@@ -1,3 +1,5 @@
+using Musify.Application.Common;
+
 namespace Musify.Application.Events
 {
     public record UpdatePlayListPictureEvent(

Application/Events/UpdatePlayListPictureSourceEvent.cs

@@ -1,3 +1,5 @@
+using Musify.Application.Common;
+
 namespace Musify.Application.Events
 {
     public record UpdatePlayListPictureSourceEvent(

Application/Events/UpdateTrackPictureEvent.cs

@@ -1,3 +1,5 @@
+using Musify.Application.Common;
+
 namespace Musify.Application.Events
 {
     public record UpdateTrackPictureEvent(

Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs

@@ -3,13 +3,15 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Common;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.Extensions;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs

@@ -2,10 +2,11 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Contracts;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs

@@ -1,9 +1,9 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using Mediator;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs

@@ -1,11 +1,11 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
 using Mediator;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs

@@ -1,11 +1,11 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.PlayLists.Queries;
 using X.PagedList.EF;
 using Mediator;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs

@@ -2,12 +2,13 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs

@@ -3,13 +3,15 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Common;
 using Musify.Application.Events;
 using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.Extensions;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.PlayLists.Handlers
 {

Application/Services/UploadIntentValidator.cs

@@ -1,8 +1,9 @@
 using Ardalis.Result;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.Services;
 

Application/Tracks/Handlers/CreateTrackCommandHandler.cs

@@ -3,15 +3,17 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Common;
 using Musify.Application.Events;
 using Musify.Application.Tracks.Commands;
 using Musify.Application.Tracks.Responses;
 using Musify.Application.Extensions;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class CreateTrackCommandHandler(
         IDatabase database,

Application/Tracks/Handlers/DeleteTrackCommandHandler.cs

@@ -2,12 +2,13 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Commands;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
 using Musify.Application.Events;
+using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class DeleteTrackCommandHandler(
         IDatabase database,

Application/Tracks/Handlers/GetTrackByIdQueryHandler.cs

@@ -1,11 +1,11 @@
 using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Contracts;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class GetTrackByIdQueryHandler(IDatabase database)
         : IQueryHandler<GetTrackByIdQuery, Result<TrackApplicationResponse> >

Application/Tracks/Handlers/GetTracksByUserIdQueryHandler.cs

@@ -2,12 +2,12 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
+using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class GetTracksByUserIdQueryHandler(IDatabase database)
         : IQueryHandler<GetTracksByUserIdQuery, Result<PaginatedResponse<TrackApplicationResponse>> >

Application/Tracks/Handlers/GetTracksQueryHandler.cs

@@ -2,12 +2,12 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
+using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class GetTracksQueryHandler(IDatabase database)
         : IQueryHandler<GetTracksQuery, Result<PaginatedResponse<TrackApplicationResponse>> >

Application/Tracks/Handlers/RequestTrackUploadUrlsCommandHandler.cs

@@ -2,14 +2,15 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Configuration;
 using Musify.Application.Services;
 using Musify.Application.Tracks.Commands;
 using Musify.Application.Tracks.Responses;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
+using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handler
+namespace Musify.Application.Tracks.Handlers
 {
     public class RequestTrackUploadUrlsCommandHandler(
         IDatabase database,

Application/Users/Handlers/CreateUserCommandHandler.cs

@@ -2,7 +2,7 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts.Infrastructure;
+using Musify.Application.Contracts;
 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.Contracts.Infrastructure;
+using Musify.Application.Contracts;
 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.Contracts.Infrastructure;
+using Musify.Application.Contracts;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 

Application/Users/Handlers/GetUsersQueryHandler.cs

@@ -2,10 +2,10 @@ using Ardalis.Result;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 using X.PagedList.EF;
+using Musify.Application.Contracts;
 
 namespace Musify.Application.Users.Handlers
 {