MK13/financer
1
0
Fork 0
Code Issues 10 Actions Activity

START bookings optimizations

Browse Source
This commit is contained in:
MK13
2020-11-14 00:29:17 +01:00
parent 549535ee4c
commit 3b93a70a29
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
financer-server/src/main/java/de/financer/service/AccountStatisticService.java
View File

@@ -36,8 +36,13 @@ public class AccountStatisticService {
public void calculateStatistics(Transaction transaction) { public void calculateStatistics(Transaction transaction) {
final Account fromAccount = transaction.getFromAccount(); final Account fromAccount = transaction.getFromAccount();
final Account toAccount = transaction.getToAccount(); final Account toAccount = transaction.getToAccount();
final long amount = transaction.getAmount();
final List<AccountStatistic> resultList = new ArrayList<>(); final List<AccountStatistic> resultList = new ArrayList<>();
long amount = transaction.getAmount();
// Special case: START bookings should not increase 'spendings current period'
if (AccountType.START.equals(fromAccount.getType())) {
amount = 0;
}
for (final Period period : transaction.getPeriods()) { for (final Period period : transaction.getPeriods()) {
resultList.add(calculateInternal(fromAccount, period, amount, true, 1)); resultList.add(calculateInternal(fromAccount, period, amount, true, 1));

6
financer-server/src/main/java/de/financer/service/TransactionService.java
View File

@@ -98,6 +98,12 @@ public class TransactionService {
.getMultiplierToAccount(toAccount) * amount)); .getMultiplierToAccount(toAccount) * amount));
} }
// Special case: START bookings should not be counted towards 'expenses current period'
// as booking e.g. a mortgage of 250,000 looks kinda ugly then
if (AccountType.START.equals(fromAccount.getType())) {
transaction.setExpenseNeutral(true);
}
this.transactionRepository.save(transaction); this.transactionRepository.save(transaction);
this.accountStatisticService.calculateStatistics(transaction); this.accountStatisticService.calculateStatistics(transaction);

4
financer-web-client/src/main/resources/static/changelog.txt
View File

@@ -1,3 +1,7 @@
v36 -> v37:
- START bookings are now expense neutral, so they do not increase the 'Expenses current period' counter
- START bookings now do not increase 'Spendings current period' as this distorts this counter
v35 -> v36: v35 -> v36:
- Add demo deployment profile - Add demo deployment profile