From 31a72f55ace804e87479b4d783cadf8ca3aafa6c Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 30 Mar 2022 23:02:42 +0200
Subject: [PATCH] #691 - fixed tag importer (tags dont have ids in json)
---
.../budgetmaster/database/importer/TagImporter.java | 2 +-
.../deadlocker8/budgetmaster/services/EntityType.java | 2 +-
.../unit/database/importer/TemplateImporterTest.java | 9 ++-------
.../database/importer/TransactionImporterTest.java | 10 ++--------
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
index 94b2cd449..34b2026e8 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/importer/TagImporter.java
@@ -26,7 +26,7 @@ public class TagImporter extends ItemImporter<Tag>
return newTag.getID();
}
- return tag.getID();
+ return existingTag.getID();
}
@Override
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java b/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
index 8947051c0..c34260a78 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
@@ -11,7 +11,7 @@ public enum EntityType implements LocalizedEnum
CHART("show_chart", "background-purple", ImportRequired.OPTIONAL, "charts", "chart"),
REPORT("description", "background-green", ImportRequired.NONE, null, null),
CATEGORY("label", "background-orange", ImportRequired.REQUIRED, "categories", "category"),
- TAGS("local_offer", "background-grey", ImportRequired.NONE, null, null),
+ TAGS("local_offer", "background-grey", ImportRequired.NONE, "tags", "tag"),
STATISTICS("insert_chart", "background-grey", ImportRequired.NONE, null, null),
SETTINGS("settings", "background-red", ImportRequired.NONE, null, null),
IMAGE("image", "background-grey", ImportRequired.REQUIRED, "images", "image"),
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TemplateImporterTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TemplateImporterTest.java
index c3f2d9b00..2217f5b39 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TemplateImporterTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TemplateImporterTest.java
@@ -185,11 +185,6 @@ class TemplateImporterTest
Icon icon = new Icon("fas fa-icons");
icon = iconRepository.save(icon);
- final Tag tag1 = new Tag("0815");
- tag1.setID(1);
- final Tag tag2 = new Tag("Apple Pie");
- tag2.setID(2);
-
final Template template = new Template();
template.setID(15);
template.setTemplateName("My awesome template");
@@ -201,7 +196,7 @@ class TemplateImporterTest
template.setTags(List.of());
template.setDescription("Lorem Ipsum");
template.setIconReference(icon);
- template.setTags(List.of(tag1, tag2));
+ template.setTags(List.of( new Tag("0815"), new Tag("Apple Pie")));
final Template template2 = new Template();
template2.setID(16);
@@ -210,7 +205,7 @@ class TemplateImporterTest
template2.setTags(List.of());
template2.setDescription("Lorem Ipsum");
template2.setIconReference(icon);
- template2.setTags(List.of(tag1));
+ template2.setTags(List.of( new Tag("0815")));
TemplateGroup defaultTemplateGroup = new TemplateGroup("Default group", TemplateGroupType.DEFAULT);
defaultTemplateGroup = templateGroupRepository.save(defaultTemplateGroup);
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TransactionImporterTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TransactionImporterTest.java
index 525378f37..959cf44fb 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TransactionImporterTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/TransactionImporterTest.java
@@ -213,9 +213,7 @@ class TransactionImporterTest
transaction.setDescription("Lorem Ipsum");
final Tag tag1 = new Tag("0815");
- tag1.setID(1);
final Tag tag2 = new Tag("Apple Pie");
- tag2.setID(2);
transaction.setTags(List.of(tag1, tag2));
@@ -258,10 +256,6 @@ class TransactionImporterTest
Account account = new Account("Awesome Account", AccountType.CUSTOM);
account = accountRepository.save(account);
- final Tag tag1 = new Tag("0815");
- tag1.setID(1);
- final Tag tag2 = new Tag("Apple Pie");
- tag2.setID(2);
final Transaction transaction = new Transaction();
transaction.setID(15);
@@ -271,7 +265,7 @@ class TransactionImporterTest
transaction.setCategory(category);
transaction.setAccount(account);
transaction.setDate(LocalDate.of(2022, 3, 30));
- transaction.setTags(List.of(tag1, tag2));
+ transaction.setTags(List.of(new Tag("0815"), new Tag("Apple Pie")));
final Transaction transaction2 = new Transaction();
transaction2.setID(16);
@@ -281,7 +275,7 @@ class TransactionImporterTest
transaction2.setCategory(category);
transaction2.setAccount(account);
transaction2.setDate(LocalDate.of(2022, 3, 30));
- transaction2.setTags(List.of(tag1));
+ transaction2.setTags(List.of(new Tag("0815")));
final TagImporter tagImporter = new TagImporter(tagRepository);
final TransactionImporter importer = new TransactionImporter(transactionRepository, tagImporter);
--
GitLab