diff --git a/Icarus/Controllers/Managers/TokenManager.cs b/Icarus/Controllers/Managers/TokenManager.cs index ef6e0f2..42cda59 100644 --- a/Icarus/Controllers/Managers/TokenManager.cs +++ b/Icarus/Controllers/Managers/TokenManager.cs @@ -125,7 +125,8 @@ public class TokenManager : BaseManager // album, song, et cetera public bool CanAccessSong(string token, Song song, AccessLevel accessLevel) { - if (accessLevel!.Level!.Equals(Models.AccessLevel.DefaultLevel().Level)) { + if (accessLevel!.Level!.Equals(Models.AccessLevel.DefaultLevel().Level)) + { return true; } var tokenUserId = this.RetrieveUserIdFromToken(token); diff --git a/Icarus/Controllers/v1/AccessLevelController.cs b/Icarus/Controllers/v1/AccessLevelController.cs index 25bcb8d..1209df8 100644 --- a/Icarus/Controllers/v1/AccessLevelController.cs +++ b/Icarus/Controllers/v1/AccessLevelController.cs @@ -27,7 +27,7 @@ public class AccessLevelController : BaseController #region HTTP Routes [HttpGet] - public IActionResult GetAccessLevels(int? id, int? songId) + public IActionResult GetAccessLevels(int? id, int? songId) { var accLevel = new Icarus.Models.AccessLevel { Id = 0 }; var accessLevelContext = new Icarus.Database.Contexts.AccessLevelContext(_connectionString!); @@ -41,7 +41,7 @@ public class AccessLevelController : BaseController accLevel = accessLevelContext.AccessLevels!.FirstOrDefault(al => al.SongId == songId); } - var response = new GetAccessLevelsResponse{ Data = new List()}; + var response = new GetAccessLevelsResponse { Data = new List() }; if (accLevel?.Id > 0) { @@ -59,13 +59,17 @@ public class AccessLevelController : BaseController [HttpPatch("{id}")] public IActionResult UpdateAccessLevel(int id, [FromBody] Models.AccessLevel accessLevel) { - var response = new UpdateAccessLevelResponse{ Data = new List()}; + var response = new UpdateAccessLevelResponse { Data = new List() }; var targetLevel = accessLevel.Level; - if (targetLevel == null) { + if (targetLevel == null) + { response.Subject = "No level provided"; return BadRequest(response); - } else { - if (!Models.AccessLevel.IsAccessLevelValid(targetLevel)) { + } + else + { + if (!Models.AccessLevel.IsAccessLevelValid(targetLevel)) + { response.Subject = "Invalid level"; return BadRequest(response); } @@ -73,21 +77,25 @@ public class AccessLevelController : BaseController var accessLevelContext = new Database.Contexts.AccessLevelContext(this._connectionString!); - var fetchedAccLevel = accessLevelContext.AccessLevels!.FirstOrDefault(al => al.Id == id); + var fetchedAccLevel = accessLevelContext.AccessLevels!.FirstOrDefault(al => al.Id == id); - if (fetchedAccLevel == null) { - response.Subject = "Nothing found"; - return NotFound(response); - } + if (fetchedAccLevel == null) + { + response.Subject = "Nothing found"; + return NotFound(response); + } var fetchedLevel = fetchedAccLevel!.Level; - if (fetchedLevel!.Equals(targetLevel)) { + if (fetchedLevel!.Equals(targetLevel)) + { // No change response.Subject = "No change"; response.Data.Add(fetchedAccLevel); return Ok(response); - } else { + } + else + { fetchedAccLevel.Level = targetLevel; response.Subject = "Successful"; accessLevelContext.Update(fetchedAccLevel); diff --git a/Models/AccessLevel.cs b/Models/AccessLevel.cs index a734ae0..d983b31 100644 --- a/Models/AccessLevel.cs +++ b/Models/AccessLevel.cs @@ -30,17 +30,21 @@ public class AccessLevel }; } -public static bool IsAccessLevelValid(string level) { - if (level.Equals(DefaultLevel().Level)) { - return true; - } - else if (level.Equals(PrivateLevel().Level)) { - return true; - } - else { - return false; + public static bool IsAccessLevelValid(string level) + { + if (level.Equals(DefaultLevel().Level)) + { + return true; + } + else if (level.Equals(PrivateLevel().Level)) + { + return true; + } + else + { + return false; + } } -} #endregion }