Merge pull request cer#33 from shopcookeat/revert-32-wip-customer

Revert "wip-customer small issues fixes"
tiarebalbi · Sep 1, 2016 · fd75779 · fd75779
2 parents 1005c47 + c8291be
commit fd75779
Show file tree

Hide file tree

Showing 26 changed files with 212 additions and 399 deletions.
diff --git a/...hardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountChangeInfo.java b/...hardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountChangeInfo.java
@@ -0,0 +1,31 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+public class AccountChangeInfo {
+
+  private String changeId;
+  private String transactionId;
+  private String transactionType;
+  private long amount;
+  private long balanceDelta;
+
+  public AccountChangeInfo(String changeId, String transactionId, String transactionType, long amount, long balanceDelta) {
+    this.changeId = changeId;
+    this.transactionId = transactionId;
+    this.transactionType = transactionType;
+    this.amount = amount;
+    this.balanceDelta = balanceDelta;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}
diff --git a/...risrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfo.java b/...risrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfo.java
@@ -1,9 +1,11 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by cer on 11/21/14.
@@ -18,16 +20,11 @@ public class AccountInfo {
   private List<AccountChangeInfo> changes;
   private List<AccountTransactionInfo> transactions;
   private String version;
-  private Date date;
 
   private AccountInfo() {
   }
 
   public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, List<AccountTransactionInfo> transactions, String version) {
-    this(id, customerId, title, description, balance, changes, transactions, version, new Date());
-  }
-
-  public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, List<AccountTransactionInfo> transactions, String version, Date date) {
 
     this.id = id;
     this.customerId = customerId;
@@ -37,7 +34,6 @@ public AccountInfo(String id, String customerId, String title, String descriptio
     this.changes = changes;
     this.transactions = transactions;
     this.version = version;
-    this.date = date;
   }
 
   public String getId() {
@@ -71,8 +67,4 @@ public List<AccountTransactionInfo> getTransactions() {
   public String getVersion() {
     return version;
   }
-
-  public Date getDate() {
-    return date;
-  }
 }
diff --git a/.../eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java b/.../eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java
@@ -1,12 +1,9 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
 import com.mongodb.WriteResult;
-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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
@@ -41,9 +38,6 @@ public void create(String accountId, String customerId, String title, BigDecimal
               Collections.<AccountTransactionInfo>emptyList(),
               version));
       logger.info("Saved in mongo");
-
-    } catch (DuplicateKeyException t) {
-      logger.warn("When saving ", t);
     } catch (Throwable t) {
       logger.error("Error during saving: ");
       logger.error("Error during saving: ", t);
@@ -70,13 +64,5 @@ public void updateBalance(String accountId, String changeId, long balanceDelta,
             AccountInfo.class);
   }
 
-  public void updateTransactionStatus(String accountId, String transactionId, TransferState status) {
-    AccountInfo account = accountInfoRepository.findOne(accountId);
-    if (account != null) {
-      account.getTransactions().stream().filter(ati -> ati.getTransactionId().equals(transactionId)).forEach(ati ->  ati.setStatus(status));
-      accountInfoRepository.save(account);
-    }
-
-  }
 
 }
