From 079db325da9d2dc14357e9610b2cc17b85a8595e Mon Sep 17 00:00:00 2001 From: jvyden Date: Mon, 18 Oct 2021 18:01:17 -0400 Subject: [PATCH] Cleanup formatting --- .../Controllers/LevelListController.cs | 40 ++++++++++--------- ProjectLighthouse/Database.cs | 1 - 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ProjectLighthouse/Controllers/LevelListController.cs b/ProjectLighthouse/Controllers/LevelListController.cs index a393e6f1..2088280a 100644 --- a/ProjectLighthouse/Controllers/LevelListController.cs +++ b/ProjectLighthouse/Controllers/LevelListController.cs @@ -18,6 +18,7 @@ namespace ProjectLighthouse.Controllers { } #region Level Queue (lolcatftw) + [HttpGet("slots/lolcatftw/{username}")] public IActionResult GetLevelQueue(string username) { IEnumerable queuedLevels = new Database().QueuedLevels @@ -34,36 +35,37 @@ namespace ProjectLighthouse.Controllers { [HttpPost("lolcatftw/remove/user/{id:int}")] public async Task RemoveQueuedLevel(int id) { - User? user = await database.UserFromRequest(this.Request); + User? user = await this.database.UserFromRequest(this.Request); if(user == null) return this.StatusCode(403, ""); - QueuedLevel queuedLevel = await database.QueuedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); - if(queuedLevel != null) database.QueuedLevels.Remove(queuedLevel); + QueuedLevel queuedLevel = await this.database.QueuedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); + if(queuedLevel != null) this.database.QueuedLevels.Remove(queuedLevel); - await database.SaveChangesAsync(); + await this.database.SaveChangesAsync(); return this.Ok(); } [HttpPost("lolcatftw/add/user/{id:int}")] public async Task AddQueuedLevel(int id) { - User? user = await database.UserFromRequest(this.Request); + User? user = await this.database.UserFromRequest(this.Request); if(user == null) return this.StatusCode(403, ""); - QueuedLevel queuedLevel = await database.QueuedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); + QueuedLevel queuedLevel = await this.database.QueuedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); if(queuedLevel != null) return this.Ok(); - database.QueuedLevels.Add(new QueuedLevel { + this.database.QueuedLevels.Add(new QueuedLevel { SlotId = id, - UserId = user.UserId + UserId = user.UserId, }); - await database.SaveChangesAsync(); + await this.database.SaveChangesAsync(); return this.Ok(); } + #endregion - + #region Hearted Levels [HttpGet("favouriteSlots/{username}")] @@ -82,34 +84,36 @@ namespace ProjectLighthouse.Controllers { [HttpPost("favourite/slot/user/{id:int}")] public async Task AddFavourite(int id) { - User? user = await database.UserFromRequest(this.Request); + User? user = await this.database.UserFromRequest(this.Request); if(user == null) return this.StatusCode(403, ""); - HeartedLevel heartedLevel = await database.HeartedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); + HeartedLevel heartedLevel = await this.database.HeartedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); if(heartedLevel != null) return this.Ok(); - database.HeartedLevels.Add(new HeartedLevel { + this.database.HeartedLevels.Add(new HeartedLevel { SlotId = id, UserId = user.UserId, }); - await database.SaveChangesAsync(); + await this.database.SaveChangesAsync(); return this.Ok(); } [HttpPost("unfavourite/slot/user/{id:int}")] public async Task RemoveFavourite(int id) { - User? user = await database.UserFromRequest(this.Request); + User? user = await this.database.UserFromRequest(this.Request); if(user == null) return this.StatusCode(403, ""); - HeartedLevel heartedLevel = await database.HeartedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); - if(heartedLevel != null) database.HeartedLevels.Remove(heartedLevel); + HeartedLevel heartedLevel = await this.database.HeartedLevels.FirstOrDefaultAsync(q => q.UserId == user.UserId && q.SlotId == id); + if(heartedLevel != null) this.database.HeartedLevels.Remove(heartedLevel); - await database.SaveChangesAsync(); + await this.database.SaveChangesAsync(); return this.Ok(); } + #endregion + } } \ No newline at end of file diff --git a/ProjectLighthouse/Database.cs b/ProjectLighthouse/Database.cs index 882f612f..2182c8ec 100644 --- a/ProjectLighthouse/Database.cs +++ b/ProjectLighthouse/Database.cs @@ -10,7 +10,6 @@ namespace ProjectLighthouse { public DbSet Locations { get; set; } public DbSet Slots { get; set; } public DbSet QueuedLevels { get; set; } - public DbSet HeartedLevels { get; set; } public DbSet Comments { get; set; } public DbSet Tokens { get; set; }