refactor(application): co-locate each command/query with its handler

One file per use case under the feature folder (Tracks/PlayLists/Users),
dropping the Commands/Queries/Handlers sub-folders and their namespaces.
Each file now holds the record and its handler in namespace
Musify.Application.<Feature>; external usings updated accordingly.

Build: 0 warnings, 0 errors.

backend/Musify.Api/Authentication/JwtBearerEventsHandler.cs

@@ -1,6 +1,6 @@
 using Mediator;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Musify.Application.Users.Commands;
+using Musify.Application.Users;
 using System.Security.Claims;
 
 namespace Musify.Api.Authentication;

backend/Musify.Api/Endpoints/PlayListEndpoints.cs

@@ -1,6 +1,5 @@
 using Mediator;
-using Musify.Application.PlayLists.Commands;
+using Musify.Application.PlayLists;
-using Musify.Application.PlayLists.Queries;
 using Musify.Api.Authentication;
 using Musify.Api.DataTransferObjects.PlayLists;
 using Musify.Api.Extensions;

backend/Musify.Api/Endpoints/TrackEndpoints.cs

@@ -1,6 +1,5 @@
 using Mediator;
-using Musify.Application.Tracks.Commands;
+using Musify.Application.Tracks;
-using Musify.Application.Tracks.Queries;
 using Musify.Api.Authentication;
 using Musify.Api.DataTransferObjects.Tracks;
 using Musify.Api.Extensions;

backend/Musify.Api/Endpoints/UserEndpoints.cs

@@ -1,6 +1,5 @@
 using Mediator;
-using Musify.Application.Users.Commands;
+using Musify.Application.Users;
-using Musify.Application.Users.Queries;
 using Musify.Api.DataTransferObjects.Users;
 using Musify.Api.Extensions;
 using Musify.Api.Filters;

backend/Musify.Application/PlayLists/AddTrackToPlayList.cs

@@ -3,11 +3,13 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
-using Musify.Application.PlayLists.Commands;
 using Musify.Domain.Entities;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record AddTrackToPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
+        : ICommand<ErrorOr<Success>>;
+
     public class AddTrackToPlayListCommandHandler(
         IDatabase database,
         ILogger<AddTrackToPlayListCommandHandler> logger)

backend/Musify.Application/PlayLists/Commands/AddTrackToPlayListCommand.cs

@@ -1,8 +0,0 @@
-using ErrorOr;
-using Mediator;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record AddTrackToPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
-        : ICommand<ErrorOr<Success>>;
-}

backend/Musify.Application/PlayLists/Commands/CreatePlayListCommand.cs

@@ -1,13 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record CreatePlayListCommand(
-        long UserId,
-        string Name,
-        string Description,
-        Guid? PictureIntentId)
-        : ICommand<ErrorOr<PlayListApplicationResponse>>;
-}

backend/Musify.Application/PlayLists/Commands/DeletePlayListCommand.cs

@@ -1,8 +0,0 @@
-using ErrorOr;
-using Mediator;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record DeletePlayListCommand(long UserId, Guid PlayListId)
-        : ICommand<ErrorOr<Success>>;
-}

backend/Musify.Application/PlayLists/Commands/RemoveTrackFromPlayListCommand.cs

@@ -1,8 +0,0 @@
-using ErrorOr;
-using Mediator;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record RemoveTrackFromPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
-        : ICommand<ErrorOr<Success>>;
-}

backend/Musify.Application/PlayLists/Commands/RequestPlayListPictureUploadCommand.cs

@@ -1,13 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record RequestPlayListPictureUploadCommand(
-        long UserId,
-        string FileType,
-        string ContentType,
-        long? ExpectedSizeBytes = null)
-        : ICommand<ErrorOr<PlayListPictureUploadResponse>>;
-}

backend/Musify.Application/PlayLists/Commands/UpdatePlayListCommand.cs

@@ -1,14 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Commands
-{
-    public record UpdatePlayListCommand(
-        long UserId,
-        Guid PlayListId,
-        string? NewName,
-        string? NewDescription,
-        Guid? NewPictureIntentId)
-        : ICommand<ErrorOr<PlayListApplicationResponse>>;
-}

backend/Musify.Application/PlayLists/CreatePlayList.cs

@@ -5,14 +5,20 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Shared;
 using Musify.Application.Events;
