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 56b617b1a45d64cf3816a333cc77d1f47157dc2e..a7be3ecb5edb47213e7c79814ef7820542f05fce 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 9ecafbeb4f8b54490aadbd442cec8308dadf97ea..fc307def1032571d75115d068fef2275b7d87275 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 5b7eefe36151a28a5e33f464f561a682a1901ddd..df2262083549cc6696784c8e5e97c0a418ef3008 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 d9f77597946a7874f9ef0af3311416b93e8553df..f0e35bf29aff2cfb78f853e411e66d81dbc5c964 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",