Added id ordering as postgres would return the last changed elements first which breaks pagination
This commit is contained in:
@@ -40,6 +40,7 @@ public class NodeAllocationsController : Controller
|
|||||||
|
|
||||||
var allocations = await AllocationRepository
|
var allocations = await AllocationRepository
|
||||||
.Get()
|
.Get()
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.Where(x => x.Node.Id == nodeId)
|
.Where(x => x.Node.Id == nodeId)
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ public class NodesController : Controller
|
|||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
|
|
||||||
var items = await query
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ public class ServerVariablesController : Controller
|
|||||||
var variables = await VariableRepository
|
var variables = await VariableRepository
|
||||||
.Get()
|
.Get()
|
||||||
.Where(x => x.Server.Id == serverId)
|
.Where(x => x.Server.Id == serverId)
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
@@ -66,9 +66,9 @@ public class ServersController : Controller
|
|||||||
.Include(x => x.Allocations)
|
.Include(x => x.Allocations)
|
||||||
.Include(x => x.Variables)
|
.Include(x => x.Variables)
|
||||||
.Include(x => x.Star)
|
.Include(x => x.Star)
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.OrderBy(x => x.Id)
|
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|
||||||
var mappedItems = items
|
var mappedItems = items
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class StarDockerImagesController : Controller
|
|||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
|
|
||||||
var items = await query
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ public class StarVariablesController : Controller
|
|||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
|
|
||||||
var items = await query
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ public class StarsController : Controller
|
|||||||
|
|
||||||
var items = await StarRepository
|
var items = await StarRepository
|
||||||
.Get()
|
.Get()
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
@@ -71,7 +71,12 @@ public class ServersController : Controller
|
|||||||
.Where(x => x.OwnerId == userId);
|
.Where(x => x.OwnerId == userId);
|
||||||
|
|
||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
var items = await query.Skip(page * pageSize).Take(pageSize).ToArrayAsync();
|
|
||||||
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
|
.Skip(page * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
|
.ToArrayAsync();
|
||||||
|
|
||||||
var mappedItems = items.Select(x => new ServerDetailResponse()
|
var mappedItems = items.Select(x => new ServerDetailResponse()
|
||||||
{
|
{
|
||||||
@@ -124,7 +129,12 @@ public class ServersController : Controller
|
|||||||
.Where(x => x.UserId == userId);
|
.Where(x => x.UserId == userId);
|
||||||
|
|
||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
var items = await query.Skip(page * pageSize).Take(pageSize).ToArrayAsync();
|
|
||||||
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
|
.Skip(page * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
|
.ToArrayAsync();
|
||||||
|
|
||||||
var ownerIds = items
|
var ownerIds = items
|
||||||
.Select(x => x.Server.OwnerId)
|
.Select(x => x.Server.OwnerId)
|
||||||
|
|||||||
@@ -54,7 +54,12 @@ public class SharesController : Controller
|
|||||||
.Where(x => x.Server.Id == server.Id);
|
.Where(x => x.Server.Id == server.Id);
|
||||||
|
|
||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
var items = await query.Skip(page * pageSize).Take(pageSize).ToArrayAsync();
|
|
||||||
|
var items = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
|
.Skip(page * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
|
.ToArrayAsync();
|
||||||
|
|
||||||
var userIds = items
|
var userIds = items
|
||||||
.Select(x => x.UserId)
|
.Select(x => x.UserId)
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ public class VariablesController : Controller
|
|||||||
var count = await query.CountAsync();
|
var count = await query.CountAsync();
|
||||||
|
|
||||||
var starVariables = await query
|
var starVariables = await query
|
||||||
|
.OrderBy(x => x.Id)
|
||||||
.Skip(page * pageSize)
|
.Skip(page * pageSize)
|
||||||
.Take(pageSize)
|
.Take(pageSize)
|
||||||
.ToArrayAsync();
|
.ToArrayAsync();
|
||||||
|
|||||||
Reference in New Issue
Block a user