From 156dab34955ed5e754c373aa3409b7d473538efd Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 17 Oct 2022 15:56:39 +0200
Subject: [PATCH] #722 - cleanup: selecting the first transactions if repeating
is no longer necessary since #703
---
.../transactions/TransactionController.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 9733de836..e8265d87c 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -372,23 +372,17 @@ public class TransactionController extends BaseController
@GetMapping("/{ID}/newFromExisting")
public String newFromExisting(Model model, @PathVariable("ID") Integer ID, @CookieValue("currentDate") String cookieDate)
{
- Optional<Transaction> transactionOptional = transactionService.getRepository().findById(ID);
+ final Optional<Transaction> transactionOptional = transactionService.getRepository().findById(ID);
if(transactionOptional.isEmpty())
{
throw new ResourceNotFoundException();
}
- Transaction existingTransaction = transactionOptional.get();
+ final Transaction existingTransaction = transactionOptional.get();
- // select first transaction in order to provide correct start date for repeating transactions
- if(existingTransaction.getRepeatingOption() != null)
- {
- existingTransaction = existingTransaction.getRepeatingOption().getReferringTransactions().get(0);
- }
-
- LocalDate date = dateService.getDateTimeFromCookie(cookieDate);
+ final LocalDate date = dateService.getDateTimeFromCookie(cookieDate);
- Transaction newTransaction = new Transaction(existingTransaction);
+ final Transaction newTransaction = new Transaction(existingTransaction);
newTransaction.setID(null);
newTransaction.setDate(null);
--
GitLab