From e16093ac3a92cbeb534f397f65143a86d75de500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 16 Jun 2021 10:41:05 +0200 Subject: [PATCH] #377 - Category with only fixed expenses in summary period is shown with zero price. --- src/Money.Models.Builders/OutcomeBuilder.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Money.Models.Builders/OutcomeBuilder.cs b/src/Money.Models.Builders/OutcomeBuilder.cs index 52b0a689..57d68ebb 100644 --- a/src/Money.Models.Builders/OutcomeBuilder.cs +++ b/src/Money.Models.Builders/OutcomeBuilder.cs @@ -93,9 +93,17 @@ private async Task> GetCategoryWithAmounts(ReadMod { Price price; if (totals.TryGetValue(category.CategoryId, out price)) - price = price + priceConverter.ToDefault(userKey, outcome); + { + if (!outcome.IsFixed) + price = price + priceConverter.ToDefault(userKey, outcome); + } else - price = priceConverter.ToDefault(userKey, outcome); + { + if (!outcome.IsFixed) + price = priceConverter.ToDefault(userKey, outcome); + else + price = priceConverter.ZeroDefault(userKey); + } totals[category.CategoryId] = price; } @@ -129,7 +137,6 @@ public async Task> HandleAsync(ListMonthCategoryWi List outcomes = await db.Outcomes .WhereUserKey(query.UserKey) .Where(o => o.When.Month == query.Month.Month && o.When.Year == query.Month.Year) - .Where(o => o.IsFixed == false) .Include(o => o.Categories) .ToListAsync(); @@ -144,7 +151,6 @@ public async Task> HandleAsync(ListYearCategoryWit List outcomes = await db.Outcomes .WhereUserKey(query.UserKey) .Where(o => o.When.Year == query.Year.Year) - .Where(o => o.IsFixed == false) .Include(o => o.Categories) .ToListAsync();