diff --git a/...rdson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java b/...rdson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryService.java
@@ -1,6 +1,9 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
+import io.eventuate.CompletableFutureUtil;
+
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 public class AccountQueryService {
 
@@ -10,15 +13,15 @@ public AccountQueryService(AccountInfoRepository accountInfoRepository) {
     this.accountInfoRepository = accountInfoRepository;
   }
 
-  public AccountInfo findByAccountId(String accountId) {
+  public CompletableFuture<AccountInfo> findByAccountId(String accountId) {
     AccountInfo account = accountInfoRepository.findOne(accountId);
     if (account == null)
-      throw new AccountNotFoundException(accountId);
+      return CompletableFutureUtil.failedFuture(new AccountNotFoundException(accountId));
     else
-      return account;
+      return CompletableFuture.completedFuture(account);
   }
 
-  public List<AccountInfo> findByCustomerId(String customerId) {
-      return accountInfoRepository.findByCustomerId(customerId);
+  public CompletableFuture<List<AccountInfo>> findByCustomerId(String customerId) {
+      return CompletableFuture.completedFuture(accountInfoRepository.findByCustomerId(customerId));
   }
 }
diff --git a/...dson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java b/...dson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java
@@ -3,14 +3,12 @@
 import io.eventuate.DispatchedEvent;
 import io.eventuate.EventHandlerMethod;
 import io.eventuate.EventSubscriber;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.CreditRecordedEvent;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.FailedDebitRecordedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountChangedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.MoneyTransferCreatedEvent;
-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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,30 +63,14 @@ public void recordTransfer(DispatchedEvent<MoneyTransferCreatedEvent> de) {
 
   @EventHandlerMethod
   public void recordDebit(DispatchedEvent<AccountDebitedEvent> de) {
-    String accountId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
-
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.DEBITED);
     saveChange(de, -1);
   }
 
   @EventHandlerMethod
   public void recordCredit(DispatchedEvent<AccountCreditedEvent> de) {
-    String accountId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
-
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.COMPLETED);
     saveChange(de, +1);
   }
 
-  @EventHandlerMethod
-  public void recordFailed(DispatchedEvent<AccountDebitFailedDueToInsufficientFundsEvent> de) {
-    String accountId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
-
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS);
-  }
-
   public <T extends AccountChangedEvent> void saveChange(DispatchedEvent<T> de, int delta) {
     String changeId = de.getEventId().asString();
     String transactionId = de.getEvent().getTransactionId();

diff --git a/...ntstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java b/...ntstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java
@@ -4,7 +4,6 @@
 import io.eventuate.javaclient.spring.jdbc.IdGenerator;
 import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -55,7 +54,7 @@ public void shouldSaveAccountInfo() throws ExecutionException, InterruptedExcept
 
     accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
 
-    AccountInfo accountInfo = accountQueryService.findByAccountId(accountId);
+    AccountInfo accountInfo = accountQueryService.findByAccountId(accountId).get();
 
     assertEquals(accountId, accountInfo.getId());
     assertEquals(customerId, accountInfo.getCustomerId());
@@ -77,7 +76,7 @@ public void shouldSaveAccountInfo() throws ExecutionException, InterruptedExcept
     accountInfoUpdateService.updateBalance(accountId, changeId, 500,
             change);
 
-    accountInfo = accountQueryService.findByAccountId(accountId);
+    accountInfo = accountQueryService.findByAccountId(accountId).get();
     assertEquals(initialBalance.add(new BigDecimal(5)).longValue() * 100, accountInfo.getBalance());
     assertFalse(accountInfo.getChanges().isEmpty());
 
@@ -89,26 +88,10 @@ public void shouldSaveAccountInfo() throws ExecutionException, InterruptedExcept
 
     accountInfoUpdateService.addTransaction(eventId, accountId, ti);
 
-    accountInfo = accountQueryService.findByAccountId(accountId);
+    accountInfo = accountQueryService.findByAccountId(accountId).get();
     assertFalse(accountInfo.getTransactions().isEmpty());
 
     assertEquals(ti, accountInfo.getTransactions().get(0));
   }
 
-  @Test
-  public void shouldHandleDuplicateSaveAccountInfo() throws ExecutionException, InterruptedException {
-    IdGenerator x = new IdGeneratorImpl();
-    String accountId = x.genId().asString();
-    String customerId = x.genId().asString();
-    String version = x.genId().asString();
-
-    String title = "Checking account";
-    BigDecimal initialBalance = new BigDecimal("1345");
-    String description = "Some account";
-
-    accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
-    accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
-
-
-  }
 }
diff --git a/...ardson/eventstore/javaexamples/banking/web/queryside/accounts/AccountQueryController.java b/...ardson/eventstore/javaexamples/banking/web/queryside/accounts/AccountQueryController.java
@@ -1,19 +1,18 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountInfo;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountNotFoundException;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountQueryService;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.*;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.GetAccountResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @RestController
@@ -27,35 +26,21 @@ public AccountQueryController(AccountQueryService accountInfoQueryService) {
   }
 
   @RequestMapping(value = "/accounts/{accountId}", method = RequestMethod.GET)
