Skip to content

Commit c28b3f2

Browse files
authored
Fix issues for budget release (#5)
* Fix display name of the budget expense item * Correct budget expense computation in an update of an expense.
1 parent cc4ac75 commit c28b3f2

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

domain/src/main/java/com/jongsoft/finance/domain/core/EntityRef.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ public record NamedEntity(long id, String name) implements AggregateBase {
2121
public Long getId() {
2222
return id;
2323
}
24+
25+
@Override
26+
public String toString() {
27+
return name;
28+
}
2429
}
2530

2631
}

domain/src/main/java/com/jongsoft/finance/domain/user/Budget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public Expense(long id, String name, double amount) {
5858

5959
@BusinessMethod
6060
public void updateExpense(double expectedExpense) {
61-
if (computeExpenses() + expectedExpense > expectedIncome) {
61+
if ((computeExpenses() - computeBudget() + expectedExpense) > expectedIncome) {
6262
throw StatusException.badRequest(
6363
"Expected expenses exceeds the expected income.",
6464
"validation.budget.expense.exceeds.income");

fintrack-api/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ dependencies {
3535
// Contains the health checker
3636
implementation(mn.micronaut.management)
3737

38-
// needed for application.yml
39-
runtimeOnly(mn.snakeyaml)
40-
4138
// Investigate if this can be swapped for micronaut serde
4239
implementation(mn.micronaut.jackson.databind)
4340
implementation(mn.micronaut.serde.jackson)
@@ -48,6 +45,9 @@ dependencies {
4845
implementation(project(":rule-engine"))
4946
implementation(project(":bpmn-process"))
5047

48+
// needed for application.yml
49+
runtimeOnly(mn.snakeyaml)
50+
5151
testImplementation(mn.micronaut.test.rest.assured)
5252
testImplementation(mn.micronaut.test.junit5)
5353
testImplementation(libs.bundles.junit)

0 commit comments

Comments
 (0)