andrew
/
perfin
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Added final validation and warnings to the CreateBalanceRecordController for inconsistent balance records.

This commit is contained in:
Andrew Lalis 2024-01-08 10:55:05 -05:00
parent 5f692bf8e2
commit 65595a47ac
6 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/andrewlalis/perfin/control/CreateBalanceRecordController.java
View File

@ -15,9 +15,11 @@ import com.andrewlalis.perfin.view.component.validation.validators.CurrencyAmoun
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeParseException;
@ -27,6 +29,7 @@ import static com.andrewlalis.perfin.PerfinApp.router;
public class CreateBalanceRecordController implements RouteSelectionListener {
@FXML public TextField timestampField;
@FXML public TextField balanceField;
@FXML public Label balanceWarningLabel;
private FileSelectionArea attachmentSelectionArea;
@FXML public PropertiesPane propertiesPane;
@ -44,9 +47,25 @@ public class CreateBalanceRecordController implements RouteSelectionListener {
}
}).validatedInitially().attachToTextField(timestampField);
var balanceValid = new ValidationApplier<>(
new CurrencyAmountValidator(() -> account == null ? null : account.getCurrency(), true, false)
).validatedInitially().attachToTextField(balanceField);
var balanceValidator = new CurrencyAmountValidator(() -> account == null ? null : account.getCurrency(), true, false);
var balanceValid = new ValidationApplier<>(balanceValidator)
.validatedInitially().attachToTextField(balanceField);
balanceWarningLabel.managedProperty().bind(balanceWarningLabel.visibleProperty());
balanceWarningLabel.visibleProperty().set(false);
balanceField.textProperty().addListener((observable, oldValue, newValue) -> {
if (!balanceValidator.validate(newValue).isValid()) {
balanceWarningLabel.visibleProperty().set(false);
return;
}
BigDecimal reportedBalance = new BigDecimal(newValue);
Thread.ofVirtual().start(() -> Profile.getCurrent().getDataSource().useAccountRepository(repo -> {
BigDecimal derivedBalance = repo.deriveCurrentBalance(account.id);
Platform.runLater(() -> balanceWarningLabel.visibleProperty().set(
!reportedBalance.setScale(derivedBalance.scale(), RoundingMode.HALF_UP).equals(derivedBalance)
));
}));
});
var formValid = timestampValid.and(balanceValid);
saveButton.disableProperty().bind(formValid.not());
@ -64,30 +83,25 @@ public class CreateBalanceRecordController implements RouteSelectionListener {
public void onRouteSelected(Object context) {
this.account = (Account) context;
timestampField.setText(LocalDateTime.now().format(DateUtil.DEFAULT_DATETIME_FORMAT));
Thread.ofVirtual().start(() -> {
Profile.getCurrent().getDataSource().useAccountRepository(repo -> {
BigDecimal value = repo.deriveCurrentBalance(account.id);
Platform.runLater(() -> balanceField.setText(
CurrencyUtil.formatMoneyAsBasicNumber(new MoneyValue(value, account.getCurrency()))
));
});
});
Thread.ofVirtual().start(() -> Profile.getCurrent().getDataSource().useAccountRepository(repo -> {
BigDecimal value = repo.deriveCurrentBalance(account.id);
Platform.runLater(() -> balanceField.setText(
CurrencyUtil.formatMoneyAsBasicNumber(new MoneyValue(value, account.getCurrency()))
));
}));
attachmentSelectionArea.clear();
}
@FXML public void save() {
LocalDateTime localTimestamp = LocalDateTime.parse(timestampField.getText(), DateUtil.DEFAULT_DATETIME_FORMAT);
BigDecimal reportedBalance = new BigDecimal(balanceField.getText());
boolean confirm = Popups.confirm("Are you sure that you want to record the balance of account\n%s\nas %s,\nas of %s?".formatted(
account.getShortName(),
CurrencyUtil.formatMoneyWithCurrencyPrefix(new MoneyValue(reportedBalance, account.getCurrency())),
localTimestamp.atZone(ZoneId.systemDefault()).format(DateUtil.DEFAULT_DATETIME_FORMAT_WITH_ZONE)
));
if (confirm) {
Profile.getCurrent().getDataSource().useAccountRepository(accountRepo -> {
BigDecimal currentDerivedBalance = accountRepo.deriveCurrentBalance(account.id);
});
if (confirm && confirmIfInconsistentBalance(reportedBalance)) {
Profile.getCurrent().getDataSource().useBalanceRecordRepository(repo -> {
repo.insert(
DateUtil.localToUTC(localTimestamp),
@ -104,4 +118,21 @@ public class CreateBalanceRecordController implements RouteSelectionListener {
@FXML public void cancel() {
router.navigateBackAndClear();
}
private boolean confirmIfInconsistentBalance(BigDecimal reportedBalance) {
BigDecimal currentDerivedBalance;
try (var accountRepo = Profile.getCurrent().getDataSource().getAccountRepository()) {
currentDerivedBalance = accountRepo.deriveCurrentBalance(account.id);
} catch (Exception e) {
throw new RuntimeException(e);
}
if (!reportedBalance.setScale(currentDerivedBalance.scale(), RoundingMode.HALF_UP).equals(currentDerivedBalance)) {
String msg = "The balance you reported (%s) doesn't match the balance that Perfin derived from your account's transactions (%s). It's encouraged to go back and add any missing transactions first, but you may proceed now if you understand the consequences of an inconsistent account balance history.\n\nAre you absolutely sure you want to create this balance record?".formatted(
CurrencyUtil.formatMoney(new MoneyValue(reportedBalance, account.getCurrency())),
CurrencyUtil.formatMoney(new MoneyValue(currentDerivedBalance, account.getCurrency()))
);
return Popups.confirm(msg);
}
return true;
}
}

1
src/main/java/com/andrewlalis/perfin/data/AccountEntryRepository.java
View File

@ -1,6 +1,5 @@
package com.andrewlalis.perfin.data;
import com.andrewlalis.perfin.data.pagination.Sort;
import com.andrewlalis.perfin.model.AccountEntry;
import java.math.BigDecimal;

1
src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java
View File

@ -2,7 +2,6 @@ package com.andrewlalis.perfin.data.impl;
import com.andrewlalis.perfin.data.AccountEntryRepository;
import com.andrewlalis.perfin.data.AccountHistoryItemRepository;
import com.andrewlalis.perfin.data.pagination.Sort;
import com.andrewlalis.perfin.data.util.DbUtil;
import com.andrewlalis.perfin.model.AccountEntry;

2
src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java
View File

@ -36,7 +36,7 @@ public class JdbcDataSource implements DataSource {
@Override
public AccountRepository getAccountRepository() {
return new JdbcAccountRepository(getConnection());
return new JdbcAccountRepository(getConnection(), contentDir);
}
@Override

11
src/main/resources/create-balance-record.fxml
View File

@ -39,7 +39,16 @@
<TextField fx:id="timestampField" styleClass="mono-font"/>
<Label text="Balance" labelFor="${balanceField}" styleClass="bold-text"/>
<TextField fx:id="balanceField" styleClass="mono-font"/>
<VBox>
<TextField fx:id="balanceField" styleClass="mono-font"/>
<Label
fx:id="balanceWarningLabel"
styleClass="warning-color-text-fill,small-font"
wrapText="true"
text="Balance isn't what Perfin expects, according to your transactions."
/>
</VBox>
<Label text="Attachments" styleClass="bold-text"/>
</PropertiesPane>

5
src/main/resources/style/base.css
View File

@ -12,6 +12,7 @@ rather than with your own CSS.
-fx-theme-background-3: rgb(220, 220, 220);
-fx-theme-negative: rgb(247, 37, 69);
-fx-theme-positive: rgb(43, 196, 77);
-fx-theme-warning: rgb(250, 177, 2);
}
.root {
@ -127,6 +128,10 @@ rather than with your own CSS.
-fx-fill: -fx-theme-positive;
}
.warning-color-text-fill {
-fx-text-fill: -fx-theme-warning;
}
/* DEBUG BORDERS */
.debug-border-1 {
-fx-border-color: red;