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

Reading the CompileJob from DM controller is redundant with DD controller

Browse Source
This commit is contained in:
Jordan Brown
2018-08-18 13:46:20 -04:00
parent 78ffbd9655
commit 8a4805caa4
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Api/Models/DreamMaker.cs
-6
View File
@@ -7,12 +7,6 @@ namespace Tgstation.Server.Api.Models
/// </summary>
public sealed class DreamMaker : DreamMakerSettings
{
/// <summary>
/// The last <see cref="CompileJob"/> ran
/// </summary>
[Permissions(DenyWrite = true)]
public CompileJob LastJob { get; set; }
/// <summary>
/// The <see cref="CompilerStatus"/> of the compiler
/// </summary>
src/Tgstation.Server.Host/Controllers/DreamMakerController.cs
+2 -4
View File
@@ -49,12 +49,10 @@ namespace Tgstation.Server.Host.Controllers
public override async Task<IActionResult> Read(CancellationToken cancellationToken)
{
var instance = instanceManager.GetInstance(Instance);
var projectNameTask = DatabaseContext.DreamMakerSettings.Where(x => x.InstanceId == Instance.Id).Select(x => x.ProjectName).FirstOrDefaultAsync(cancellationToken);
var job = await DatabaseContext.CompileJobs.OrderByDescending(x => x.Job.StartedAt).Include(x => x.Job).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
var projectName = await DatabaseContext.DreamMakerSettings.Where(x => x.InstanceId == Instance.Id).Select(x => x.ProjectName).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
return Json(new Api.Models.DreamMaker
{
LastJob = job?.ToApi(),
ProjectName = await projectNameTask.ConfigureAwait(false),
ProjectName = projectName,
Status = instance.DreamMaker.Status
});
}