-using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record CreatePlayListCommand(
+        long UserId,
+        string Name,
+        string Description,
+        Guid? PictureIntentId)
+        : ICommand<ErrorOr<PlayListApplicationResponse>>;
+
     public class CreatePlayListCommandHandler(
         IEventBus eventBus,
         IDatabase database,

backend/Musify.Application/PlayLists/DeletePlayList.cs

@@ -4,11 +4,13 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
 using Musify.Application.Events;
-using Musify.Application.PlayLists.Commands;
 using Musify.Domain.ValueObjects;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record DeletePlayListCommand(long UserId, Guid PlayListId)
+        : ICommand<ErrorOr<Success>>;
+
     public class DeletePlayListCommandHandler(
         IDatabase database,
         IEventBus eventBus,
@@ -57,4 +59,4 @@ namespace Musify.Application.PlayLists.Handlers
             return new Success();
         }
     }
-}
+}

backend/Musify.Application/PlayLists/GetPlayListById.cs

@@ -1,12 +1,14 @@
 using ErrorOr;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.PlayLists.Responses;
-using Musify.Application.PlayLists.Queries;
 using Mediator;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record GetPlayListByIdQuery(Guid Id)
+        : IQuery<ErrorOr<PlayListApplicationResponse>>;
+
     public class GetPlayListByIdQueryHandler(IDatabase database)
         : IQueryHandler<GetPlayListByIdQuery, ErrorOr<PlayListApplicationResponse>>
     {
@@ -24,4 +26,4 @@ namespace Musify.Application.PlayLists.Handlers
             return playList;
         }
     }
-}
+}

backend/Musify.Application/PlayLists/GetPlayListTracks.cs

@@ -3,12 +3,17 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts;
 using Musify.Application.Pagination;
-using Musify.Application.PlayLists.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record GetPlayListTracksQuery(
+        Guid PlayListId,
+        int PageNumber = 1,
+        int PageSize = 10)
+        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse>>>;
+
     public class GetPlayListTracksQueryHandler(IDatabase database)
         : IQueryHandler<GetPlayListTracksQuery, ErrorOr<PaginatedResponse<TrackApplicationResponse>> >
     {

backend/Musify.Application/PlayLists/GetPlayLists.cs

@@ -2,13 +2,15 @@ using ErrorOr;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
 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
+namespace Musify.Application.PlayLists
 {
+    public record GetPlayListsQuery(int PageNumber = 1, int PageSize = 10)
+        : IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
+
     public class GetPlayListsQueryHandler(IDatabase database)
         : IQueryHandler<GetPlayListsQuery, ErrorOr<PaginatedResponse<PlayListApplicationResponse> >>
     {
@@ -25,4 +27,4 @@ namespace Musify.Application.PlayLists.Handlers
             return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);
         }
     }
-}
+}

backend/Musify.Application/PlayLists/GetPlayListsByUserId.cs

@@ -2,13 +2,19 @@ using ErrorOr;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
 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
+namespace Musify.Application.PlayLists
 {
+    public record GetPlayListsByUserIdQuery(
+        long UserId,
+        string? Name,
+        int PageNumber = 1,
+        int PageSize = 10)
+        : IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
+
     public class GetPlayListsByUserIdQueryHandler(IDatabase database)
         : IQueryHandler<GetPlayListsByUserIdQuery, ErrorOr<PaginatedResponse<PlayListApplicationResponse> > >
     {
@@ -34,4 +40,4 @@ namespace Musify.Application.PlayLists.Handlers
             return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);
         }
     }
-}
+}

backend/Musify.Application/PlayLists/Queries/GetPlayListByIdQuery.cs

@@ -1,9 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Queries
-{
-    public record GetPlayListByIdQuery(Guid Id)
-        : IQuery<ErrorOr<PlayListApplicationResponse>>;
-}

backend/Musify.Application/PlayLists/Queries/GetPlayListTracksQuery.cs

@@ -1,13 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.PlayLists.Queries
-{
-    public record GetPlayListTracksQuery(
-        Guid PlayListId,
-        int PageNumber = 1,
-        int PageSize = 10)
-        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse>>>;
-}

backend/Musify.Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs

@@ -1,14 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Queries
-{
-    public record GetPlayListsByUserIdQuery(
-        long UserId,
-        string? Name,
-        int PageNumber = 1,
-        int PageSize = 10)
-        : IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
-}

backend/Musify.Application/PlayLists/Queries/GetPlayListsQuery.cs

@@ -1,10 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.PlayLists.Responses;
-
-namespace Musify.Application.PlayLists.Queries
-{
-    public record GetPlayListsQuery(int PageNumber = 1, int PageSize = 10)
-        : IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
-}

