From 153e221f11200878492f90d43e28b61ca64ce0d8 Mon Sep 17 00:00:00 2001
From: MK13 <marius@kleberonline.de>
Date: Thu, 19 May 2022 10:56:05 +0200
Subject: [PATCH] #29 Projected cash flow

---
 .../financer/controller/ReportController.java | 30 ++++----
 ...ctedCashFlowForPeriodTransactionsForm.java | 68 ++++++++++++++-----
 ...rojectedCashFlowForPeriodTransactions.html | 56 +++++++++------
 3 files changed, 103 insertions(+), 51 deletions(-)

diff --git a/financer-web-client/src/main/java/de/financer/controller/ReportController.java b/financer-web-client/src/main/java/de/financer/controller/ReportController.java
index 7cfb6cc..0f529d2 100644
--- a/financer-web-client/src/main/java/de/financer/controller/ReportController.java
+++ b/financer-web-client/src/main/java/de/financer/controller/ReportController.java
@@ -150,27 +150,25 @@ public class ReportController {
                     new ParameterizedTypeReference<Iterable<RecurringTransactionDueInRangeResponseDto>>() {
                     });
 
-            final List<RecurringTransaction> incomeTransactions = new ArrayList<>();
-            final List<RecurringTransaction> expenseTransactions = new ArrayList<>();
+            final ConfigProjectedCashFlowForPeriodTransactionsForm formTransactions =
+                    new ConfigProjectedCashFlowForPeriodTransactionsForm(
+                            ControllerUtils.parseDate(this.financerConfig, form.getFromDate()),
+                            ControllerUtils.parseDate(this.financerConfig, form.getToDate()));
             final EnumMap<AccountType, List<AccountType>> bookingRules = new EnumMap<>(AccountType.class);
 
             bookingRules.put(BANK, Arrays.asList(BANK, EXPENSE, LIABILITY));
             bookingRules.put(CASH, Arrays.asList(EXPENSE, LIABILITY));
 
             IterableUtils.toList(trxs).stream()
-                         .flatMap(dto -> IterableUtils.toList(dto.getRecurringTransactions()).stream()).forEach(rt -> {
-                             if (AccountType.INCOME == rt.getFromAccount().getType()) {
-                                 incomeTransactions.add(rt);
-                             } else if (bookingRules.getOrDefault(rt.getFromAccount().getType(), Collections.EMPTY_LIST)
-                                                    .contains(rt.getToAccount().getType())) {
-                                 expenseTransactions.add(rt);
-                             }
-                         });
-
-            ConfigProjectedCashFlowForPeriodTransactionsForm formTransactions =
-                    new ConfigProjectedCashFlowForPeriodTransactionsForm(incomeTransactions, expenseTransactions,
-                            ControllerUtils.parseDate(this.financerConfig, form.getFromDate()),
-                            ControllerUtils.parseDate(this.financerConfig, form.getToDate()));
+                         .forEach(dto -> IterableUtils.toList(dto.getRecurringTransactions()).stream().forEach(rt -> {
+                                     if (AccountType.INCOME == rt.getFromAccount().getType()) {
+                                         formTransactions.addIncomeTransaction(dto.getDate(), rt);
+                                     } else if (bookingRules.getOrDefault(rt.getFromAccount().getType(), Collections.EMPTY_LIST)
+                                                            .contains(rt.getToAccount().getType())) {
+                                         formTransactions.addExpenseTransaction(dto.getDate(), rt);
+                                     }
+                                 }
+                         ));
 
             final ResponseEntity<Iterable<Account>> response = new GetAllAccountsTemplate().exchange(this.financerConfig);
 
@@ -188,6 +186,8 @@ public class ReportController {
 
             return "report/configureProjectedCashFlowForPeriodTransactions";
         } catch (FinancerRestException e) {
+            e.printStackTrace();
+
             model.addAttribute("errorMessage", e.getResponseReason().name());
             model.addAttribute("form", form);
             ControllerUtils.addVersionAttribute(model, this.financerConfig);
diff --git a/financer-web-client/src/main/java/de/financer/form/ConfigProjectedCashFlowForPeriodTransactionsForm.java b/financer-web-client/src/main/java/de/financer/form/ConfigProjectedCashFlowForPeriodTransactionsForm.java
index 24ad0e5..725cbe9 100644
--- a/financer-web-client/src/main/java/de/financer/form/ConfigProjectedCashFlowForPeriodTransactionsForm.java
+++ b/financer-web-client/src/main/java/de/financer/form/ConfigProjectedCashFlowForPeriodTransactionsForm.java
@@ -83,8 +83,38 @@ public class ConfigProjectedCashFlowForPeriodTransactionsForm {
         }
     }
 
