#377 - Category with only fixed expenses in summary period is shown w…

…ith zero price.
maraf · Jun 16, 2021 · e16093a · e16093a
1 parent 99a405a
commit e16093a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Money.Models.Builders/OutcomeBuilder.cs b/src/Money.Models.Builders/OutcomeBuilder.cs
@@ -93,9 +93,17 @@ private async Task<List<CategoryWithAmountModel>> 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<List<CategoryWithAmountModel>> HandleAsync(ListMonthCategoryWi
                 List<OutcomeEntity> 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<List<CategoryWithAmountModel>> HandleAsync(ListYearCategoryWit
                 List<OutcomeEntity> 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();