backend/Musify.Application/PlayLists/RemoveTrackFromPlayList.cs

@@ -3,10 +3,12 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
-using Musify.Application.PlayLists.Commands;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record RemoveTrackFromPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
+        : ICommand<ErrorOr<Success>>;
+
     public class RemoveTrackFromPlayListCommandHandler(
         IDatabase database,
         ILogger<RemoveTrackFromPlayListCommandHandler> logger)

backend/Musify.Application/PlayLists/RequestPlayListPictureUpload.cs

@@ -3,15 +3,21 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 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
+namespace Musify.Application.PlayLists
 {
+    public record RequestPlayListPictureUploadCommand(
+        long UserId,
+        string FileType,
+        string ContentType,
+        long? ExpectedSizeBytes = null)
+        : ICommand<ErrorOr<PlayListPictureUploadResponse>>;
+
     public class RequestPlayListPictureUploadCommandHandler(
         IDatabase database,
         UploadIntentValidator uploadIntentValidator,

backend/Musify.Application/PlayLists/UpdatePlayList.cs

@@ -5,14 +5,21 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Shared;
 using Musify.Application.Events;
-using Musify.Application.PlayLists.Commands;
 using Musify.Application.PlayLists.Responses;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.PlayLists.Handlers
+namespace Musify.Application.PlayLists
 {
+    public record UpdatePlayListCommand(
+        long UserId,
+        Guid PlayListId,
+        string? NewName,
+        string? NewDescription,
+        Guid? NewPictureIntentId)
+        : ICommand<ErrorOr<PlayListApplicationResponse>>;
+
     public class UpdatePlayListCommandHandler(
         IEventBus eventBus,
         IDatabase database,

backend/Musify.Application/Tracks/Commands/CreateTrackCommand.cs

@@ -1,13 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Commands
-{
-    public record CreateTrackCommand(
-        long UserId,
-        string Title,
-        Guid PictureIntentId,
-        Guid AudioIntentId)
-        : ICommand<ErrorOr<TrackApplicationResponse>>;
-}

backend/Musify.Application/Tracks/Commands/DeleteTrackCommand.cs

@@ -1,10 +0,0 @@
-using ErrorOr;
-using Mediator;
-
-namespace Musify.Application.Tracks.Commands
-{
-    public record DeleteTrackCommand(
-        long UserId,
-        Guid TrackId)
-        : ICommand<ErrorOr<Success>>;
-}

backend/Musify.Application/Tracks/Commands/RequestTrackUploadUrlsCommand.cs

@@ -1,16 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Commands
-{
-    public record RequestTrackUploadUrlsCommand(
-        long UserId,
-        string PictureFileType,
-        string PictureContentType,
-        string AudioFileType,
-        string AudioContentType,
-        long? ExpectedPictureSizeBytes = null,
-        long? ExpectedAudioSizeBytes = null)
-        : ICommand<ErrorOr<TrackUploadUrlsResponse>>;
-}

backend/Musify.Application/Tracks/CreateTrack.cs

@@ -5,15 +5,21 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Shared;
 using Musify.Application.Events;
-using Musify.Application.Tracks.Commands;
 using Musify.Application.Tracks.Responses;
 using Musify.Application.Services;
 using Musify.Domain.Entities;
 using Musify.Domain.ValueObjects;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record CreateTrackCommand(
+        long UserId,
+        string Title,
+        Guid PictureIntentId,
+        Guid AudioIntentId)
+        : ICommand<ErrorOr<TrackApplicationResponse>>;
+
     public class CreateTrackCommandHandler(
         IDatabase database,
         IEventBus eventBus,

backend/Musify.Application/Tracks/DeleteTrack.cs

@@ -2,13 +2,17 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Musify.Application.Tracks.Commands;
 using Musify.Domain.ValueObjects;
 using Musify.Application.Events;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record DeleteTrackCommand(
+        long UserId,
+        Guid TrackId)
+        : ICommand<ErrorOr<Success>>;
+
     public class DeleteTrackCommandHandler(
         IDatabase database,
         IEventBus eventBus,
@@ -67,4 +71,4 @@ namespace Musify.Application.Tracks.Handlers
             return new Success();
         }
     }
-}
+}

backend/Musify.Application/Tracks/GetTrackById.cs

@@ -2,11 +2,13 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts;
-using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record GetTrackByIdQuery(Guid TrackId)
+        : IQuery<ErrorOr<TrackApplicationResponse>>;
+
     public class GetTrackByIdQueryHandler(IDatabase database)
         : IQueryHandler<GetTrackByIdQuery, ErrorOr<TrackApplicationResponse> >
     {
@@ -23,4 +25,4 @@ namespace Musify.Application.Tracks.Handlers
             return track;
         }
     }
-}
+}

