Add minBatchId parameter to /api/batches/ and deprecate lastBatchId.

Add maxRemoteId parameter to /api/vendorevents/.

BulkPrintingAPI/Controllers/BatchesController.cs

@@ -61,12 +61,18 @@ namespace BulkPrintingAPI.Controllers
 
         [HttpGet]
         public async Task<Page<Batch>> GetBatchesAsync([FromQuery] int page = 1,
-            [FromQuery] int pageSize = 100, [FromQuery] int? lastBatchId = null)
+            [FromQuery] int pageSize = 100, [FromQuery] int? lastBatchId = null, int? minBatchId = null)
         {
             var credentials = await Utils.GetLoginCredentialsFromRequestAsync(HttpContext, _context);
             var query = BatchesForVendor(credentials.Vendor.Id);
-            if (lastBatchId.HasValue)
+            if (minBatchId.HasValue)
             {
+                query = query.Where(b => b.Id >= minBatchId.Value).OrderBy(b => b.Id);
+            }
+            else if (lastBatchId.HasValue)
+            {
+                // Deprecated in favour of minBatchId for clarity. Use minBatchId = lastBatchId + 1 for equivalent
+                // functionality
                 query = query.Where(b => b.Id > lastBatchId.Value).OrderBy(b => b.Id);
             }
             else

BulkPrintingAPI/Controllers/VendorEventsController.cs

@@ -44,12 +44,21 @@ namespace BulkPrintingAPI.Controllers
 
         [HttpGet]
         public async Task<Page<VendorEvent>> GetVendorEventsAsync([FromQuery] int page = 1,
-            [FromQuery] int pageSize = 100)
+            [FromQuery] int pageSize = 100, [FromQuery] int? maxRemoteId = null)
         {
             var credentials = await Utils.GetLoginCredentialsFromRequestAsync(HttpContext, _context);
-            return await Page<VendorEvent>.GetPageAsync(
-                VendorEventsForVendor(credentials.Vendor.Id).OrderByDescending(e => e.EventDate),
-                page, pageSize);
+            var query = VendorEventsForVendor(credentials.Vendor.Id);
+            if (maxRemoteId.HasValue)
+            {
+                query = query.Where(e => e.RemoteId <= maxRemoteId)
+                    .OrderByDescending(e => e.VendorId)
+                    .ThenByDescending(e => e.RemoteId);
+            }
+            else
+            {
+                query = query.OrderByDescending(e => e.Id);
+            }
+            return await Page<VendorEvent>.GetPageAsync(query, page, pageSize);
         }
 
         [HttpPost]