Validated POST requests for creating accounts and transfers

java-spring/accounts-command-side-web/build.gradle

@@ -4,6 +4,9 @@ dependencies {
     compile project(":common-web")
 
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
+
+    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
+    testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc_2.10:$eventStoreClientVersion"
 }
 
 

java-spring/accounts-command-side-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountController.java

@@ -1,18 +1,13 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
 
-import net.chrisrichardson.eventstore.EntityWithIdAndVersion;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.util.DeferredUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.async.DeferredResult;
-
 import rx.Observable;
-import rx.functions.Func1;
 
 @RestController
 @RequestMapping("/accounts")
@@ -26,14 +21,8 @@ public class AccountController {
   }
 
   @RequestMapping(method = RequestMethod.POST)
-  public Observable<CreateAccountResponse> createAccount(@RequestBody CreateAccountRequest request) {
-    return accountService.openAccount(request.getInitialBalance()).map(new Func1<EntityWithIdAndVersion<Account>, CreateAccountResponse>() {
-
-      @Override
-      public CreateAccountResponse call(EntityWithIdAndVersion<Account> entityAndEventInfo) {
-        return new CreateAccountResponse(entityAndEventInfo.getEntityIdentifier().getId());
-      }
-
-    });
+  public Observable<CreateAccountResponse> createAccount(@Validated @RequestBody CreateAccountRequest request) {
+    return accountService.openAccount(request.getInitialBalance())
+            .map(entityAndEventInfo -> new CreateAccountResponse(entityAndEventInfo.getEntityIdentifier().getId()));
   }
 }

java-spring/accounts-command-side-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/CreateAccountRequest.java

@@ -1,9 +1,14 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.DecimalMin;
+
 import java.math.BigDecimal;
 
 public class CreateAccountRequest {
 
+  @NotNull
+  @DecimalMin("0")
   private BigDecimal initialBalance;
 
   public CreateAccountRequest() {

java-spring/accounts-command-side-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountControllerIntegrationTest.java

@@ -0,0 +1,53 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.IntegrationTest;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = AccountControllerIntegrationTestConfiguration.class)
+@IntegrationTest
+@WebAppConfiguration
+public class AccountControllerIntegrationTest {
+
+  @Autowired
+  private WebApplicationContext wac;
+
+  private MockMvc mockMvc;
+
+  @Before
+  public void setup() {
+    this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+  }
+
+  @Test
+  public void shouldCreateAccount() throws Exception {
+    mockMvc.perform(post("/accounts")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content("{\"initialBalance\" : 500}")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk());
+  }
+
+  @Test
+  public void shouldRejectBadRequest() throws Exception {
+    mockMvc.perform(post("/accounts")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content("{\"initialBalanceXXX\" : 500}")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().is(HttpStatus.BAD_REQUEST.value()));
+  }
+}

java-spring/accounts-command-side-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountControllerIntegrationTestConfiguration.java

@@ -0,0 +1,11 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+
+import net.chrisrichardson.eventstore.jdbc.config.JdbcEventStoreConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({CommandSideWebAccountsConfiguration.class, JdbcEventStoreConfiguration.class})
+public class AccountControllerIntegrationTestConfiguration {
+
+}

java-spring/accounts-command-side-web/src/test/resources/logback.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <!-- [%thread] -->
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{HH:mm:ss.SSS}  %-5level %logger{36} - %msg%n</Pattern>
+        </layout>
+    </appender>
+
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.springframework.web" level='debug'>
+    </logger>
+
+</configuration>