From 4adf64d129f33895fe70d3db18f616e788456584 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 16 Jul 2022 16:34:26 +0300 Subject: [PATCH] refactor: decouple scoreboard api logic Now scoreboard business logic is in ScoreboardService.cs and scoreboard api login is in ScoreboardController.cs --- .gitignore | 1 + Server/Controllers/ScoreboardController.cs | 62 ++++++++++--------- Server/Program.cs | 12 +++- Server/Server.csproj | 1 + Server/Services/ScoreboardService.cs | 71 ++++++++++++++++++++++ 5 files changed, 117 insertions(+), 30 deletions(-) create mode 100644 Server/Services/ScoreboardService.cs diff --git a/.gitignore b/.gitignore index 07b905a..1497e86 100644 --- a/.gitignore +++ b/.gitignore @@ -454,3 +454,4 @@ $RECYCLE.BIN/ !.vscode/extensions.json *.db +*.db* diff --git a/Server/Controllers/ScoreboardController.cs b/Server/Controllers/ScoreboardController.cs index be50283..5950b6e 100644 --- a/Server/Controllers/ScoreboardController.cs +++ b/Server/Controllers/ScoreboardController.cs @@ -1,33 +1,35 @@ -using DatabaseModels; +using System.Data; +using DatabaseModels.Plain; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Server.Data; +using Server.Services; namespace Server.Controllers; -[Route("api/[controller]")] +[Route("[controller]")] [ApiController] public class ScoreboardController : ControllerBase { - private readonly ServerDbContext _context; + private readonly ScoreboardService _sbService; - public ScoreboardController(ServerDbContext context) + public ScoreboardController(ScoreboardService sbService) { - _context = context; + _sbService = sbService; } - // GET: api/Scoreboard + // GET: /scoreboard [HttpGet] public async Task> Get() { - return await _context.Scoreboard.ToArrayAsync(); + return await _sbService.GetScoreboard(); } - // GET: api/Scoreboard/cuqmbr + // GET: /scoreboard/cuqmbr [HttpGet("{username}", Name = "Get")] public async Task> Get(string username) { - var sbRecord = await _context.Scoreboard.FirstOrDefaultAsync(sbr => sbr.Username == username); + var sbRecord = await _sbService.GetUserHighScore(username); if (sbRecord == null) { @@ -37,46 +39,50 @@ public class ScoreboardController : ControllerBase return sbRecord; } - // POST: api/Scoreboard + // POST: /scoreboard [HttpPost] public async Task Post([FromBody] ScoreboardRecord sbRecord) { - await _context.AddAsync(sbRecord); - await _context.SaveChangesAsync(); - - return CreatedAtAction(nameof(Get), new {sbRecord.Username}, sbRecord); + await _sbService.AddUserHighScore(sbRecord); + return CreatedAtAction(nameof(Get), new {sbRecord.User}, sbRecord); } - - // PUT: api/Scoreboard/cuqmbr - [HttpPut("{username}")] - public async Task Put(string username, [FromBody] ScoreboardRecord sbRecord) + + // PUT: /scoreboard/id + [HttpPut("{id}", Name = "Put")] + public async Task> Put(int id, [FromBody] ScoreboardRecord sbRecord) { - if (username != sbRecord.Username) + if (id != sbRecord.Id) { return BadRequest(); } - _context.Entry(sbRecord).State = EntityState.Modified; - try { - await _context.SaveChangesAsync(); + await _sbService.UpdateScoreboardRecord(sbRecord); } - catch (DbUpdateConcurrencyException) + catch (DBConcurrencyException) { - if (!await ScoreboardRecordExists(sbRecord.Username)) + if (!await _sbService.ScoreboardRecordExists(id)) { return NotFound(); } - + throw; } return NoContent(); } - - private async Task ScoreboardRecordExists(string username) + + // DELETE: /scoreboard/id + [HttpDelete("{id}", Name = "Delete")] + public async Task Delete(int id) { - return await _context.Scoreboard.AnyAsync(sbr => sbr.Username == username); + if (!await _sbService.ScoreboardRecordExists(id)) + { + return NotFound(); + } + + await _sbService.DeleteScoreboardRecord(id); + return NoContent(); } } diff --git a/Server/Program.cs b/Server/Program.cs index 9a50f15..53f7cd4 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -1,15 +1,23 @@ using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; using Server.Data; +using Server.Services; var builder = WebApplication.CreateBuilder(args); // Add services to the container. -builder.Services.AddControllers(); +builder.Services.AddControllers().AddNewtonsoftJson(o => { + o.SerializerSettings.ContractResolver = new DefaultContractResolver(); + o.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; +}); builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -builder.Services.AddDbContext(o => o.UseSqlite(builder.Configuration.GetConnectionString("DefaultConnection"))); +builder.Services.AddDbContext(o => + o.UseSqlite(builder.Configuration.GetConnectionString("DefaultConnection"))); +builder.Services.AddScoped(); var app = builder.Build(); diff --git a/Server/Server.csproj b/Server/Server.csproj index 8bf0e71..b65b032 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -7,6 +7,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Server/Services/ScoreboardService.cs b/Server/Services/ScoreboardService.cs new file mode 100644 index 0000000..61deced --- /dev/null +++ b/Server/Services/ScoreboardService.cs @@ -0,0 +1,71 @@ +using DatabaseModels.Plain; +using Microsoft.EntityFrameworkCore; +using Server.Data; + +namespace Server.Services; + +public class ScoreboardService +{ + private readonly ServerDbContext _dbContext; + + public ScoreboardService(ServerDbContext dbContext) + { + _dbContext = dbContext; + } + + // GET + + public async Task GetScoreboard() + { + var sbRecords = await _dbContext.Scoreboard + .Include(sbr => sbr.User) + .ToListAsync(); + + sbRecords.Sort((a, b) => b.Score - a.Score); + + return sbRecords.DistinctBy(sbr => sbr.User.Id).ToArray(); + } + + public async Task GetUserHighScore(string username) + { + var userScoreboardRecords = await _dbContext.Scoreboard + .Include(sbr => sbr.User) + .Where(sbr => sbr.User.Username == username) + .ToListAsync(); + + return userScoreboardRecords.MaxBy(sbr => sbr.Score); + } + + // POST + + public async Task AddUserHighScore(ScoreboardRecord sbRecord) + { + var dbUser = await _dbContext.Users.FindAsync(sbRecord.User.Id); + sbRecord.User = dbUser; + + await _dbContext.AddAsync(sbRecord); + await _dbContext.SaveChangesAsync(); + } + + // PUT + + public async Task UpdateScoreboardRecord(ScoreboardRecord sbRecord) + { + _dbContext.Entry(sbRecord).State = EntityState.Modified; + await _dbContext.SaveChangesAsync(); + } + + public async Task ScoreboardRecordExists(int id) + { + return await _dbContext.Scoreboard.AnyAsync(sbr => sbr.Id == id); + } + + // DELETE + + public async Task DeleteScoreboardRecord(int id) + { + var sbRecord = await _dbContext.Scoreboard.FindAsync(id); + _dbContext.Scoreboard.Remove(sbRecord!); + await _dbContext.SaveChangesAsync(); + } +} \ No newline at end of file