From fbccec62cd6277526c03fc5a717a36ebda6596c6 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 9 May 2021 10:25:44 +0200
Subject: [PATCH] Fixed #610: import step 1 should not include "all accounts"
in number of accounts
---
.../de/deadlocker8/budgetmaster/database/Database.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java b/src/main/java/de/deadlocker8/budgetmaster/database/Database.java
index d839e1db6..15ead6533 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/Database.java
@@ -2,6 +2,7 @@ package de.deadlocker8.budgetmaster.database;
import com.google.gson.annotations.Expose;
import de.deadlocker8.budgetmaster.accounts.Account;
+import de.deadlocker8.budgetmaster.accounts.AccountType;
import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.images.Image;
@@ -12,6 +13,7 @@ import de.deadlocker8.budgetmaster.transactions.Transaction;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
public class Database
{
@@ -88,7 +90,12 @@ public class Database
final Map<EntityType, Integer> numberOfEntitiesByType = new LinkedHashMap<>();
numberOfEntitiesByType.put(EntityType.CATEGORY, categories.size());
- numberOfEntitiesByType.put(EntityType.ACCOUNT, accounts.size());
+
+ final List<Account> customAccounts = accounts.stream()
+ .filter(account -> account.getType() == AccountType.CUSTOM)
+ .collect(Collectors.toList());
+ numberOfEntitiesByType.put(EntityType.ACCOUNT, customAccounts.size());
+
numberOfEntitiesByType.put(EntityType.TRANSACTION, transactions.size());
numberOfEntitiesByType.put(EntityType.TEMPLATE, templates.size());
numberOfEntitiesByType.put(EntityType.IMAGE, images.size());
--
GitLab