From dc23f45e9e3d8fa82385efcf8b17aef4f9fbe64d Mon Sep 17 00:00:00 2001 From: Damien Ostler Date: Sun, 17 Mar 2024 06:10:48 -0400 Subject: [PATCH] fix: fees collected calculation wrong, should only include the ones that have been paid for --- src/comissions.app.api/Models/Admin/AdminArtistModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/comissions.app.api/Models/Admin/AdminArtistModel.cs b/src/comissions.app.api/Models/Admin/AdminArtistModel.cs index 01f06f3..d771211 100644 --- a/src/comissions.app.api/Models/Admin/AdminArtistModel.cs +++ b/src/comissions.app.api/Models/Admin/AdminArtistModel.cs @@ -44,7 +44,7 @@ public static class AdminArtistModelExtensions NumberOfReviews = artist.Requests.Count(x => x.Reviewed), NumberOfPaid = artist.Requests.Count(x => x.Paid), AmountMade = artist.Requests.Sum(r => r.Amount), - FeesCollected = artist.Requests.Sum(r => r.Amount)*(decimal)0.15, + FeesCollected = artist.Requests.Where(x=>x.Paid).Sum(r => r.Amount)*(decimal)0.015, NumberOfAssets = artist.Requests.SelectMany(x=>x.RequestAssets).Count(), NumberOfPortfolio = artist.PortfolioPieces.Count, AverageRating = artist.Requests.Count(x=>x.Reviewed) == 0 ? 0 : artist.Requests.Where(x=>x.Reviewed).Average(x=>x.Rating)