-    private List<RecurringTransaction> incomeTransactions;
-    private List<RecurringTransaction> expenseTransactions;
+    public static class RecurringTransactionContainer {
+        private RecurringTransaction recurringTransaction;
+        private LocalDate date;
+
+        public RecurringTransactionContainer() {
+
+        }
+
+        public RecurringTransactionContainer(RecurringTransaction recurringTransaction, LocalDate date) {
+            this.date = date;
+            this.recurringTransaction = recurringTransaction;
+        }
+
+        public RecurringTransaction getRecurringTransaction() {
+            return recurringTransaction;
+        }
+
+        public void setRecurringTransaction(RecurringTransaction recurringTransaction) {
+            this.recurringTransaction = recurringTransaction;
+        }
+
+        public LocalDate getDate() {
+            return date;
+        }
+
+        public void setDate(LocalDate date) {
+            this.date = date;
+        }
+    }
+
+    private List<RecurringTransactionContainer> incomeTransactions;
+    private List<RecurringTransactionContainer> expenseTransactions;
     private List<AccountGroupAccountContainer> accountGroupAccountContainers;
     private long incomeSum;
     private long expenseSum;
@@ -99,23 +129,21 @@ public class ConfigProjectedCashFlowForPeriodTransactionsForm {
         this.accountGroupAccountContainers = new ArrayList<>();
     }
 
