From 8a4805caa423325c4c92caa0437bb0f58645e0bc Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 18 Aug 2018 13:46:20 -0400 Subject: [PATCH] Reading the CompileJob from DM controller is redundant with DD controller --- src/Tgstation.Server.Api/Models/DreamMaker.cs | 6 ------ .../Controllers/DreamMakerController.cs | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Tgstation.Server.Api/Models/DreamMaker.cs b/src/Tgstation.Server.Api/Models/DreamMaker.cs index f50fb7ac64..121d4b2d52 100644 --- a/src/Tgstation.Server.Api/Models/DreamMaker.cs +++ b/src/Tgstation.Server.Api/Models/DreamMaker.cs @@ -7,12 +7,6 @@ namespace Tgstation.Server.Api.Models /// public sealed class DreamMaker : DreamMakerSettings { - /// - /// The last ran - /// - [Permissions(DenyWrite = true)] - public CompileJob LastJob { get; set; } - /// /// The of the compiler /// diff --git a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs index fa46db3581..657e7fe3dc 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs @@ -49,12 +49,10 @@ namespace Tgstation.Server.Host.Controllers public override async Task 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 }); }