From e59a5fa8ef082a54d8eb5d95debe96ba9bee7820 Mon Sep 17 00:00:00 2001 From: XShine555 Date: Mon, 1 Jun 2026 20:41:34 +0200 Subject: [PATCH] Remove checks --- .../PlayLists/Handlers/GetPlayListTracksQueryHandler.cs | 5 +---- .../PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs | 5 +---- Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs | 5 +---- Application/Tracks/Handlers/GetTracksQueryHandler.cs | 5 +---- Application/Users/Handlers/GetUsersQueryHandler.cs | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Application/PlayLists/Handlers/GetPlayListTracksQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListTracksQueryHandler.cs index b0fd8cf..6f9a3eb 100644 --- a/Application/PlayLists/Handlers/GetPlayListTracksQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListTracksQueryHandler.cs @@ -14,9 +14,6 @@ namespace Musify.Application.PlayLists.Handlers { public async ValueTask >> Handle(GetPlayListTracksQuery request, CancellationToken cancellationToken) { - var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber; - var pageSize = request.PageSize < 1 ? 10 : request.PageSize; - var playListExists = await database.PlayLists .AsNoTracking() .AnyAsync(p => p.Id == request.PlayListId, cancellationToken); @@ -33,7 +30,7 @@ namespace Musify.Application.PlayLists.Handlers var pagedTracks = await tracksQuery .OrderBy(plt => plt.Position) .Select(plt => TrackApplicationResponse.FromEntity(plt.Track)) - .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken); + .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken); return Result.Success(PaginatedResponse.FromPagedList(pagedTracks)); } diff --git a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs index 2a0506b..a5f9123 100644 --- a/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs @@ -14,9 +14,6 @@ namespace Musify.Application.PlayLists.Handlers { public async ValueTask >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken) { - var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber; - var pageSize = request.PageSize < 1 ? 10 : request.PageSize; - var playListsQuery = database.PlayLists .AsNoTracking() .Where(p => p.UserId == request.UserId); @@ -32,7 +29,7 @@ namespace Musify.Application.PlayLists.Handlers var pagedPlayLists = await playListsQuery .OrderBy(p => p.CreatedDate) .Select(p => PlayListApplicationResponse.FromEntity(p)) - .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken); + .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken); return Result.Success(PaginatedResponse.FromPagedList(pagedPlayLists)); } diff --git a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs index c1a1f6d..a2bf593 100644 --- a/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs +++ b/Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs @@ -14,16 +14,13 @@ namespace Musify.Application.PlayLists.Handlers { public async ValueTask >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken) { - var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber; - var pageSize = request.PageSize < 1 ? 10 : request.PageSize; - var totalCount = await database.PlayLists.CountAsync(cancellationToken); var pagedPlayLists = await database.PlayLists .AsNoTracking() .OrderBy(p => p.Id) .Select(p => PlayListApplicationResponse.FromEntity(p)) - .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken); + .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken); return Result.Success(PaginatedResponse.FromPagedList(pagedPlayLists)); } diff --git a/Application/Tracks/Handlers/GetTracksQueryHandler.cs b/Application/Tracks/Handlers/GetTracksQueryHandler.cs index 694b328..b19ebb6 100644 --- a/Application/Tracks/Handlers/GetTracksQueryHandler.cs +++ b/Application/Tracks/Handlers/GetTracksQueryHandler.cs @@ -14,9 +14,6 @@ namespace Musify.Application.Tracks.Handlers { public async ValueTask >> 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) @@ -24,7 +21,7 @@ namespace Musify.Application.Tracks.Handlers .Select(t => TrackApplicationResponse.FromEntity(t.Track)); var totalCount = await tracksQuery.CountAsync(cancellationToken); - var pagedTracks = await tracksQuery.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken); + var pagedTracks = await tracksQuery.ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken); return Result.Success(PaginatedResponse.FromPagedList(pagedTracks)); } diff --git a/Application/Users/Handlers/GetUsersQueryHandler.cs b/Application/Users/Handlers/GetUsersQueryHandler.cs index e6d9723..cca1b12 100644 --- a/Application/Users/Handlers/GetUsersQueryHandler.cs +++ b/Application/Users/Handlers/GetUsersQueryHandler.cs @@ -14,9 +14,6 @@ namespace Musify.Application.Users.Handlers { public async ValueTask >> Handle(GetUsersQuery request, CancellationToken cancellationToken) { - var pageNumber = request.PageNumber < 1 ? 1 : request.PageNumber; - var pageSize = request.PageSize < 1 ? 10 : request.PageSize; - var user = database.Users .AsNoTracking() .AsQueryable(); @@ -30,7 +27,7 @@ namespace Musify.Application.Users.Handlers var totalCount = await user.CountAsync(cancellationToken); var pagedUser = await user .Select(u => UserApplicationResponse.FromEntity(u)) - .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken); + .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken); return Result.Success(PaginatedResponse.FromPagedList(pagedUser)); }