From 3cda95447b509f0575cb12f1cde936a6705cd8ad Mon Sep 17 00:00:00 2001 From: jvyden Date: Fri, 18 Feb 2022 17:51:40 -0500 Subject: [PATCH] Show sublevels for creators of sublevels --- .../Controllers/GameApi/Slots/SlotsController.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ProjectLighthouse/Controllers/GameApi/Slots/SlotsController.cs b/ProjectLighthouse/Controllers/GameApi/Slots/SlotsController.cs index 04d94441..950be32c 100644 --- a/ProjectLighthouse/Controllers/GameApi/Slots/SlotsController.cs +++ b/ProjectLighthouse/Controllers/GameApi/Slots/SlotsController.cs @@ -24,16 +24,22 @@ public class SlotsController : ControllerBase this.database = database; } - private IQueryable getSlots(GameVersion gameVersion) + private IQueryable getSlots(GameVersion gameVersion, bool includeSublevels = false) { IQueryable query = this.database.Slots.Include(s => s.Creator).Include(s => s.Location); if (gameVersion == GameVersion.LittleBigPlanetVita || gameVersion == GameVersion.LittleBigPlanetPSP || gameVersion == GameVersion.Unknown) { - return query.Where(s => s.GameVersion == gameVersion && !s.SubLevel); + query = query.Where(s => s.GameVersion == gameVersion); + } + else + { + query = query.Where(s => s.GameVersion <= gameVersion); } - return query.Where(s => s.GameVersion <= gameVersion && !s.SubLevel); + if (!includeSublevels) query = query.Where(s => !s.SubLevel); + + return query; } [HttpGet("slots/by")] @@ -49,8 +55,7 @@ public class SlotsController : ControllerBase string response = Enumerable.Aggregate ( - this.getSlots - (gameVersion) + this.getSlots(gameVersion, token.UserId == user.UserId) .Where(s => s.Creator!.Username == user.Username) .Skip(pageStart - 1) .Take(Math.Min(pageSize, ServerSettings.Instance.EntitledSlots)),