From 559f24b8d8ce23812cc5ed772c167676b8f25765 Mon Sep 17 00:00:00 2001 From: Damien Ostler Date: Sun, 17 Mar 2024 05:18:36 -0400 Subject: [PATCH] fix: calculations for admin user being done incrrectly --- .../Controllers/Admin/AdminUsersController.cs | 11 ++++++++++- src/comissions.app.api/Models/Admin/AdminUserModel.cs | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/comissions.app.api/Controllers/Admin/AdminUsersController.cs b/src/comissions.app.api/Controllers/Admin/AdminUsersController.cs index ec819d7..27f2d9b 100644 --- a/src/comissions.app.api/Controllers/Admin/AdminUsersController.cs +++ b/src/comissions.app.api/Controllers/Admin/AdminUsersController.cs @@ -24,6 +24,10 @@ public class AdminUsersController:ControllerBase public async Task GetUsers([FromQuery]string search="", [FromQuery]int offset = 0, [FromQuery]int pageSize = 10) { var users = await _dbContext.Users + .Include(x=>x.Requests) + .Include(x=>x.Suspensions) + .Include(x=>x.Bans) + .Include(x=>x.Requests).ThenInclude(x=>x.Artist) .Where(x=>x.DisplayName.Contains(search) || x.Email.Contains(search)) .Skip(offset).Take(pageSize).ToListAsync(); var result = users.Select(x => x.ToAdminUserModel()); @@ -42,7 +46,12 @@ public class AdminUsersController:ControllerBase [HttpGet("{userId}")] public async Task GetUser(string userId) { - var user = await _dbContext.Users.FirstOrDefaultAsync(x=>x.Id==userId); + var user = await _dbContext.Users + .Include(x=>x.Requests) + .Include(x=>x.Suspensions) + .Include(x=>x.Bans) + .Include(x=>x.Requests).ThenInclude(x=>x.Artist) + .FirstOrDefaultAsync(x=>x.Id==userId); if (user == null) return NotFound(); diff --git a/src/comissions.app.api/Models/Admin/AdminUserModel.cs b/src/comissions.app.api/Models/Admin/AdminUserModel.cs index 8853df9..162e07e 100644 --- a/src/comissions.app.api/Models/Admin/AdminUserModel.cs +++ b/src/comissions.app.api/Models/Admin/AdminUserModel.cs @@ -28,7 +28,7 @@ public static class AdminUserModelExtensions NumberOfRequests = user.Requests.Count, NumberOfSuspensions = user.Suspensions.Count, NumberOfBans = user.Bans.Count, - NumberOfReviews = user.Requests.Count, + NumberOfReviews = user.Requests.Count(x => x.Reviewed), AmountSpent = user.Requests.Sum(r => r.Amount) }; }