- updated AccountInfoUpdateService: fixed simultaneous upsert overrides

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfo.java

@@ -2,6 +2,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
 
 import java.util.*;
 
@@ -17,6 +18,7 @@ public class AccountInfo {
   private long balance;
   private List<AccountChangeInfo> changes;
   private Map<String, AccountTransactionInfo> transactions;
+  private Map<String, TransferState> transferStates;
   private String version;
   private Date date;
 
@@ -75,4 +77,12 @@ public class AccountInfo {
   public Date getDate() {
     return date;
   }
+
+  public Map<String, TransferState> getTransferStates() {
+    return transferStates;
+  }
+
+  public void setTransferStates(Map<String, TransferState> transferStates) {
+    this.transferStates = transferStates;
+  }
 }

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java

@@ -12,7 +12,6 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Date;
 
 import static net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.MoneyUtil.toIntegerRepr;
@@ -32,12 +31,15 @@ public class AccountInfoUpdateService {
 
   public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, String version) {
     try {
+      AccountChangeInfo ci = new AccountChangeInfo();
+      ci.setAmount(toIntegerRepr(initialBalance));
       WriteResult x = mongoTemplate.upsert(new Query(where("id").is(accountId).and("version").exists(false)),
               new Update()
                       .set("customerId", customerId)
                       .set("title", title)
                       .set("description", description)
                       .set("balance", toIntegerRepr(initialBalance))
+                      .push("changes", ci)
                       .set("date", new Date())
                       .set("version", version),
               AccountInfo.class);
@@ -70,12 +72,9 @@ public class AccountInfoUpdateService {
   }
 
   public void updateTransactionStatus(String accountId, String transactionId, TransferState status) {
-
-
-    mongoTemplate.upsert(new Query(where("id").is(accountId)),
-            new Update().
-                    set("transactions." + transactionId +".status", status),
-            AccountInfo.class);
+      mongoTemplate.upsert(new Query(where("id").is(accountId)),
+              new Update().
+                      set("transferStates." + transactionId, status),
+              AccountInfo.class);
   }
-
 }

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java

@@ -15,6 +15,8 @@ public class AccountQueryService {
     if (account == null)
       throw new AccountNotFoundException(accountId);
     else
+      if(account.getTransferStates()!=null)
+        account.getTransactions().stream().forEach(ati -> ati.setStatus(account.getTransferStates().get(ati.getTransactionId())));
       return account;
   }
 

java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java

@@ -61,7 +61,7 @@ public class AccountInfoUpdateServiceTest {
     assertEquals(title, accountInfo.getTitle());
     assertEquals(description, accountInfo.getDescription());
     assertEquals(initialBalance.longValue() * 100, accountInfo.getBalance());
-    assertTrue(accountInfo.getChanges().isEmpty());
+    assertEquals(1, accountInfo.getChanges().size());
     assertTrue(accountInfo.getTransactions().isEmpty());
     assertEquals(version, accountInfo.getVersion());
 
@@ -80,7 +80,7 @@ public class AccountInfoUpdateServiceTest {
     assertEquals(initialBalance.add(new BigDecimal(5)).longValue() * 100, accountInfo.getBalance());
     assertFalse(accountInfo.getChanges().isEmpty());
 
-    assertEquals(change, accountInfo.getChanges().get(0));
+    assertEquals(change, accountInfo.getChanges().get(1));
 
     String eventId = x.genId().asString();
 

java-spring/accounts-query-side-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/queryside/accounts/AccountQueryController.java

@@ -52,7 +52,7 @@ public class AccountQueryController {
   public ResponseEntity<AccountHistoryResponse> getTransactionsHistory(@PathVariable String accountId) {
     AccountInfo accountInfo = accountInfoQueryService.findByAccountId(accountId);
     List<AccountHistoryEntry> historyEntries = new ArrayList<>();
-    historyEntries.add(new AccountOpenInfo(accountInfo.getDate(), AccountHistoryEntry.EntryType.account));
+    historyEntries.add(new AccountOpenInfo(accountInfo.getDate(), AccountHistoryEntry.EntryType.account, accountInfo.getChanges().get(0).getAmount()));
     accountInfo.getTransactions().forEach(historyEntries::add);
 
     return ResponseEntity.ok().body(new AccountHistoryResponse(historyEntries));

java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountOpenInfo.java

@@ -7,10 +7,21 @@ import java.util.Date;
  */
 public class AccountOpenInfo extends AccountHistoryEntry {
 
+  private long initialBalance;
+
   public AccountOpenInfo() {
   }
 
-  public AccountOpenInfo(Date date, EntryType entryType) {
+  public AccountOpenInfo(Date date, EntryType entryType, long initialBalance) {
     super(date, entryType);
+    this.initialBalance=initialBalance;
+  }
+
+  public long getInitialBalance() {
+    return initialBalance;
+  }
+
+  public void setInitialBalance(long initialBalance) {
+    this.initialBalance = initialBalance;
   }
 }