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 9733de8366e42c88ee2daa52c8cf949e56fd07a9..e8265d87c84ee1a22751a00a1e7a1d2ee83e7a2c 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);