From b367a115cea4a4f9060ce3748e516f140ddb7a0e Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Sat, 11 Jan 2020 19:21:38 -0500
Subject: [PATCH] Change DreamMaker and Job listing clients to use EntityId

---
 .../Components/DreamMakerClient.cs                       | 2 +-
 .../Components/IDreamMakerClient.cs                      | 6 +++---
 src/Tgstation.Server.Client/Components/IJobsClient.cs    | 9 ++++-----
 src/Tgstation.Server.Client/Components/JobsClient.cs     | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Tgstation.Server.Client/Components/DreamMakerClient.cs b/src/Tgstation.Server.Client/Components/DreamMakerClient.cs
index d08c587194..496872d60f 100644
--- a/src/Tgstation.Server.Client/Components/DreamMakerClient.cs
+++ b/src/Tgstation.Server.Client/Components/DreamMakerClient.cs
@@ -38,7 +38,7 @@ namespace Tgstation.Server.Client.Components
 		public Task<CompileJob> GetCompileJob(CompileJob compileJob, CancellationToken cancellationToken) => apiClient.Read<CompileJob>(Routes.SetID(Routes.DreamMaker, compileJob?.Id ?? throw new ArgumentNullException(nameof(compileJob))), instance.Id, cancellationToken);
 
 		/// <inheritdoc />
-		public Task<IReadOnlyList<CompileJob>> GetJobIds(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<CompileJob>>(Routes.ListRoute(Routes.DreamMaker), instance.Id, cancellationToken);
+		public Task<IReadOnlyList<EntityId>> GetJobIds(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<EntityId>>(Routes.ListRoute(Routes.DreamMaker), instance.Id, cancellationToken);
 
 		/// <inheritdoc />
 		public Task<DreamMaker> Read(CancellationToken cancellationToken) => apiClient.Read<DreamMaker>(Routes.DreamMaker, instance.Id, cancellationToken);
diff --git a/src/Tgstation.Server.Client/Components/IDreamMakerClient.cs b/src/Tgstation.Server.Client/Components/IDreamMakerClient.cs
index 011475d5a5..87a3d0fb54 100644
--- a/src/Tgstation.Server.Client/Components/IDreamMakerClient.cs
+++ b/src/Tgstation.Server.Client/Components/IDreamMakerClient.cs
@@ -33,11 +33,11 @@ namespace Tgstation.Server.Client.Components
 		Task<Job> Compile(CancellationToken cancellationToken);
 
 		/// <summary>
-		/// Gets the <see cref="Api.Models.Internal.CompileJob.Id"/>s of all <see cref="CompileJob"/>s for the instance
+		/// Gets the <see cref="EntityId"/>s of all <see cref="CompileJob"/>s for the instance
 		/// </summary>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
-		/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyList{T}"/> of <see cref="CompileJob"/>s with only the <see cref="Api.Models.Internal.CompileJob.Id"/> field populated</returns>
-		Task<IReadOnlyList<CompileJob>> GetJobIds(CancellationToken cancellationToken);
+		/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyList{T}"/> of <see cref="CompileJob"/> <see cref="EntityId"/>s.</returns>
+		Task<IReadOnlyList<EntityId>> GetJobIds(CancellationToken cancellationToken);
 
 		/// <summary>
 		/// Get a <paramref name="compileJob"/>
diff --git a/src/Tgstation.Server.Client/Components/IJobsClient.cs b/src/Tgstation.Server.Client/Components/IJobsClient.cs
index 8ce64a95e0..f53b0dd612 100644
--- a/src/Tgstation.Server.Client/Components/IJobsClient.cs
+++ b/src/Tgstation.Server.Client/Components/IJobsClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models;
@@ -12,11 +11,11 @@ namespace Tgstation.Server.Client.Components
 	public interface IJobsClient
 	{
 		/// <summary>
-		/// List the <see cref="Api.Models.Internal.Job.Id"/>s in the <see cref="Instance"/>
+		/// List the <see cref="Job"/> <see cref="EntityId"/>s in the <see cref="Instance"/>
 		/// </summary>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
-		/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyList{T}"/> of the <see cref="Api.Models.Internal.Job.Id"/>s in the <see cref="Instance"/></returns>
-		Task<IReadOnlyList<Job>> List(CancellationToken cancellationToken);
+		/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyList{T}"/> of the <see cref="Job"/> <see cref="EntityId"/>s in the <see cref="Instance"/></returns>
+		Task<IReadOnlyList<EntityId>> List(CancellationToken cancellationToken);
 
 		/// <summary>
 		/// List the active <see cref="Job"/>s in the <see cref="Instance"/>
diff --git a/src/Tgstation.Server.Client/Components/JobsClient.cs b/src/Tgstation.Server.Client/Components/JobsClient.cs
index d673abfc41..00c043ae0e 100644
--- a/src/Tgstation.Server.Client/Components/JobsClient.cs
+++ b/src/Tgstation.Server.Client/Components/JobsClient.cs
@@ -35,7 +35,7 @@ namespace Tgstation.Server.Client.Components
 		public Task Cancel(Job job, CancellationToken cancellationToken) => apiClient.Delete(Routes.SetID(Routes.Jobs, job?.Id ?? throw new ArgumentNullException(nameof(job))), instance.Id, cancellationToken);
 
 		/// <inheritdoc />
-		public Task<IReadOnlyList<Job>> List(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<Job>>(Routes.ListRoute(Routes.Jobs), instance.Id, cancellationToken);
+		public Task<IReadOnlyList<EntityId>> List(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<EntityId>>(Routes.ListRoute(Routes.Jobs), instance.Id, cancellationToken);
 
 		/// <inheritdoc />
 		public Task<IReadOnlyList<Job>> ListActive(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<Job>>(Routes.Jobs, instance.Id, cancellationToken);