feat: implement pagination in crud api controller base

leynier · May 18, 2022 · 73a8e31 · 73a8e31
1 parent 4c1e9e7
commit 73a8e31
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/Gateways.Api/Controllers/DevicesController.cs b/Gateways.Api/Controllers/DevicesController.cs
@@ -15,10 +15,10 @@ public class DevicesController : CrudApiControllerBase<Device, DeviceGetModel, D
 {
     private readonly int maxNumberOfDevicesPerGateway;
 
-    public DevicesController(IDeviceService service, IMapper mapper, IConfiguration configuration)
-        : base(service, mapper, q => q.Include(d => d.Gateway))
+    public DevicesController(IDeviceService service, IMapper mapper, IConfiguration config)
+        : base(service, mapper, q => q.Include(d => d.Gateway), q => q.OrderBy(d => d.Vendor))
     {
-        maxNumberOfDevicesPerGateway = int.Parse(configuration[Configs.MaxNumberOfDevicesPerGateway]);
+        maxNumberOfDevicesPerGateway = config.GetValue(Configs.MaxNumberOfDevicesPerGateway, 10);
     }
 
     [HttpPost]

diff --git a/Gateways.Api/Controllers/GatewaysController.cs b/Gateways.Api/Controllers/GatewaysController.cs
@@ -10,7 +10,7 @@ namespace Gateways.Api.Controllers;
 public class GatewaysController : CrudApiControllerBase<Gateway, GatewayGetModel, GatewayGetDetailsModel, GatewayPostModel, GatewayPutModel, string>
 {
     public GatewaysController(IGatewayService service, IMapper mapper)
-        : base(service, mapper, q => q.Include(g => g.Devices))
+        : base(service, mapper, q => q.Include(g => g.Devices), q => q.OrderBy(g => g.Name))
     {
     }
 }
diff --git a/Gateways.Api/appsettings.json b/Gateways.Api/appsettings.json
@@ -6,6 +6,5 @@
         }
     },
     "AllowedHosts": "*",
-    "DatabaseName": "GatewayDatabase",
-    "MaxNumberOfDevicesPerGateway": 10
+    "DatabaseName": "GatewayDatabase"
 }
diff --git a/Gateways.Common/Controllers/CrudApiControllerBase.cs b/Gateways.Common/Controllers/CrudApiControllerBase.cs
@@ -11,24 +11,32 @@ namespace Gateways.Common.Controllers;
 public class CrudApiControllerBase<TEntity, TGet, TGetDetails, TPost, TPut, TKey> : ApiControllerBase where TEntity : class, IEntity<TKey>
 {
     private readonly Func<IQueryable<TEntity>, IQueryable<TEntity>>? includer;
+    private readonly Func<IQueryable<TEntity>, IQueryable<TEntity>>? order;
     protected readonly IService<TEntity> service;
 
     public CrudApiControllerBase(
         IService<TEntity> service,
         IMapper mapper,
-        Func<IQueryable<TEntity>, IQueryable<TEntity>>? includer = null) : base(mapper)
+        Func<IQueryable<TEntity>, IQueryable<TEntity>>? includer = null,
+        Func<IQueryable<TEntity>, IQueryable<TEntity>>? order = null) : base(mapper)
     {
         this.includer = includer;
+        this.order = order;
         this.service = service;
     }
 
     [HttpGet]
-    public virtual Response<IEnumerable<TGet>> GetAll()
+    public virtual PaginatedResponse<IEnumerable<TGet>> GetAll([FromQuery] PaginationQueryModel pagination)
     {
-        var models = service
-            .AsNoTrackingWithIdentityResolution()
-            .ToList();
-        return OkResponse<IEnumerable<TGet>>(models);
+        var skip = pagination.Page * pagination.PageSize;
+        var take = pagination.PageSize;
+        var query = service.AsNoTrackingWithIdentityResolution();
+        if (order != null)
+            query = order(query);
+        var models = query.Skip(skip).Take(pagination.PageSize).ToList();
+        var hasPrevious = skip > 0;
+        var hasNext = models.Count == pagination.PageSize && query.Skip(skip + take).Any();
+        return OkResponse<IEnumerable<TGet>>(models, hasPrevious, hasNext);
     }
 
     [HttpGet("{id}")]

diff --git a/Gateways.Common/Models/PaginationQueryModel.cs b/Gateways.Common/Models/PaginationQueryModel.cs
@@ -3,11 +3,12 @@
 
 namespace Gateways.Common.Models;
 
-public class PaginationQueryModel<T>
+public class PaginationQueryModel
 {
-    [FromQuery(Name = "key")]
-    public T? Key { get; set; } = default;
+    [Min(0)]
+    [FromQuery(Name = "page")]
+    public int Page { get; set; } = default;
     [Min(1)]
-    [FromQuery(Name = "limit")]
-    public int Limit { get; set; } = 10;
+    [FromQuery(Name = "pageSize")]
+    public int PageSize { get; set; } = 10;
 }