Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

PushNotifications - fix pagination

supportccaa0eca8488
diff --git a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
index 6915b0a58..7f21e7c89 100644
--- a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
@@ -121,8 +121,8 @@ namespace Grand.Business.Marketing.Services.PushNotifications
/// </summary>
public virtual async Task<IPagedList<PushMessage>> GetPushMessages(int pageIndex = 0, int pageSize = int.MaxValue)
{
- var allMessages = await Task.FromResult(_pushMessagesRepository.Table.OrderByDescending(x => x.SentOn).ToList());
- return new PagedList<PushMessage>(allMessages.Skip(pageIndex * pageSize).Take(pageSize).ToList(), pageIndex, pageSize, allMessages.Count);
+ var query = _pushMessagesRepository.Table.OrderByDescending(x => x.SentOn);
+ return await Task.FromResult(new PagedList<PushMessage>(query, pageIndex, pageSize));
}
/// <summary>
@@ -130,8 +130,8 @@ namespace Grand.Business.Marketing.Services.PushNotifications
/// </summary>
public virtual async Task<IPagedList<PushRegistration>> GetPushReceivers(int pageIndex = 0, int pageSize = int.MaxValue)
{
- var allReceivers = await Task.FromResult(_pushRegistratiosnRepository.Table.OrderByDescending(x => x.RegisteredOn).ToList());
- return new PagedList<PushRegistration>(allReceivers.Skip(pageIndex * pageSize).Take(pageSize).ToList(), pageIndex, pageSize, allReceivers.Count);
+ var query = _pushRegistratiosnRepository.Table.OrderByDescending(x => x.RegisteredOn);
+ return await Task.FromResult(new PagedList<PushRegistration>(query, pageIndex, pageSize));
}
/// <summary>