Add support to withdrawals in web UI

New form alongside deposits to allow withdrawals so that submitting the
form to the correct endpoint is easier. Also, generalise how they are
handled as they both received the same inputs and give back the same
output type.

Remove support for filtering tests that are not yet implemented.

Author: lmirabal

domain/src/test/kotlin/lmirabal/bank/BankServiceTest.kt

@@ -6,10 +6,8 @@ import lmirabal.bank.data.InMemoryBankAccountRepository
 import lmirabal.bank.model.Amount
 import lmirabal.bank.model.BankAccount
 import lmirabal.bank.model.BankAccountId
-import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
-@Tag("ImplementationReady")
 class BankServiceTest : BankTest() {
     private val idFactory = RecordingIdFactory()
     override val bank = BankService(InMemoryBankAccountRepository(), idFactory)

domain/src/testFixtures/kotlin/lmirabal/bank/BankTest.kt

@@ -4,8 +4,6 @@ import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
 import lmirabal.bank.model.Amount
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.condition.EnabledIf
-import org.junit.jupiter.api.extension.ExtensionContext
 
 abstract class BankTest {
     abstract val bank: Bank
@@ -30,7 +28,6 @@ abstract class BankTest {
         assertThat(updatedAccount.balance, equalTo(Amount(300)))
     }
 
-    @EnabledIf("implementationReady")
     @Test
     fun `withdraws from account`() {
         val bankAccount = bank.createAccount()
@@ -40,6 +37,4 @@ abstract class BankTest {
 
         assertThat(updatedAccount.balance, equalTo(Amount(100)))
     }
-
-    fun implementationReady(context: ExtensionContext) = "ImplementationReady" in context.tags
 }

http/src/test/kotlin/lmirabal/bank/http/BankHttpIntegrationTest.kt

@@ -9,9 +9,7 @@ import org.http4k.server.SunHttp
 import org.http4k.server.asServer
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Tag
 
-@Tag("ImplementationReady")
 class BankHttpIntegrationTest : BankTest() {
     private val server = bankHttp().asServer(SunHttp())
     override val bank = BankHttpClient(

http/src/test/kotlin/lmirabal/bank/http/BankHttpTest.kt

@@ -1,9 +1,7 @@
 package lmirabal.bank.http
 
 import lmirabal.bank.BankTest
-import org.junit.jupiter.api.Tag
 
-@Tag("ImplementationReady")
 class BankHttpTest : BankTest() {
     override val bank = BankHttpClient(bankHttp())
 }

web/src/main/kotlin/lmirabal/bank/web/BankWeb.kt

@@ -9,6 +9,7 @@ import org.http4k.core.ContentType.Companion.TEXT_HTML
 import org.http4k.core.HttpHandler
 import org.http4k.core.Method.GET
 import org.http4k.core.Method.POST
+import org.http4k.core.Request
 import org.http4k.core.Response
 import org.http4k.core.Status
 import org.http4k.core.Status.Companion.SEE_OTHER
@@ -32,7 +33,8 @@ fun bankWeb(bank: Bank): HttpHandler {
             POST to CreateAccount(bank),
             GET to ListAccounts(bank)
         ),
-        "/{id}/deposit" bind POST to DepositAmount(bank)
+        "/{id}/deposit" bind POST to ChangeBalance(bank) { id, amount -> deposit(id, amount) },
+        "/{id}/withdraw" bind POST to ChangeBalance(bank) { id, amount -> withdraw(id, amount) },
     )
 }
 
@@ -56,16 +58,17 @@ object ListAccounts {
 
 }
 
-object DepositAmount {
+class ChangeBalance(private val bank: Bank, private val action: Bank.(BankAccountId, Amount) -> BankAccount) :
+    HttpHandler {
     private val amountField = FormField.long().map { majorUnits -> majorUnits.toAmount() }.required("amount")
     private val formBody = Body.webForm(Validator.Feedback, amountField).toLens()
 
-    operator fun invoke(bank: Bank): HttpHandler = { request ->
+    override fun invoke(request: Request): Response {
         val id = request.path("id") ?: throw Exception("Bank account id must be present")
         val form = formBody(request)
         val amount = amountField(form)
-        bank.deposit(BankAccountId(UUID.fromString(id)), amount)
-        Response(SEE_OTHER).header("location", "/")
+        action(bank, BankAccountId(UUID.fromString(id)), amount)
+        return Response(SEE_OTHER).header("location", "/")
     }
 
     private fun Long.toAmount() = Amount(

web/src/main/resources/lmirabal/bank/web/BankAccountListView.hbs

@@ -37,10 +37,14 @@
                 <td>{{id}}</td>
                 <td>{{balance}}</td>
                 <td>
-                    <form method="POST" action="/{{id}}/deposit">
+                    <form id="deposit-form" method="POST" action="/{{id}}/deposit">
                         <input type="number" id="amount" name="amount"/>
                         <button id="deposit">Deposit</button>
                     </form>
+                    <form id="withdraw-form" method="POST" action="/{{id}}/withdraw">
+                        <input type="number" id="amount" name="amount"/>
+                        <button id="withdraw">Withdraw</button>
+                    </form>
                 </td>
             </tr>
         {{/accounts}}

web/src/test/kotlin/lmirabal/bank/web/BankWebTest.kt

@@ -54,15 +54,20 @@ class BankWebDriver(web: HttpHandler) : Bank {
     }
 
     override fun deposit(id: BankAccountId, amount: Amount): BankAccount {
-        val row = driver.getTableRows().first { row -> row.getBankAccountId() == id }
-
-        row.getElement(By.id("amount")).sendKeys(amount.format())
-        row.getElement(By.id("deposit")).submit()
-        return driver.getBankAccounts().first { account -> account.id == id }
+        return changeBalance("deposit", id, amount)
     }
 
     override fun withdraw(id: BankAccountId, amount: Amount): BankAccount {
-        TODO("Not yet implemented")
+        return changeBalance("withdraw", id, amount)
+    }
+
+    private fun changeBalance(actionId: String, id: BankAccountId, amount: Amount): BankAccount {
+        val row = driver.getTableRows().first { row -> row.getBankAccountId() == id }
+
+        val form = row.getElement(By.id("$actionId-form"))
+        form.getElement(By.id("amount")).sendKeys(amount.format())
+        form.getElement(By.id(actionId)).submit()
+        return driver.getBankAccounts().first { account -> account.id == id }
     }
 
     private fun WebElement.getBankAccountId(): BankAccountId {