backend/Musify.Application/Tracks/GetTrackStream.cs

@@ -4,12 +4,14 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts;
-using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using Musify.Domain.ValueObjects;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record GetTrackStreamQuery(Guid TrackId, long UserId)
+        : IQuery<ErrorOr<TrackStreamResponse>>;
+
     public class GetTrackStreamQueryHandler(
         IDatabase database,
         IStreamTicketService ticketService,

backend/Musify.Application/Tracks/GetTracks.cs

@@ -2,13 +2,15 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
+        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse> >>;
+
     public class GetTracksQueryHandler(IDatabase database)
         : IQueryHandler<GetTracksQuery, ErrorOr<PaginatedResponse<TrackApplicationResponse>> >
     {
@@ -26,4 +28,4 @@ namespace Musify.Application.Tracks.Handlers
             return PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks);
         }
     }
-}
+}

backend/Musify.Application/Tracks/GetTracksByUserId.cs

@@ -2,13 +2,19 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Tracks.Queries;
 using Musify.Application.Tracks.Responses;
 using X.PagedList.EF;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.Tracks.Handlers
+namespace Musify.Application.Tracks
 {
+    public record GetTracksByUserIdQuery(
+        long UserId,
+    string? Name = null,
+        int PageNumber = 1,
+        int PageSize = 10)
+        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse> > >;
+
     public class GetTracksByUserIdQueryHandler(IDatabase database)
         : IQueryHandler<GetTracksByUserIdQuery, ErrorOr<PaginatedResponse<TrackApplicationResponse>> >
     {
@@ -38,4 +44,4 @@ namespace Musify.Application.Tracks.Handlers
             return PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks);
         }
     }
-}
+}

backend/Musify.Application/Tracks/Queries/GetTrackByIdQuery.cs

@@ -1,9 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Queries
-{
-    public record GetTrackByIdQuery(Guid TrackId)
-        : IQuery<ErrorOr<TrackApplicationResponse>>;
-}

backend/Musify.Application/Tracks/Queries/GetTrackStreamQuery.cs

@@ -1,9 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Queries
-{
-    public record GetTrackStreamQuery(Guid TrackId, long UserId)
-        : IQuery<ErrorOr<TrackStreamResponse>>;
-}

backend/Musify.Application/Tracks/Queries/GetTracksByUserIdQuery.cs

@@ -1,14 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Queries
-{
-    public record GetTracksByUserIdQuery(
-        long UserId,
-    string? Name = null,
-        int PageNumber = 1,
-        int PageSize = 10)
-        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse> > >;
-}

backend/Musify.Application/Tracks/Queries/GetTracksQuery.cs

@@ -1,10 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.Tracks.Responses;
-
-namespace Musify.Application.Tracks.Queries
-{
-    public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
-        : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse> >>;
-}

backend/Musify.Application/Tracks/RequestTrackUploadUrls.cs