-  public ResponseEntity<GetAccountResponse> get(@PathVariable String accountId) {
-    AccountInfo accountInfo = accountInfoQueryService.findByAccountId(accountId);
-    return ResponseEntity.ok().body(new GetAccountResponse(accountInfo.getId(), new BigDecimal(accountInfo.getBalance()), accountInfo.getTitle(), accountInfo.getDescription()));
+  public CompletableFuture<GetAccountResponse> get(@PathVariable String accountId) {
+    return accountInfoQueryService.findByAccountId(accountId)
+            .thenApply(accountInfo -> new GetAccountResponse(accountInfo.getId(), new BigDecimal(accountInfo.getBalance()), accountInfo.getTitle(), accountInfo.getDescription()));
   }
 
-  @RequestMapping(value = "/customers/{customerId}/accounts", method = RequestMethod.GET)
-  public ResponseEntity<GetAccountsResponse> getAccountsForCustomer(@PathVariable("customerId") String customerId) {
-    return ResponseEntity.ok().body(
-            new GetAccountsResponse(
-                    accountInfoQueryService.findByCustomerId(customerId)
-                            .stream()
-                            .map(accountInfo -> new GetAccountResponse(
-                                    accountInfo.getId(),
-                                    new BigDecimal(accountInfo.getBalance()),
-                                    accountInfo.getTitle(),
-                                    accountInfo.getDescription()))
-                            .collect(Collectors.toList())
-            )
-    );
+  @RequestMapping(value = "/accounts", method = RequestMethod.GET)
+  public CompletableFuture<List<GetAccountResponse>> getAccountsForCustomer(@RequestParam("customerId") String customerId) {
+    return accountInfoQueryService.findByCustomerId(customerId)
+            .thenApply(accountInfoList -> accountInfoList.stream().map(accountInfo -> new GetAccountResponse(accountInfo.getId(), new BigDecimal(accountInfo.getBalance()), accountInfo.getTitle(), accountInfo.getDescription())).collect(Collectors.toList()));
   }
 
   @RequestMapping(value = "/accounts/{accountId}/history", method = RequestMethod.GET)
-  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));
-    accountInfo.getTransactions().forEach(historyEntries::add);
-
-    return ResponseEntity.ok().body(new AccountHistoryResponse(historyEntries));
+  public CompletableFuture<List<AccountTransactionInfo>> getTransactionsHistory(@PathVariable String accountId) {
+    return accountInfoQueryService.findByAccountId(accountId)
+            .thenApply(AccountInfo::getTransactions);
   }
 
   @ResponseStatus(value= HttpStatus.NOT_FOUND, reason="account not found")

diff --git a/...isrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java b/...isrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java
@@ -4,7 +4,6 @@
 import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.utils.ContentRequestTransformer;
 import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.utils.HeadersRequestTransformer;
 import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.utils.URLRequestTransformer;
-import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -13,10 +12,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
@@ -29,7 +26,6 @@
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -56,19 +52,13 @@ public void init() {
             .build();
   }
 
-  @RequestMapping(value = {"/accounts**","/customers**","/transfers**","/login","/user"}, method = {GET, POST})
+  @RequestMapping(value = "/**", method = {GET, POST})
   public ResponseEntity<String> proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException {
     HttpUriRequest proxiedRequest = createHttpUriRequest(request);
     logger.info("request: {}", proxiedRequest);
     HttpResponse proxiedResponse = httpClient.execute(proxiedRequest);
     logger.info("Response {}", proxiedResponse.getStatusLine().getStatusCode());
-    return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), processHeaders(proxiedResponse.getAllHeaders()), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode()));
-  }
-
-  private HttpHeaders processHeaders(Header[] headers) {
-    HttpHeaders result = new HttpHeaders();
-    Stream.of(headers).forEach( h ->  result.set(h.getName(), h.getValue()));
-    return result;
+    return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode()));
   }
 
   private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoSuchRequestHandlingMethodException, IOException {

diff --git a/...chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java b/...chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java
@@ -6,7 +6,7 @@
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransfer;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferService;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.TransferState;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails;
 import org.junit.Assert;
 import org.junit.Test;