From 35a2769086b88bd5edf01a80c867cc4ad630074d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 25 Nov 2018 17:28:56 +0100
Subject: [PATCH] Fixed import behaviour for default categories
---
.../budgetmaster/services/ImportService.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
index 135feb761..dd6534588 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
@@ -50,14 +50,17 @@ public class ImportService
for(Category category : database.getCategories())
{
- if(!category.getType().equals(CategoryType.CUSTOM))
+ Category existingCategory;
+ if(category.getType().equals(CategoryType.NONE) || category.getType().equals(CategoryType.REST))
{
- continue;
+ existingCategory = categoryRepository.findByType(category.getType());
+ }
+ else
+ {
+ existingCategory = categoryRepository.findByNameAndColorAndType(category.getName(), category.getColor(), category.getType());
}
int newCategoryID = -1;
-
- Category existingCategory = categoryRepository.findByNameAndColorAndType(category.getName(), category.getColor(), category.getType());
if(existingCategory == null)
{
//category does not exist --> create it
--
GitLab