@@ -4,14 +4,23 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 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.Handlers
+namespace Musify.Application.Tracks
 {
+    public record RequestTrackUploadUrlsCommand(
+        long UserId,
+        string PictureFileType,
+        string PictureContentType,
+        string AudioFileType,
+        string AudioContentType,
+        long? ExpectedPictureSizeBytes = null,
+        long? ExpectedAudioSizeBytes = null)
+        : ICommand<ErrorOr<TrackUploadUrlsResponse>>;
+
     public class RequestTrackUploadUrlsCommandHandler(
         IDatabase database,
         UploadIntentValidator uploadIntentValidator,

backend/Musify.Application/Users/Commands/CreateUserCommand.cs

@@ -1,26 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Users.Responses;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.Users.Commands
-{
-    public record CreateUserCommand(long Id,
-        string Name,
-        string? FirstName,
-        string? SecondName)
-        : ICommand<ErrorOr<UserApplicationResponse>>
-    {
-        public static User ToEntity(CreateUserCommand command)
-        {
-            return new User
-            {
-                Id = command.Id,
-                Name = command.Name,
-                NormalizedName = command.Name.ToUpperInvariant(),
-                FirstName = command.FirstName,
-                SecondName = command.SecondName
-            };
-        }
-    }
-}

backend/Musify.Application/Users/Commands/SyncUserCommand.cs

@@ -1,13 +0,0 @@
-using ErrorOr;
-using Mediator;
-
-namespace Musify.Application.Users.Commands
-{
-    public record SyncUserCommand(
-        long Id,
-        string Name,
-        string? FirstName,
-        string? SecondName,
-        string? ProfilePictureUrl)
-        : ICommand<ErrorOr<Success>>;
-}

backend/Musify.Application/Users/CreateUser.cs

@@ -3,11 +3,30 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
-using Musify.Application.Users.Commands;
 using Musify.Application.Users.Responses;
+using Musify.Domain.Entities;
 
-namespace Musify.Application.Users.Handlers
+namespace Musify.Application.Users
 {
+    public record CreateUserCommand(long Id,
+        string Name,
+        string? FirstName,
+        string? SecondName)
+        : ICommand<ErrorOr<UserApplicationResponse>>
+    {
+        public static User ToEntity(CreateUserCommand command)
+        {
+            return new User
+            {
+                Id = command.Id,
+                Name = command.Name,
+                NormalizedName = command.Name.ToUpperInvariant(),
+                FirstName = command.FirstName,
+                SecondName = command.SecondName
+            };
+        }
+    }
+
     public class CreateUserCommandHandler(IDatabase database, ILogger<CreateUserCommandHandler> logger)
         : ICommandHandler<CreateUserCommand, ErrorOr<UserApplicationResponse> >
     {
@@ -37,4 +56,4 @@ namespace Musify.Application.Users.Handlers
             return UserApplicationResponse.FromEntity(newUser);
         }
     }
-}
+}

backend/Musify.Application/Users/GetUserById.cs

@@ -2,11 +2,13 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts;
-using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 
-namespace Musify.Application.Users.Handlers
+namespace Musify.Application.Users
 {
+    public record GetUserByIdQuery(long Id)
+        : IQuery<ErrorOr<UserApplicationResponse> >;
+
     public class GetUserByIdQueryHandler(IDatabase database)
         : IQueryHandler<GetUserByIdQuery, ErrorOr<UserApplicationResponse> >
     {
@@ -24,4 +26,4 @@ namespace Musify.Application.Users.Handlers
             return user;
         }
     }
-}
+}

backend/Musify.Application/Users/GetUsers.cs

@@ -2,13 +2,15 @@ using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Pagination;
-using Musify.Application.Users.Queries;
 using Musify.Application.Users.Responses;
 using X.PagedList.EF;
 using Musify.Application.Contracts;
 
-namespace Musify.Application.Users.Handlers
+namespace Musify.Application.Users
 {
+    public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch = null)
+        : IQuery<ErrorOr<PaginatedResponse<UserApplicationResponse> >>;
+
     public class GetUsersQueryHandler(IDatabase database)
         : IQueryHandler<GetUsersQuery, ErrorOr<PaginatedResponse<UserApplicationResponse> > >
     {
@@ -32,4 +34,4 @@ namespace Musify.Application.Users.Handlers
             return PaginatedResponse<UserApplicationResponse>.FromPagedList(pagedUser);
         }
     }
-}
+}

backend/Musify.Application/Users/Queries/GetUserByIdQuery.cs

@@ -1,9 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Users.Responses;
-
-namespace Musify.Application.Users.Queries
-{
-    public record GetUserByIdQuery(long Id)
-        : IQuery<ErrorOr<UserApplicationResponse> >;
-}

backend/Musify.Application/Users/Queries/GetUsersQuery.cs

@@ -1,10 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Musify.Application.Pagination;
-using Musify.Application.Users.Responses;
-
-namespace Musify.Application.Users.Queries
-{
-    public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch = null)
-        : IQuery<ErrorOr<PaginatedResponse<UserApplicationResponse> >>;
-}

backend/Musify.Application/Users/SyncUser.cs

@@ -3,11 +3,18 @@ using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
-using Musify.Application.Users.Commands;
 using Musify.Domain.Entities;
 
-namespace Musify.Application.Users.Handlers
+namespace Musify.Application.Users
 {
+    public record SyncUserCommand(
+        long Id,
+        string Name,
+        string? FirstName,
+        string? SecondName,
+        string? ProfilePictureUrl)
+        : ICommand<ErrorOr<Success>>;
+
     public class SyncUserCommandHandler(IDatabase database, ILogger<SyncUserCommandHandler> logger)
         : ICommandHandler<SyncUserCommand, ErrorOr<Success>>
     {