From 81ad009b9ab4c3063c47e5b5977b0bb8cb84ac95 Mon Sep 17 00:00:00 2001 From: spookydonut Date: Mon, 18 Apr 2022 12:29:42 +0800 Subject: [PATCH 1/2] Add totalItems to paginated results --- .../Models/Response/PaginatedResponse.cs | 5 +++++ src/Tgstation.Server.Host/Controllers/ApiController.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/src/Tgstation.Server.Api/Models/Response/PaginatedResponse.cs b/src/Tgstation.Server.Api/Models/Response/PaginatedResponse.cs index 2b5d0d9372..df3d72595f 100644 --- a/src/Tgstation.Server.Api/Models/Response/PaginatedResponse.cs +++ b/src/Tgstation.Server.Api/Models/Response/PaginatedResponse.cs @@ -24,5 +24,10 @@ namespace Tgstation.Server.Api.Models.Response /// The current size of pages in the query. /// public int PageSize { get; set; } + + /// + /// The total items across all pages. + /// + public int TotalItems { get; set; } } } diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs index 6e591ca574..d75245ab3f 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs @@ -417,6 +417,7 @@ namespace Tgstation.Server.Host.Controllers Content = finalResults, PageSize = pageSize, TotalPages = (ushort)(totalResults / pageSize) + carryTheOne, + TotalItems = totalResults, }); } } From 103ee7d7497fc329e089ef4d1465499bec12ada5 Mon Sep 17 00:00:00 2001 From: spookydonut Date: Tue, 19 Apr 2022 07:23:46 +0800 Subject: [PATCH 2/2] Bump api version --- build/Version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Version.props b/build/Version.props index 2263974ba5..902e4740fc 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,8 +5,8 @@ 4.16.2 4.1.0 - 9.3.1 - 9.3.2 + 9.4.0 + 9.4.0 10.4.1 6.0.5 5.3.0