From 8928ecb851e1c3e3c1f66971b85b3674384e30e7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 26 Mar 2023 23:03:26 +0200
Subject: [PATCH] Fixed #739 - csv import: create new transaction from
template: do not override category
---
.../budgetmaster/templates/TemplateController.java | 1 -
.../budgetmaster/integration/selenium/CsvImportTest.java | 2 +-
.../selenium/NewTransactionFromTemplateTest.java | 2 +-
BudgetMasterServer/src/test/resources/SearchDatabase.json | 8 ++++----
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index 56b617b1a..a7be3ecb5 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -188,7 +188,6 @@ public class TemplateController extends BaseController
transaction.setDate(csvTransaction.getDate());
transaction.setAmount(csvTransaction.getAmount());
transaction.setIsExpenditure(csvTransaction.getAmount() <= 0);
- transaction.setCategory(csvTransaction.getCategory());
}
}
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CsvImportTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CsvImportTest.java
index 9ecafbeb4..fc307def1 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CsvImportTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CsvImportTest.java
@@ -508,7 +508,7 @@ class CsvImportTest extends SeleniumTestBase
assertThat(driver.findElement(By.id("transaction-amount")).getAttribute("value")).isEqualTo("12.00");
assertThat(driver.findElement(By.id("transaction-datepicker")).getAttribute("value")).isEqualTo("08.01.2023");
assertThat(driver.findElement(By.id("transaction-description")).getAttribute("value")).isEqualTo("DescriptionFromTemplate");
- assertThat(driver.findElement(By.cssSelector(".category-select-wrapper .custom-select-selected-item .category-circle")).getAttribute("data-value")).isEqualTo("1");
+ assertThat(driver.findElement(By.cssSelector(".category-select-wrapper .custom-select-selected-item .category-circle")).getAttribute("data-value")).isEqualTo("3");
// save transaction
driver.findElement(By.id("button-save-transaction")).click();
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
index 5b7eefe36..df2262083 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
@@ -63,7 +63,7 @@ class NewTransactionFromTemplateTest extends SeleniumTestBase
assertThat(driver.findElement(By.id("transaction-name")).getAttribute("value")).isEqualTo("NameFromTemplate");
assertThat(driver.findElement(By.id("transaction-amount")).getAttribute("value")).isEqualTo("15.00");
assertThat(driver.findElement(By.id("transaction-description")).getAttribute("value")).isEqualTo("DescriptionFromTemplate");
- assertThat(driver.findElement(By.cssSelector(".category-select-wrapper .custom-select-selected-item .category-circle")).getAttribute("data-value")).isEqualTo("1");
+ assertThat(driver.findElement(By.cssSelector(".category-select-wrapper .custom-select-selected-item .category-circle")).getAttribute("data-value")).isEqualTo("3");
final List<WebElement> chips = driver.findElements(By.cssSelector("#transaction-chips .chip"));
assertThat(chips).hasSize(1);
diff --git a/BudgetMasterServer/src/test/resources/SearchDatabase.json b/BudgetMasterServer/src/test/resources/SearchDatabase.json
index d9f775979..f0e35bf29 100644
--- a/BudgetMasterServer/src/test/resources/SearchDatabase.json
+++ b/BudgetMasterServer/src/test/resources/SearchDatabase.json
@@ -3331,10 +3331,10 @@
"type": "CUSTOM"
},
"category": {
- "ID": 1,
- "name": "No Category",
- "color": "#FFFFFF",
- "type": "NONE"
+ "ID": 97,
+ "name": "sdfdsf",
+ "color": "#2e7c2b",
+ "type": "CUSTOM"
},
"name": "NameFromTemplate",
"description": "DescriptionFromTemplate",
--
GitLab