Skip to content

Commit d60efed

Browse files
author
mpetrov
committed
#8 remove rename, initial balance
1 parent e8e8579 commit d60efed

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

jcash-core/src/main/java/org/sct/jcash/domain/Account.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ public class Account {
88

99
// todo: make a separate class/enum for ccy
1010
private final String ccy;
11+
private final String name;
1112

1213
private final List<Account> children;
1314
private final NavigableMap<LocalDate, Double> balance;
1415
private boolean closed;
15-
private String name;
1616

1717
public Account(String name, String ccy) {
1818
this.name = name;
@@ -30,6 +30,12 @@ public static Account of(String name) {
3030
return of(name, RUB_CCY);
3131
}
3232

33+
public static Account of(String name, String ccy, double initAmount) {
34+
Account account = of(name, ccy);
35+
account.setBalance(LocalDate.now(), initAmount);
36+
return account;
37+
}
38+
3339
public String getCcy() {
3440
return ccy;
3541
}
@@ -50,6 +56,10 @@ public double getBalance(LocalDate date) {
5056
return 0;
5157
}
5258

59+
public double getBalance() {
60+
return getBalance(LocalDate.now());
61+
}
62+
5363
public List<Account> getChildren() {
5464
return Collections.unmodifiableList(children);
5565
}
@@ -87,11 +97,9 @@ public void setBalance(LocalDate date, double amount) {
8797
this.balance.put(date, amount);
8898
}
8999

90-
public void rename(String name) {
91-
this.name = name;
92-
}
93-
94100
public void close() {
95101
this.closed = true;
96102
}
103+
104+
97105
}

jcash-core/src/test/java/org/sct/jcash/domain/AccountTest.java

+12-9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public void construction() {
2424
account = Account.of("a name");
2525
Assertions.assertEquals("a name", account.getName());
2626
Assertions.assertEquals(RUB_CCY, account.getCcy());
27+
28+
account = Account.of("account_with_balance", RUB_CCY, 103.5);
29+
Assertions.assertEquals(103.5, account.getBalance());
2730
}
2831

2932
@Test
@@ -41,8 +44,8 @@ public void parentChildRelation() {
4144
@Test
4245
public void equality() {
4346
Account accLeft = Account.of("");
44-
Account accRight = Account.of("");
4547

48+
Account accRight = Account.of("");
4649
Assertions.assertEquals(accLeft, accRight);
4750

4851
accRight = Account.of("1");
@@ -67,14 +70,14 @@ public void balance() {
6770
Assertions.assertEquals(amount, acc.getBalance(date.plus(5, ChronoUnit.DAYS)));
6871
}
6972

70-
@Test
71-
public void rename() {
72-
Account account = Account.of("");
73-
74-
account.rename("acc1");
75-
76-
Assertions.assertEquals("acc1", account.getName());
77-
}
73+
// @Test
74+
// public void rename() {
75+
// Account account = Account.of("");
76+
//
77+
// account.rename("acc1");
78+
//
79+
// Assertions.assertEquals("acc1", account.getName());
80+
// }
7881

7982
@Test
8083
public void close() {

0 commit comments

Comments
 (0)