-    public ConfigProjectedCashFlowForPeriodTransactionsForm(List<RecurringTransaction> incomeTransactions,
-                                                            List<RecurringTransaction> expenseTransactions,
-                                                            LocalDate fromDate, LocalDate toDate
+    public ConfigProjectedCashFlowForPeriodTransactionsForm(LocalDate fromDate, LocalDate toDate
     ) {
-        this.incomeTransactions = incomeTransactions;
-        this.expenseTransactions = expenseTransactions;
+        this.incomeTransactions = new ArrayList<>();
+        this.expenseTransactions = new ArrayList<>();
         this.accountGroupAccountContainers = new ArrayList<>();
         this.fromDate = fromDate;
         this.toDate = toDate;
-
-        Collections.sort(this.incomeTransactions, Comparator.comparing(RecurringTransaction::getAmount));
-        Collections.sort(this.expenseTransactions, Comparator.comparing(RecurringTransaction::getAmount));
     }
 
     public void refresh() {
-        this.incomeSum = incomeTransactions.stream().mapToLong(RecurringTransaction::getAmount).sum();
-        this.expenseSum = expenseTransactions.stream().mapToLong(RecurringTransaction::getAmount).sum();
+        Collections.sort(this.incomeTransactions, Comparator.comparing(con -> con.getRecurringTransaction().getAmount()));
+        Collections.sort(this.expenseTransactions, Comparator.comparing(con -> con.getRecurringTransaction().getAmount()));
+
+        this.incomeSum = incomeTransactions.stream().mapToLong(con -> con.getRecurringTransaction().getAmount()).sum();
+        this.expenseSum = expenseTransactions.stream().mapToLong(con -> con.getRecurringTransaction().getAmount()).sum();
         this.cashFlow = this.incomeSum - this.expenseSum;
 
         this.accountSum = this.accountGroupAccountContainers.stream().map(AccountGroupAccountContainer::getAccounts)
@@ -125,19 +153,19 @@ public class ConfigProjectedCashFlowForPeriodTransactionsForm {
         this.cashFlow = this.cashFlow - this.accountSum;
     }
 
-    public List<RecurringTransaction> getIncomeTransactions() {
+    public List<RecurringTransactionContainer> getIncomeTransactions() {
         return incomeTransactions;
     }
 
-    public void setIncomeTransactions(List<RecurringTransaction> incomeTransactions) {
+    public void setIncomeTransactions(List<RecurringTransactionContainer> incomeTransactions) {
         this.incomeTransactions = incomeTransactions;
     }
 
-    public List<RecurringTransaction> getExpenseTransactions() {
+    public List<RecurringTransactionContainer> getExpenseTransactions() {
         return expenseTransactions;
     }
 
-    public void setExpenseTransactions(List<RecurringTransaction> expenseTransactions) {
+    public void setExpenseTransactions(List<RecurringTransactionContainer> expenseTransactions) {
         this.expenseTransactions = expenseTransactions;
     }
 
@@ -157,6 +185,14 @@ public class ConfigProjectedCashFlowForPeriodTransactionsForm {
                                                                                                       .collect(Collectors.toList())));
     }
 
+    public void addIncomeTransaction(LocalDate date, RecurringTransaction recurringTransaction) {
+        this.incomeTransactions.add(new RecurringTransactionContainer(recurringTransaction, date));
+    }
+
+    public void addExpenseTransaction(LocalDate date, RecurringTransaction recurringTransaction) {
+        this.expenseTransactions.add(new RecurringTransactionContainer(recurringTransaction, date));
+    }
+
     public long getIncomeSum() {
         return incomeSum;
     }
diff --git a/financer-web-client/src/main/resources/templates/report/configureProjectedCashFlowForPeriodTransactions.html b/financer-web-client/src/main/resources/templates/report/configureProjectedCashFlowForPeriodTransactions.html
index ff1505c..b7a2d2e 100644
--- a/financer-web-client/src/main/resources/templates/report/configureProjectedCashFlowForPeriodTransactions.html
+++ b/financer-web-client/src/main/resources/templates/report/configureProjectedCashFlowForPeriodTransactions.html
@@ -12,8 +12,10 @@
 <body>
 <h1 th:text="#{financer.heading.report-config-projected-cashflow-for-period-transactions}" class="noprint"/>
 <h1 th:text="#{financer.heading.report-config-projected-cashflow-for-period-transactions-print}" class="print"/>
-<span th:text="${#temporals.format(form.fromDate) + ' - ' + #temporals.format(form.toDate)}" class="print print-padding" />
-<span class="errorMessage noprint" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}" />
+<span th:text="${#temporals.format(form.fromDate) + ' - ' + #temporals.format(form.toDate)}"
+      class="print print-padding"/>
+<span class="errorMessage noprint" th:if="${errorMessage != null}"
+      th:text="#{'financer.error-message.' + ${errorMessage}}"/>
 <a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}" class="noprint"/>
 <form id="report-config-projected-cashflow-for-period-transactions-form" action="#" th:object="${form}" method="post">
     <table id="report-config-projected-cashflow-for-period-transactions-table">
@@ -24,14 +26,17 @@
         </tr>
         <tr th:each="entry, i : ${form.incomeTransactions}">
             <td class="projected-cashflow-transaction">
-                <span th:text="*{incomeTransactions[__${i.index}__].description}" />
-                <input type="hidden" th:field="*{incomeTransactions[__${i.index}__].description}" class="display-none" />
+                <span th:text="*{incomeTransactions[__${i.index}__].recurringTransaction.description + ' (' + #temporals.format(incomeTransactions[__${i.index}__].date) + ')'}"/>
+                <input type="hidden" th:field="*{incomeTransactions[__${i.index}__].recurringTransaction.description}"
+                       class="display-none"/>
+                <input type="hidden" th:field="*{incomeTransactions[__${i.index}__].date}"
+                       class="display-none"/>
             </td>
             <td class="report-config-projected-cashflow-for-period-transactions-table-amount noprint">
-                <input type="text" th:field="*{incomeTransactions[__${i.index}__].amount}" />
+                <input type="text" th:field="*{incomeTransactions[__${i.index}__].recurringTransaction.amount}"/>
             </td>
             <td class="report-config-projected-cashflow-for-period-transactions-table-amount print">
-                <span th:utext="${#numbers.formatDecimal(form.incomeTransactions[__${i.index}__].amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
+                <span th:utext="${#numbers.formatDecimal(form.incomeTransactions[__${i.index}__].recurringTransaction.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
             </td>
         </tr>
         <tr class="projected-cashflow-sum">
@@ -41,14 +46,17 @@
         </tr>
         <tr th:each="entry, i : ${form.expenseTransactions}">
             <td class="projected-cashflow-transaction">
-                <span th:text="*{expenseTransactions[__${i.index}__].description}" />
-                <input type="hidden" th:field="*{expenseTransactions[__${i.index}__].description}" class="display-none" />
+                <span th:text="*{expenseTransactions[__${i.index}__].description + ' (' + #temporals.format(expenseTransactions[__${i.index}__].date) + ')'}"/>
+                <input type="hidden" th:field="*{expenseTransactions[__${i.index}__].recurringTransaction.description}"
+                       class="display-none"/>
+                <input type="hidden" th:field="*{expenseTransactions[__${i.index}__].date}"
+                       class="display-none"/>
             </td>
             <td class="report-config-projected-cashflow-for-period-transactions-table-amount noprint">
-                <input type="text" th:field="*{expenseTransactions[__${i.index}__].amount}" />
+                <input type="text" th:field="*{expenseTransactions[__${i.index}__].recurringTransaction.amount}"/>
             </td>
             <td class="report-config-projected-cashflow-for-period-transactions-table-amount print">
-                <span th:utext="${#numbers.formatDecimal(form.expenseTransactions[__${i.index}__].amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
+                <span th:utext="${#numbers.formatDecimal(form.expenseTransactions[__${i.index}__].recurringTransaction.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
             </td>
         </tr>
         <tr class="projected-cashflow-sum">
@@ -56,13 +64,14 @@
             <td th:utext="${#numbers.formatDecimal((form.accountSum/100D)*-1, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"
                 class="report-config-projected-cashflow-for-period-transactions-table-amount"/>
             <td th:text="#{financer.account-overview.table-header.average-spending-period}"
-            class="report-config-projected-cashflow-for-period-transactions-table-average-spending noprint"/>
+                class="report-config-projected-cashflow-for-period-transactions-table-average-spending noprint"/>
         </tr>
         <th:block th:each="entry, i : ${form.accountGroupAccountContainers}">
             <tr>
                 <td class="projected-cashflow-transaction">
-                    <span th:text="*{accountGroupAccountContainers[__${i.index}__].accountGroup}" />
-                    <input type="hidden" th:field="*{accountGroupAccountContainers[__${i.index}__].accountGroup}" class="display-none" />
+                    <span th:text="*{accountGroupAccountContainers[__${i.index}__].accountGroup}"/>
+                    <input type="hidden" th:field="*{accountGroupAccountContainers[__${i.index}__].accountGroup}"
+                           class="display-none"/>
                 </td>
                 <td>
                     <span></span>
@@ -73,18 +82,23 @@
             </tr>
             <tr th:each="listEntry, j : ${entry.accounts}">
                 <td class="projected-cashflow-account">
-                    <span th:text="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].account.key}" />
-                    <input type="hidden" th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].account.key}" class="display-none" />
+                    <span th:text="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].account.key}"/>
+                    <input type="hidden"
+                           th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].account.key}"
+                           class="display-none"/>
                 </td>
                 <td class="report-config-projected-cashflow-for-period-transactions-table-amount noprint">
