Merge pull request #1259 from tgstation/1256-WrongInstancePagesAgain

Fixes bad total pages display

src/Tgstation.Server.Host/Controllers/ApiController.cs

@@ -406,12 +406,15 @@ namespace Tgstation.Server.Host.Controllers
 				foreach (var I in finalResults)
 					resultTransformer(I);
 
+			var carryTheOne = totalResults % pageSize != 0
+				? 1
+				: 0;
 			return Json(
 				new PaginatedResponse<TResultModel>
 				{
 					Content = finalResults,
 					PageSize = pageSize,
-					TotalPages = (ushort)((totalResults / pageSize) + 1)
+					TotalPages = (ushort)(totalResults / pageSize) + carryTheOne
 				});
 		}
 	}

tests/Tgstation.Server.Tests/InstanceManagerTest.cs

@@ -1,9 +1,15 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
+using Tgstation.Server.Api;
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Api.Models.Request;
 using Tgstation.Server.Api.Models.Response;
@@ -17,14 +23,16 @@ namespace Tgstation.Server.Tests
 	{
 		public const string TestInstanceName = "IntegrationTestInstance";
 
+		readonly IServerClient serverClient;
 		readonly IInstanceManagerClient instanceManagerClient;
 		readonly IUsersClient usersClient;
 		readonly string testRootPath;
 
-		public InstanceManagerTest(IInstanceManagerClient instanceManagerClient, IUsersClient usersClient, string testRootPath)
+		public InstanceManagerTest(IServerClient serverClient, string testRootPath)
 		{
-			this.instanceManagerClient = instanceManagerClient ?? throw new ArgumentNullException(nameof(instanceManagerClient));
-			this.usersClient = usersClient ?? throw new ArgumentNullException(nameof(usersClient));
+			this.serverClient = serverClient ?? throw new ArgumentNullException(nameof(serverClient));
+			this.instanceManagerClient = serverClient.Instances;
+			this.usersClient = serverClient.Users;
 			this.testRootPath = testRootPath ?? throw new ArgumentNullException(nameof(testRootPath));
 		}
 
@@ -150,9 +158,45 @@ namespace Tgstation.Server.Tests
 			}, cancellationToken), ErrorCode.InstanceRelocateOnline).ConfigureAwait(false);
 			Assert.IsTrue(Directory.Exists(firstTest.Path));
 
+			await RegressionTest1256(cancellationToken).ConfigureAwait(false);
+
 			return firstTest;
 		}
 
+		async Task RegressionTest1256(CancellationToken cancellationToken)
+		{
+			var allInstances = await instanceManagerClient.List(null, cancellationToken).ConfigureAwait(false);
+			Assert.IsTrue(allInstances.Count <= 6, "Need less than or 6 instances at this point");
+
+			for (var I = allInstances.Count; I < 6; ++I)
+				await instanceManagerClient.CreateOrAttach(new InstanceCreateRequest
+				{
+					Name = $"RegressionTest1256-{I}",
+					Path = Path.Combine(testRootPath, Guid.NewGuid().ToString()),
+				}, cancellationToken).ConfigureAwait(false);
+
+			var url = serverClient.Url;
+			var token = serverClient.Token.Bearer;
+			// check that 400s are returned appropriately
+			using var httpClient = new HttpClient();
+			using (var request = new HttpRequestMessage(HttpMethod.Get, url.ToString() + Routes.ListRoute(Routes.InstanceManager).Substring(1) + "?pageSize=2"))
+			{
+				request.Headers.Accept.Clear();
+				request.Headers.UserAgent.Add(new ProductInfoHeaderValue("RegressionTest1256", "1.0.0"));
+				request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(MediaTypeNames.Application.Json));
+				request.Headers.Add(ApiHeaders.ApiVersionHeader, "Tgstation.Server.Api/" + ApiHeaders.Version);
+				request.Headers.Authorization = new AuthenticationHeaderValue(ApiHeaders.BearerAuthenticationScheme, token);
+				using var response = await httpClient.SendAsync(request, cancellationToken);
+				response.EnsureSuccessStatusCode();
+
+				var json = await response.Content.ReadAsStringAsync();
+				var paginated = JsonConvert.DeserializeObject<PaginatedResponse<InstanceResponse>>(json);
+
+				Assert.AreEqual(2, paginated.PageSize);
+				Assert.AreEqual(3, paginated.TotalPages);
+			}
+		}
+
 		public async Task RunPostTest(CancellationToken cancellationToken)
 		{
 			var instances = await instanceManagerClient.List(null, cancellationToken);

tests/Tgstation.Server.Tests/IntegrationTest.cs

@@ -767,7 +767,7 @@ namespace Tgstation.Server.Tests
 					var rootTest = FailFast(new RawRequestTests().Run(clientFactory, adminClient, cancellationToken));
 					var adminTest = FailFast(new AdministrationTest(adminClient.Administration).Run(cancellationToken));
 					var usersTest = FailFast(new UsersTest(adminClient).Run(cancellationToken));
-					instance = await new InstanceManagerTest(adminClient.Instances, adminClient.Users, server.Directory).RunPreInstanceTest(cancellationToken);
+					instance = await new InstanceManagerTest(adminClient, server.Directory).RunPreInstanceTest(cancellationToken);
 					Assert.IsTrue(Directory.Exists(instance.Path));
 					var instanceClient = adminClient.Instances.CreateClient(instance);
 
@@ -884,7 +884,7 @@ namespace Tgstation.Server.Tests
 					await new ChatTest(instanceClient.ChatBots, adminClient.Instances, instance).RunPostTest(cancellationToken);
 					await repoTest;
 
-					await new InstanceManagerTest(adminClient.Instances, adminClient.Users, server.Directory).RunPostTest(cancellationToken);
+					await new InstanceManagerTest(adminClient, server.Directory).RunPostTest(cancellationToken);
 				}
 			}
 			catch(ApiException ex)