Add shared pagination, projections and ownership helpers; simplify query and command handlers

backend/Core/Musify.Application/Likes/GetLikedTracks.cs

@@ -1,11 +1,8 @@
-using ErrorOr;
 using Mediator;
 using Microsoft.EntityFrameworkCore;
 using Musify.Application.Contracts;
 using Musify.Application.Shared;
 using Musify.Application.Tracks.Responses;
-using X.PagedList;
-using X.PagedList.EF;
 using Musify.Domain.ValueObjects;
 
 namespace Musify.Application.Likes;
@@ -14,30 +11,20 @@ public record GetLikedTracksQuery(
     long UserId,
     int PageNumber,
     int PageSize)
-    : IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse>>>;
+    : IQuery<PaginatedResponse<TrackApplicationResponse>>;
 
 public class GetLikedTracksQueryHandler(IDatabase database)
-    : IQueryHandler<GetLikedTracksQuery, ErrorOr<PaginatedResponse<TrackApplicationResponse>>>
+    : IQueryHandler<GetLikedTracksQuery, PaginatedResponse<TrackApplicationResponse>>
 {
-    public async ValueTask<ErrorOr<PaginatedResponse<TrackApplicationResponse>>> Handle(GetLikedTracksQuery request, CancellationToken cancellationToken)
+    public async ValueTask<PaginatedResponse<TrackApplicationResponse>> Handle(GetLikedTracksQuery request, CancellationToken cancellationToken)
     {
-        var likesQuery = database.TrackLikes
+        return await database.TrackLikes
             .AsNoTracking()
-            .Include(like => like.Track.Owner)
-            .Include(like => like.Track.Tags)
-            .Where(like => like.UserId == request.UserId && like.Track.LifeCycleStatus == LifeCycleStatus.Active);
-
-        var totalCount = await likesQuery.CountAsync(cancellationToken);
-
-        var pagedEntities = await likesQuery
+            .Where(like => like.UserId == request.UserId && like.Track.LifeCycleStatus == LifeCycleStatus.Active)
             .OrderByDescending(like => like.CreatedAt)
-            .Select(like => new { like.Track, ListensCount = like.Track.ListeningHistories.Count(l => l.IsCounted) })
-            .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
-
-        var pagedTracks = new StaticPagedList<TrackApplicationResponse>(
-            pagedEntities.Select(x => TrackApplicationResponse.FromEntity(x.Track, x.ListensCount)),
-            pagedEntities.PageNumber, pagedEntities.PageSize, pagedEntities.TotalItemCount);
-
-        return PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks);
+            .ThenBy(like => like.Id)
+            .Select(like => like.Track)
+            .SelectResponse()
+            .ToPaginatedAsync(new PageRequest(request.PageNumber, request.PageSize), cancellationToken);
     }
 }

backend/Core/Musify.Application/Likes/ToggleTrackLike.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
 using Musify.Application.Shared;
 using Musify.Domain.Entities;
+using Musify.Domain.ValueObjects;
 
 namespace Musify.Application.Likes;
 
@@ -20,12 +21,9 @@ public class ToggleTrackLikeCommandHandler(
     {
         var trackExists = await database.Tracks
             .AsNoTracking()
-            .AnyAsync(t => t.Id == request.TrackId, cancellationToken);
+            .AnyAsync(t => t.Id == request.TrackId && t.LifeCycleStatus == LifeCycleStatus.Active, cancellationToken);
         if (!trackExists)
-        {
-            logger.LogInformation("Track {TrackId} not found", request.TrackId);
-            return Error.NotFound(description: $"Track {request.TrackId} not found");
-        }
+            return AppErrors.NotFound("Track", request.TrackId);
 
         var existingLike = await database.TrackLikes
             .SingleOrDefaultAsync(like => like.UserId == request.UserId && like.TrackId == request.TrackId, cancellationToken);