-                    <input type="text" th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].spending}" />
+                    <input type="text"
+                           th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].spending}"/>
                 </td>
                 <td class="report-config-projected-cashflow-for-period-transactions-table-amount print">
                     <span th:utext="${#numbers.formatDecimal(form.accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].spending/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
                 </td>
                 <td class="noprint report-config-projected-cashflow-for-period-transactions-table-average-spending">
                     <span th:utext="${#numbers.formatDecimal(form.accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].averageSpending/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
-                    <input type="hidden" th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].averageSpending}" class="display-none" />
+                    <input type="hidden"
+                           th:field="*{accountGroupAccountContainers[__${i.index}__].accounts[__${j.index}__].averageSpending}"
+                           class="display-none"/>
                 </td>
             </tr>
         </th:block>
@@ -98,10 +112,12 @@
     <input type="hidden" th:field="*{fromDate}" class="display-none"/>
     <input type="hidden" th:field="*{toDate}" class="display-none"/>
     <input type="submit" th:formaction="@{/configureProjectedCashFlowForPeriodTransactionsRefresh}"
-           th:value="#{financer.report-config-projected-cashflow-for-period-transactions.label.button.refresh}" class="noprint"/>
+           th:value="#{financer.report-config-projected-cashflow-for-period-transactions.label.button.refresh}"
+           class="noprint"/>
     <input type="submit" onClick="window.print()"
-           th:value="#{financer.report-config-projected-cashflow-for-period-transactions.label.button.create}" class="noprint"/>
+           th:value="#{financer.report-config-projected-cashflow-for-period-transactions.label.button.create}"
+           class="noprint"/>
 </form>
-<div th:replace="includes/footer :: footer" />
+<div th:replace="includes/footer :: footer"/>
 </body>
 </html>
\ No newline at end of file