diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java index 135feb761677982bd6a484fad5a44e6308909add..dd65345886a2a7dad19cf92de2ded65074bde465 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