cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 00:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix get endpoint for DreamMakeClient and Jobs Clients to accept entity IDs

Browse Source
This commit is contained in:
Jordan Brown
2020-01-12 14:32:30 -05:00
parent f7ba5ee94b
commit 0a0343cd64
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Client/Components/DreamMakerClient.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Tgstation.Server.Client.Components
public Task<Job> Compile(CancellationToken cancellationToken) => apiClient.Create<Job>(Routes.DreamMaker, instance.Id, cancellationToken);
/// <inheritdoc />
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);
public Task<CompileJob> GetCompileJob(EntityId compileJob, CancellationToken cancellationToken) => apiClient.Read<CompileJob>(Routes.SetID(Routes.DreamMaker, compileJob?.Id ?? throw new ArgumentNullException(nameof(compileJob))), instance.Id, cancellationToken);
/// <inheritdoc />
public Task<IReadOnlyList<EntityId>> GetJobIds(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<EntityId>>(Routes.ListRoute(Routes.DreamMaker), instance.Id, cancellationToken);
src/Tgstation.Server.Client/Components/IDreamMakerClient.cs
+2 -2
View File
@@ -42,9 +42,9 @@ namespace Tgstation.Server.Client.Components
/// <summary>
/// Get a <paramref name="compileJob"/>
/// </summary>
/// <param name="compileJob">The <see cref="CompileJob"/> to get</param>
/// <param name="compileJob">The <see cref="CompileJob"/> <see cref="EntityId"/> to get</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="CompileJob"/></returns>
Task<CompileJob> GetCompileJob(CompileJob compileJob, CancellationToken cancellationToken);
Task<CompileJob> GetCompileJob(EntityId compileJob, CancellationToken cancellationToken);
}
}
src/Tgstation.Server.Client/Components/IJobsClient.cs
+2 -2
View File
@@ -27,10 +27,10 @@ namespace Tgstation.Server.Client.Components
/// <summary>
/// Get a <paramref name="job"/>
/// </summary>
/// <param name="job">The <see cref="Job"/> to get</param>
/// <param name="job">The <see cref="Job"/>'s <see cref="EntityId"/> to get</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="Job"/></returns>
Task<Job> GetId(Job job, CancellationToken cancellationToken);
Task<Job> GetId(EntityId job, CancellationToken cancellationToken);
/// <summary>
/// Cancels a <paramref name="job"/>
src/Tgstation.Server.Client/Components/JobsClient.cs
+1 -1
View File
@@ -41,6 +41,6 @@ namespace Tgstation.Server.Client.Components
public Task<IReadOnlyList<Job>> ListActive(CancellationToken cancellationToken) => apiClient.Read<IReadOnlyList<Job>>(Routes.Jobs, instance.Id, cancellationToken);
/// <inheritdoc />
public Task<Job> GetId(Job job, CancellationToken cancellationToken) => apiClient.Read<Job>(Routes.SetID(Routes.Jobs, job?.Id ?? throw new ArgumentNullException(nameof(job))), instance.Id, cancellationToken);
public Task<Job> GetId(EntityId job, CancellationToken cancellationToken) => apiClient.Read<Job>(Routes.SetID(Routes.Jobs, job?.Id ?? throw new ArgumentNullException(nameof(job))), instance.Id, cancellationToken);
}
}