From c3b42d64947521a5660456fbd976fc0a9faecbf3 Mon Sep 17 00:00:00 2001 From: LumaLivy Date: Tue, 2 Nov 2021 23:10:20 -0400 Subject: [PATCH 1/2] Add support for lucky dipping in LBP2 --- ProjectLighthouse/Controllers/SlotsController.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ProjectLighthouse/Controllers/SlotsController.cs b/ProjectLighthouse/Controllers/SlotsController.cs index fd203a65..fce65199 100644 --- a/ProjectLighthouse/Controllers/SlotsController.cs +++ b/ProjectLighthouse/Controllers/SlotsController.cs @@ -70,5 +70,20 @@ namespace LBPUnion.ProjectLighthouse.Controllers return this.Ok(LbpSerializer.TaggedStringElement("slots", response, "hint_start", pageStart + Math.Min(pageSize, 30))); } + + [HttpGet("slots/lbp2luckydip")] + public IActionResult TeamPickedSlots([FromQuery] int pageStart, [FromQuery] int pageSize, [FromQuery] int seed) + { + // TODO: Incorporate seed? + IQueryable slots = this.database.Slots + .OrderBy(_ => Guid.NewGuid()) + .Include(s => s.Creator) + .Include(s => s.Location) + .Skip(pageStart - 1) + .Take(Math.Min(pageSize, 30)); + string response = Enumerable.Aggregate(slots, string.Empty, (current, slot) => current + slot.Serialize()); + + return this.Ok(LbpSerializer.TaggedStringElement("slots", response, "hint_start", pageStart + Math.Min(pageSize, 30))); + } } } \ No newline at end of file From 49039a28ef6d4ded0c31770d3cb7d02a06564711 Mon Sep 17 00:00:00 2001 From: jvyden Date: Wed, 3 Nov 2021 16:10:10 -0400 Subject: [PATCH 2/2] Fix naming of LuckyDipSlots --- ProjectLighthouse.sln.DotSettings | 1 + ProjectLighthouse/Controllers/SlotsController.cs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ProjectLighthouse.sln.DotSettings b/ProjectLighthouse.sln.DotSettings index 9cc7db0b..9035b5a5 100644 --- a/ProjectLighthouse.sln.DotSettings +++ b/ProjectLighthouse.sln.DotSettings @@ -93,6 +93,7 @@ True True True + True True True True diff --git a/ProjectLighthouse/Controllers/SlotsController.cs b/ProjectLighthouse/Controllers/SlotsController.cs index fce65199..b74800c5 100644 --- a/ProjectLighthouse/Controllers/SlotsController.cs +++ b/ProjectLighthouse/Controllers/SlotsController.cs @@ -72,11 +72,11 @@ namespace LBPUnion.ProjectLighthouse.Controllers } [HttpGet("slots/lbp2luckydip")] - public IActionResult TeamPickedSlots([FromQuery] int pageStart, [FromQuery] int pageSize, [FromQuery] int seed) + public IActionResult LuckyDipSlots([FromQuery] int pageStart, [FromQuery] int pageSize, [FromQuery] int seed) { // TODO: Incorporate seed? - IQueryable slots = this.database.Slots - .OrderBy(_ => Guid.NewGuid()) + IQueryable slots = this.database.Slots.OrderBy + (_ => Guid.NewGuid()) .Include(s => s.Creator) .Include(s => s.Location) .Skip(pageStart - 1)