backend/Musify.Api/Endpoints/TrackEndpoints.cs

@@ -77,10 +77,11 @@ public static class TrackEndpoints
     private static async Task<IResult> GetTracks(
         IMediator mediator,
         CancellationToken cancellationToken,
+        string? name,
         int pageNumber = 1,
         int pageSize = 10)
     {
-        var result = await mediator.Send(new GetTracksQuery(pageNumber, pageSize), cancellationToken);
+        var result = await mediator.Send(new GetTracksQuery(name, pageNumber, pageSize), cancellationToken);
         return result.ToHttpResult();
     }
 

backend/Musify.Application/Tracks/GetTracks.cs

@@ -8,7 +8,7 @@ using Musify.Application.Contracts;
 
 namespace Musify.Application.Tracks
 {
-    public record GetTracksQuery(int PageNumber = 1, int PageSize = 10)
+    public record GetTracksQuery(string? Name = null, int PageNumber = 1, int PageSize = 10)
         : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse> >>;
 
     public class GetTracksQueryHandler(IDatabase database)
@@ -16,14 +16,26 @@ namespace Musify.Application.Tracks
     {
         public async ValueTask<ErrorOr<PaginatedResponse<TrackApplicationResponse> >> Handle(GetTracksQuery request, CancellationToken cancellationToken)
         {
+            var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber;
+            var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
+
             var tracksQuery = database.UserHasTracks
                 .AsNoTracking()
-                .OrderBy(t => t.Id)
                 .Include(ut => ut.Track)
-                .Select(t => TrackApplicationResponse.FromEntity(t.Track));
+                .AsQueryable();
+
+            if (request.Name is not null)
+            {
+                var normalizedName = request.Name.Trim().ToUpperInvariant();
+                tracksQuery = tracksQuery.Where(t => t.Track.NormalizedTitle.Contains(normalizedName));
+            }
 
             var totalCount = await tracksQuery.CountAsync(cancellationToken);
-            var pagedTracks = await tracksQuery.ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
+
+            var pagedTracks = await tracksQuery
+                .OrderBy(t => t.Id)
+                .Select(t => TrackApplicationResponse.FromEntity(t.Track))
+                .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
             return PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks);
         }