From 9e713f3762a710992e9f07c33263cdd12bf193f0 Mon Sep 17 00:00:00 2001
From: Alicia Bendz <aliciabendzdev@gmail.com>
Date: Sat, 3 Sep 2022 16:33:59 -0400
Subject: [PATCH 1/3] Add get and create methods

---
 bank/.idea/gradle.xml                         |  1 +
 bank/build.gradle.kts                         |  4 +-
 .../main/kotlin/com/example/BankController.kt | 82 +++++++++++++++++--
 .../main/kotlin/com/example/data/Customer.kt  | 11 +++
 .../example/model/CreateCustomerRequest.kt    | 19 +++++
 .../com/example/model/CustomerResponse.kt     | 12 +++
 .../example/repository/CustomerRepository.kt  | 10 +++
 .../repository/InMemoryCustomerRepository.kt  | 20 +++++
 .../com/example/service/CustomerService.kt    | 14 ++++
 9 files changed, 165 insertions(+), 8 deletions(-)
 create mode 100644 bank/src/main/kotlin/com/example/data/Customer.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/CreateCustomerRequest.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/CustomerResponse.kt
 create mode 100644 bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
 create mode 100644 bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
 create mode 100644 bank/src/main/kotlin/com/example/service/CustomerService.kt

diff --git a/bank/.idea/gradle.xml b/bank/.idea/gradle.xml
index 77e9972..d405dbe 100644
--- a/bank/.idea/gradle.xml
+++ b/bank/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/bank/build.gradle.kts b/bank/build.gradle.kts
index 166914e..2870765 100644
--- a/bank/build.gradle.kts
+++ b/bank/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     kapt("io.micronaut.data:micronaut-data-document-processor")
     kapt("io.micronaut.micrometer:micronaut-micrometer-annotation")
     kapt("io.micronaut.openapi:micronaut-openapi")
-    kapt("io.micronaut.security:micronaut-security-annotations")
+//    kapt("io.micronaut.security:micronaut-security-annotations")
     implementation("io.micronaut:micronaut-http-client")
     implementation("io.micronaut:micronaut-jackson-databind")
     implementation("io.micronaut:micronaut-management")
@@ -29,7 +29,7 @@ dependencies {
     implementation("io.micronaut.kotlin:micronaut-kotlin-extension-functions")
     implementation("io.micronaut.kotlin:micronaut-kotlin-runtime")
     implementation("io.micronaut.micrometer:micronaut-micrometer-core")
-    implementation("io.micronaut.security:micronaut-security-jwt")
+//    implementation("io.micronaut.security:micronaut-security-jwt")
     implementation("io.swagger.core.v3:swagger-annotations")
     implementation("jakarta.annotation:jakarta.annotation-api")
     implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
diff --git a/bank/src/main/kotlin/com/example/BankController.kt b/bank/src/main/kotlin/com/example/BankController.kt
index 7587e07..85af70e 100644
--- a/bank/src/main/kotlin/com/example/BankController.kt
+++ b/bank/src/main/kotlin/com/example/BankController.kt
@@ -1,14 +1,84 @@
 package com.example
 
+import com.example.model.CreateCustomerRequest
+import com.example.model.CustomerResponse
+import com.example.service.CustomerService
+import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Get
-import io.micronaut.http.HttpStatus
+import io.micronaut.http.annotation.PathVariable
+import io.micronaut.http.annotation.Post
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import java.util.UUID
 
 @Controller("/bank")
-class BankController {
+class BankController(
+    private val customerService: CustomerService
+) {
 
-    @Get(uri="/", produces=["text/plain"])
-    fun index(): String {
-        return "Example Response"
-    }
+    @Get(uri = "/", produces = ["text/plain"])
+    @ApiResponses(
+        ApiResponse(
+            description = "Display bank welcome message",
+            responseCode = "200",
+        )
+    )
+    fun index(): String = "Welcome to my simple banking application!"
+
+    @Get(uri = "/customer/{id}", produces = ["application/json"])
+    @Operation(
+        summary = "Get a customer",
+        description = "Get a customer by ID"
+    )
+    @ApiResponses(
+        ApiResponse(
+            description = "The customer corresponding to the ID",
+            responseCode = "200",
+        ),
+        ApiResponse(
+            description = "Customer not found",
+            responseCode = "404",
+        ),
+    )
+    // TODO: Convert Customer into Customer Response, mask SSN
+    // TODO: Return error as JSON
+    fun getCustomer(@PathVariable id: UUID) = customerService.get(id)
+        ?: HttpResponse.notFound("Customer $id not found.")
+
+    @Post(uri = "/customer", produces = ["application/json"], consumes = ["application/json"])
+    @Operation(
+        summary = "Create a customer",
+        description = "Create a customer with basic information and no ID"
+    )
+    @ApiResponses(
+        ApiResponse(
+            description = "Successful creation of a new customer",
+            responseCode = "201",
+        ),
+        ApiResponse(
+            description = "Invalid customer creation request",
+            responseCode = "400",
+        ),
+    )
+    fun createCustomer(request: CreateCustomerRequest) =
+        customerService.create(
+            request.toCustomer()
+        ).let {
+            HttpResponse.created(
+                CustomerResponse(
+                    customerId = it.customerId,
+                    firstName = it.firstName,
+                    lastName = it.lastName,
+                    middleName = it.middleName,
+                    socialSecurityNumber = it.socialSecurityNumber
+                        .substring(it.socialSecurityNumber.length - 4, it.socialSecurityNumber.length)
+                        .padStart(8, 'X'),
+                    uri = "/customer/${it.customerId}"
+                ).also { response ->
+                    println(response)
+                }
+            )
+        }
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/data/Customer.kt b/bank/src/main/kotlin/com/example/data/Customer.kt
new file mode 100644
index 0000000..30d7b0a
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/data/Customer.kt
@@ -0,0 +1,11 @@
+package com.example.data
+
+import java.util.UUID
+
+data class Customer(
+    val customerId: UUID,
+    val firstName: String,
+    val middleName: String?,
+    val lastName: String,
+    val socialSecurityNumber: String,
+)
diff --git a/bank/src/main/kotlin/com/example/model/CreateCustomerRequest.kt b/bank/src/main/kotlin/com/example/model/CreateCustomerRequest.kt
new file mode 100644
index 0000000..3aa71f9
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/CreateCustomerRequest.kt
@@ -0,0 +1,19 @@
+package com.example.model
+
+import com.example.data.Customer
+import java.util.UUID
+
+data class CreateCustomerRequest(
+    val firstName: String,
+    val middleName: String?,
+    val lastName: String,
+    val socialSecurityNumber: String,
+) {
+    fun toCustomer(): Customer = Customer(
+        UUID.randomUUID(),
+        firstName,
+        middleName,
+        lastName,
+        socialSecurityNumber
+    )
+}
diff --git a/bank/src/main/kotlin/com/example/model/CustomerResponse.kt b/bank/src/main/kotlin/com/example/model/CustomerResponse.kt
new file mode 100644
index 0000000..e76681c
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/CustomerResponse.kt
@@ -0,0 +1,12 @@
+package com.example.model
+
+import java.util.UUID
+
+data class CustomerResponse(
+    val customerId: UUID?,
+    val uri: String,
+    val firstName: String,
+    val middleName: String?,
+    val lastName: String,
+    val socialSecurityNumber: String, // TODO: may need to be masked in response
+)
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt b/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
new file mode 100644
index 0000000..4107ed9
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
@@ -0,0 +1,10 @@
+package com.example.repository
+
+import com.example.data.Customer
+import java.util.UUID
+
+interface CustomerRepository {
+    fun get(id: UUID): Customer?
+    fun save(customer: Customer): Customer
+    fun getBySocialSecurityNumber(ssn: String): Customer
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt b/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
new file mode 100644
index 0000000..1066a25
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
@@ -0,0 +1,20 @@
+package com.example.repository
+
+import com.example.data.Customer
+import jakarta.inject.Singleton
+import java.util.UUID
+
+@Singleton
+class InMemoryCustomerRepository : CustomerRepository {
+
+    private val map: MutableMap<UUID, Customer> = mutableMapOf()
+
+    override fun get(id: UUID): Customer? = map[id]
+
+    override fun save(customer: Customer): Customer = customer.let {
+        map[it.customerId] = it
+        it
+    }
+
+    override fun getBySocialSecurityNumber(ssn: String): Customer = TODO("Not yet implemented")
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/service/CustomerService.kt b/bank/src/main/kotlin/com/example/service/CustomerService.kt
new file mode 100644
index 0000000..a10e126
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/service/CustomerService.kt
@@ -0,0 +1,14 @@
+package com.example.service
+
+import com.example.data.Customer
+import com.example.repository.CustomerRepository
+import jakarta.inject.Singleton
+import java.util.UUID
+
+@Singleton
+class CustomerService(
+    private val customerRepository: CustomerRepository,
+) {
+    fun get(id: UUID): Customer? = customerRepository.get(id)
+    fun create(customer: Customer): Customer = customerRepository.save(customer)
+}
\ No newline at end of file

From de1408f7289cdf458630f04334cac02120707ff5 Mon Sep 17 00:00:00 2001
From: Alicia Bendz <aliciabendzdev@gmail.com>
Date: Mon, 5 Sep 2022 14:39:10 -0400
Subject: [PATCH 2/3] Set up tests; create unimplemented controller classes

---
 bank/.idea/kotlinc.xml                        |  6 +++
 bank/build.gradle.kts                         |  9 +++-
 .../example/controller/AccountController.kt   | 49 +++++++++++++++++++
 .../com/example/controller/BankController.kt  | 28 +++++++++++
 .../CustomerController.kt}                    | 40 ++++++++-------
 .../example/controller/TransferController.kt  | 30 ++++++++++++
 .../kotlin/com/example/data/TransferStatus.kt |  7 +++
 .../com/example/model/AccountResponse.kt      |  8 +++
 .../model/PaginatedCustomerResponse.kt        |  7 +++
 .../model/PaginatedTransferResponse.kt        |  7 +++
 .../com/example/model/TransferResponse.kt     | 12 +++++
 .../controller/AccountControllerTest.kt       |  4 ++
 .../controller/BankControllerIntegTest.kt     | 23 +++++++++
 .../example/controller/BankControllerTest.kt  | 18 +++++++
 .../controller/CustomerControllerTest.kt      |  4 ++
 .../controller/TransferControllerTest.kt      |  4 ++
 16 files changed, 236 insertions(+), 20 deletions(-)
 create mode 100644 bank/.idea/kotlinc.xml
 create mode 100644 bank/src/main/kotlin/com/example/controller/AccountController.kt
 create mode 100644 bank/src/main/kotlin/com/example/controller/BankController.kt
 rename bank/src/main/kotlin/com/example/{BankController.kt => controller/CustomerController.kt} (71%)
 create mode 100644 bank/src/main/kotlin/com/example/controller/TransferController.kt
 create mode 100644 bank/src/main/kotlin/com/example/data/TransferStatus.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/AccountResponse.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/PaginatedCustomerResponse.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/PaginatedTransferResponse.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/TransferResponse.kt
 create mode 100644 bank/src/test/kotlin/com/example/controller/AccountControllerTest.kt
 create mode 100644 bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
 create mode 100644 bank/src/test/kotlin/com/example/controller/BankControllerTest.kt
 create mode 100644 bank/src/test/kotlin/com/example/controller/CustomerControllerTest.kt
 create mode 100644 bank/src/test/kotlin/com/example/controller/TransferControllerTest.kt

diff --git a/bank/.idea/kotlinc.xml b/bank/.idea/kotlinc.xml
new file mode 100644
index 0000000..bd2c710
--- /dev/null
+++ b/bank/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="18" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/bank/build.gradle.kts b/bank/build.gradle.kts
index 2870765..91b72ee 100644
--- a/bank/build.gradle.kts
+++ b/bank/build.gradle.kts
@@ -40,6 +40,10 @@ dependencies {
 
     runtimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin")
 
+    kaptTest("io.micronaut:micronaut-inject-java")
+    testImplementation("io.micronaut.test:micronaut-test-kotest:3.5.0")
+    testImplementation("io.mockk:mockk")
+    testImplementation("io.kotest:kotest-runner-junit5-jvm")
 }
 
 
@@ -72,5 +76,6 @@ micronaut {
     }
 }
 
-
-
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/controller/AccountController.kt b/bank/src/main/kotlin/com/example/controller/AccountController.kt
new file mode 100644
index 0000000..9f99fd7
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/controller/AccountController.kt
@@ -0,0 +1,49 @@
+package com.example.controller
+
+import com.example.model.AccountResponse
+import com.example.model.CreateCustomerRequest
+import com.example.model.CustomerResponse
+import com.example.service.CustomerService
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.*
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import java.util.UUID
+
+@Controller("/bank/customer/{customerId}/account")
+class AccountController(
+    private val customerService: CustomerService
+) {
+
+    @Get(uri = "/", produces = ["text/plain"])
+    @ApiResponses(
+        ApiResponse(
+            description = "Display accounts for a customer",
+            responseCode = "200",
+        )
+    )
+    fun getAccounts(@PathVariable customerId: UUID): List<AccountResponse> =
+        TODO("Unimplemented")
+
+    @Get("/{accountId}")
+    fun getAccount(@PathVariable customerId: UUID, @PathVariable accountId: UUID): AccountResponse =
+        TODO("Unimplemented")
+
+    @Post("/")
+    fun createAccount(@PathVariable customerId: UUID): AccountResponse =
+        TODO("Unimplemented")
+
+
+    @Post("/{accountId}")
+    fun updateAccountPost(@PathVariable customerId: UUID, @PathVariable accountId: UUID): AccountResponse =
+        TODO("Unimplemented")
+
+    @Put("/{accountId}")
+    fun updateAccountPut(@PathVariable customerId: UUID, @PathVariable accountId: UUID): AccountResponse =
+        TODO("Unimplemented")
+
+    @Delete("/{accountId}")
+    fun deleteAccount(@PathVariable customerId: UUID, @PathVariable accountId: UUID): Unit =
+        TODO("Unimplemented")
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/controller/BankController.kt b/bank/src/main/kotlin/com/example/controller/BankController.kt
new file mode 100644
index 0000000..7ffa668
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/controller/BankController.kt
@@ -0,0 +1,28 @@
+package com.example.controller
+
+import com.example.model.CreateCustomerRequest
+import com.example.model.CustomerResponse
+import com.example.service.CustomerService
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.Controller
+import io.micronaut.http.annotation.Get
+import io.micronaut.http.annotation.PathVariable
+import io.micronaut.http.annotation.Post
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import java.util.UUID
+
+@Controller("/bank")
+class BankController() {
+
+    @Get(uri = "/", produces = ["text/plain"])
+    @ApiResponses(
+        ApiResponse(
+            description = "Display bank welcome message",
+            responseCode = "200",
+        )
+    )
+    fun index(): String = "Welcome to my simple banking application!"
+
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/BankController.kt b/bank/src/main/kotlin/com/example/controller/CustomerController.kt
similarity index 71%
rename from bank/src/main/kotlin/com/example/BankController.kt
rename to bank/src/main/kotlin/com/example/controller/CustomerController.kt
index 85af70e..10698df 100644
--- a/bank/src/main/kotlin/com/example/BankController.kt
+++ b/bank/src/main/kotlin/com/example/controller/CustomerController.kt
@@ -1,33 +1,22 @@
-package com.example
+package com.example.controller
 
 import com.example.model.CreateCustomerRequest
 import com.example.model.CustomerResponse
+import com.example.model.PaginatedCustomerResponse
 import com.example.service.CustomerService
 import io.micronaut.http.HttpResponse
-import io.micronaut.http.annotation.Controller
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.annotation.PathVariable
-import io.micronaut.http.annotation.Post
+import io.micronaut.http.annotation.*
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
 import java.util.UUID
 
-@Controller("/bank")
-class BankController(
+@Controller("/bank/customer")
+class CustomerController(
     private val customerService: CustomerService
 ) {
 
-    @Get(uri = "/", produces = ["text/plain"])
-    @ApiResponses(
-        ApiResponse(
-            description = "Display bank welcome message",
-            responseCode = "200",
-        )
-    )
-    fun index(): String = "Welcome to my simple banking application!"
-
-    @Get(uri = "/customer/{id}", produces = ["application/json"])
+    @Get(uri = "/{id}", produces = ["application/json"])
     @Operation(
         summary = "Get a customer",
         description = "Get a customer by ID"
@@ -47,7 +36,7 @@ class BankController(
     fun getCustomer(@PathVariable id: UUID) = customerService.get(id)
         ?: HttpResponse.notFound("Customer $id not found.")
 
-    @Post(uri = "/customer", produces = ["application/json"], consumes = ["application/json"])
+    @Post(uri = "/", produces = ["application/json"], consumes = ["application/json"])
     @Operation(
         summary = "Create a customer",
         description = "Create a customer with basic information and no ID"
@@ -81,4 +70,19 @@ class BankController(
                 }
             )
         }
+
+    @Get("/")
+    fun searchCustomers(
+        @QueryValue(value = "offset", defaultValue = "0") offset: Int,
+        @QueryValue(value = "count", defaultValue = "10") count: Int,
+    ): PaginatedCustomerResponse = PaginatedCustomerResponse(offset, count, emptyList())
+
+    @Post("/{id}")
+    fun updateAsPost(@PathVariable id: UUID): CustomerResponse = TODO("Unimplemented")
+
+    @Put("/{id}")
+    fun updateAsPut(@PathVariable id: UUID): CustomerResponse = TODO("Unimplemented")
+
+    @Delete("/{id}")
+    fun delete(@PathVariable id: UUID): Unit = TODO("Unimplemented")
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/controller/TransferController.kt b/bank/src/main/kotlin/com/example/controller/TransferController.kt
new file mode 100644
index 0000000..6dffd6f
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/controller/TransferController.kt
@@ -0,0 +1,30 @@
+package com.example.controller
+
+import com.example.model.CreateCustomerRequest
+import com.example.model.CustomerResponse
+import com.example.model.PaginatedTransferResponse
+import com.example.model.TransferResponse
+import com.example.service.CustomerService
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.*
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import java.util.UUID
+
+@Controller("/bank/transfer")
+class TransferController(
+    private val customerService: CustomerService
+) {
+
+    @Get(uri = "/", produces = ["text/plain"])
+    @ApiResponses(
+        ApiResponse(
+            description = "Display bank welcome message",
+            responseCode = "200",
+        )
+    )
+    fun getTransfers(@QueryValue(value = "status", defaultValue = "PENDING") status: TransferResponse): PaginatedTransferResponse =
+        TODO("Unimplemented")
+
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/data/TransferStatus.kt b/bank/src/main/kotlin/com/example/data/TransferStatus.kt
new file mode 100644
index 0000000..fb9da70
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/data/TransferStatus.kt
@@ -0,0 +1,7 @@
+package com.example.data
+
+enum class TransferStatus {
+    PENDING,
+    COMPLETE,
+    REJECTED,
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/AccountResponse.kt b/bank/src/main/kotlin/com/example/model/AccountResponse.kt
new file mode 100644
index 0000000..98f01f0
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/AccountResponse.kt
@@ -0,0 +1,8 @@
+package com.example.model
+
+import java.util.UUID
+
+class AccountResponse(
+    val id: UUID,
+    val balance: Int = 0,
+)
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/PaginatedCustomerResponse.kt b/bank/src/main/kotlin/com/example/model/PaginatedCustomerResponse.kt
new file mode 100644
index 0000000..5279831
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/PaginatedCustomerResponse.kt
@@ -0,0 +1,7 @@
+package com.example.model
+
+class PaginatedCustomerResponse(
+    val offset: Int,
+    val count: Int,
+    val customers: List<CustomerResponse>,
+)
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/PaginatedTransferResponse.kt b/bank/src/main/kotlin/com/example/model/PaginatedTransferResponse.kt
new file mode 100644
index 0000000..ad25b0d
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/PaginatedTransferResponse.kt
@@ -0,0 +1,7 @@
+package com.example.model
+
+data class PaginatedTransferResponse(
+    val offset: Int,
+    val count: Int,
+    val transfers: List<TransferResponse>,
+)
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/TransferResponse.kt b/bank/src/main/kotlin/com/example/model/TransferResponse.kt
new file mode 100644
index 0000000..01167d4
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/TransferResponse.kt
@@ -0,0 +1,12 @@
+package com.example.model
+
+import com.example.data.TransferStatus
+import java.util.UUID
+
+data class TransferResponse(
+    val id: UUID,
+    val sourceAccount: UUID,
+    val destinationAccount: UUID,
+    val amount: UUID,
+    val status: TransferStatus,
+)
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/AccountControllerTest.kt b/bank/src/test/kotlin/com/example/controller/AccountControllerTest.kt
new file mode 100644
index 0000000..9f631ce
--- /dev/null
+++ b/bank/src/test/kotlin/com/example/controller/AccountControllerTest.kt
@@ -0,0 +1,4 @@
+package com.example.controller
+
+class AccountControllerTest {
+}
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt b/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
new file mode 100644
index 0000000..a41e1db
--- /dev/null
+++ b/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
@@ -0,0 +1,23 @@
+package com.example.controller
+
+import io.kotest.core.spec.style.BehaviorSpec
+import io.kotest.core.spec.style.Test
+import io.kotest.matchers.shouldBe
+import io.micronaut.http.client.HttpClient
+import io.micronaut.http.client.annotation.Client
+import io.micronaut.test.extensions.kotest.annotation.MicronautTest
+
+@MicronautTest
+class BankControllerIntegTest(
+    @Client("/bank") private val client: HttpClient
+): BehaviorSpec({
+
+    given("The bank controller") {
+        `when`("index is called") {
+            val result = client.toBlocking().retrieve("/")
+            then("the result is a welcome message") {
+                result shouldBe "Welcome to my simple banking application!"
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/BankControllerTest.kt b/bank/src/test/kotlin/com/example/controller/BankControllerTest.kt
new file mode 100644
index 0000000..cb08be8
--- /dev/null
+++ b/bank/src/test/kotlin/com/example/controller/BankControllerTest.kt
@@ -0,0 +1,18 @@
+package com.example.controller
+
+import io.kotest.core.spec.style.BehaviorSpec
+import io.kotest.core.spec.style.Test
+import io.kotest.matchers.shouldBe
+
+@Test
+class BankControllerTest: BehaviorSpec({
+
+    given("The bank controller") {
+        `when`("index is called") {
+            val result = BankController().index()
+            then("the result is a welcome message") {
+                result shouldBe "Welcome to my simple banking application!"
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/CustomerControllerTest.kt b/bank/src/test/kotlin/com/example/controller/CustomerControllerTest.kt
new file mode 100644
index 0000000..5d4c438
--- /dev/null
+++ b/bank/src/test/kotlin/com/example/controller/CustomerControllerTest.kt
@@ -0,0 +1,4 @@
+package com.example.controller
+
+class CustomerControllerTest {
+}
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/TransferControllerTest.kt b/bank/src/test/kotlin/com/example/controller/TransferControllerTest.kt
new file mode 100644
index 0000000..bd6e538
--- /dev/null
+++ b/bank/src/test/kotlin/com/example/controller/TransferControllerTest.kt
@@ -0,0 +1,4 @@
+package com.example.controller
+
+class TransferControllerTest {
+}
\ No newline at end of file

From 5ecec783ed48735195178a2fdda7c97454cb9ff9 Mon Sep 17 00:00:00 2001
From: Alicia Bendz <aliciabendzdev@gmail.com>
Date: Wed, 7 Sep 2022 20:18:46 -0400
Subject: [PATCH 3/3] Add additional APIs and in memory customer methods

---
 .../example/controller/AccountController.kt   |  3 +-
 .../example/controller/CustomerController.kt  | 13 ++-------
 .../example/controller/TransferController.kt  | 28 ++++++++++---------
 .../example/model/CreateTransferRequest.kt    |  9 ++++++
 .../com/example/model/CustomerResponse.kt     | 15 +++++++++-
 .../example/model/UpdateTransferRequest.kt    |  9 ++++++
 .../example/repository/CustomerRepository.kt  |  2 ++
 .../repository/InMemoryCustomerRepository.kt  | 17 ++++++++++-
 .../com/example/service/CustomerService.kt    |  2 ++
 .../controller/BankControllerIntegTest.kt     |  1 -
 10 files changed, 71 insertions(+), 28 deletions(-)
 create mode 100644 bank/src/main/kotlin/com/example/model/CreateTransferRequest.kt
 create mode 100644 bank/src/main/kotlin/com/example/model/UpdateTransferRequest.kt

diff --git a/bank/src/main/kotlin/com/example/controller/AccountController.kt b/bank/src/main/kotlin/com/example/controller/AccountController.kt
index 9f99fd7..ed1b44a 100644
--- a/bank/src/main/kotlin/com/example/controller/AccountController.kt
+++ b/bank/src/main/kotlin/com/example/controller/AccountController.kt
@@ -13,10 +13,9 @@ import java.util.UUID
 
 @Controller("/bank/customer/{customerId}/account")
 class AccountController(
-    private val customerService: CustomerService
 ) {
 
-    @Get(uri = "/", produces = ["text/plain"])
+    @Get(uri = "/", produces = ["application/json"])
     @ApiResponses(
         ApiResponse(
             description = "Display accounts for a customer",
diff --git a/bank/src/main/kotlin/com/example/controller/CustomerController.kt b/bank/src/main/kotlin/com/example/controller/CustomerController.kt
index 10698df..19c96ce 100644
--- a/bank/src/main/kotlin/com/example/controller/CustomerController.kt
+++ b/bank/src/main/kotlin/com/example/controller/CustomerController.kt
@@ -57,14 +57,7 @@ class CustomerController(
         ).let {
             HttpResponse.created(
                 CustomerResponse(
-                    customerId = it.customerId,
-                    firstName = it.firstName,
-                    lastName = it.lastName,
-                    middleName = it.middleName,
-                    socialSecurityNumber = it.socialSecurityNumber
-                        .substring(it.socialSecurityNumber.length - 4, it.socialSecurityNumber.length)
-                        .padStart(8, 'X'),
-                    uri = "/customer/${it.customerId}"
+                    it
                 ).also { response ->
                     println(response)
                 }
@@ -75,7 +68,7 @@ class CustomerController(
     fun searchCustomers(
         @QueryValue(value = "offset", defaultValue = "0") offset: Int,
         @QueryValue(value = "count", defaultValue = "10") count: Int,
-    ): PaginatedCustomerResponse = PaginatedCustomerResponse(offset, count, emptyList())
+    ): PaginatedCustomerResponse = PaginatedCustomerResponse(offset, count, customerService.getAll(offset, count).map { CustomerResponse(it) })
 
     @Post("/{id}")
     fun updateAsPost(@PathVariable id: UUID): CustomerResponse = TODO("Unimplemented")
@@ -84,5 +77,5 @@ class CustomerController(
     fun updateAsPut(@PathVariable id: UUID): CustomerResponse = TODO("Unimplemented")
 
     @Delete("/{id}")
-    fun delete(@PathVariable id: UUID): Unit = TODO("Unimplemented")
+    fun delete(@PathVariable id: UUID): Unit = customerService.delete(id)
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/controller/TransferController.kt b/bank/src/main/kotlin/com/example/controller/TransferController.kt
index 6dffd6f..4ed0ad3 100644
--- a/bank/src/main/kotlin/com/example/controller/TransferController.kt
+++ b/bank/src/main/kotlin/com/example/controller/TransferController.kt
@@ -1,9 +1,7 @@
 package com.example.controller
 
-import com.example.model.CreateCustomerRequest
-import com.example.model.CustomerResponse
-import com.example.model.PaginatedTransferResponse
-import com.example.model.TransferResponse
+import com.example.data.TransferStatus
+import com.example.model.*
 import com.example.service.CustomerService
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.*
@@ -14,17 +12,21 @@ import java.util.UUID
 
 @Controller("/bank/transfer")
 class TransferController(
-    private val customerService: CustomerService
 ) {
 
-    @Get(uri = "/", produces = ["text/plain"])
-    @ApiResponses(
-        ApiResponse(
-            description = "Display bank welcome message",
-            responseCode = "200",
-        )
-    )
-    fun getTransfers(@QueryValue(value = "status", defaultValue = "PENDING") status: TransferResponse): PaginatedTransferResponse =
+    @Get(uri = "/", produces = ["application/json"])
+    fun getTransfers(@QueryValue(value = "status", defaultValue = "PENDING") status: TransferStatus): PaginatedTransferResponse =
         TODO("Unimplemented")
 
+    @Post(uri = "/", produces = ["application/json"])
+    fun createTransfer(request: CreateTransferRequest): TransferResponse =
+        TODO("Unimplemented")
+
+    @Post(uri = "/{transferId}", produces = ["application/json"])
+    fun updateTransfer(@PathVariable transferId: UUID, request: UpdateTransferRequest): TransferResponse =
+        TODO("Unimplemented")
+
+    @Get(uri = "/{transferId}", produces = ["application/json"])
+    fun getTransfer(@PathVariable transferId: UUID): TransferResponse =
+        TODO("Unimplemented")
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/CreateTransferRequest.kt b/bank/src/main/kotlin/com/example/model/CreateTransferRequest.kt
new file mode 100644
index 0000000..e57aa6b
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/CreateTransferRequest.kt
@@ -0,0 +1,9 @@
+package com.example.model
+
+import java.util.UUID
+
+data class CreateTransferRequest(
+    val toAccount: UUID,
+    val fromAccount: UUID,
+    val amount: Int,
+)
diff --git a/bank/src/main/kotlin/com/example/model/CustomerResponse.kt b/bank/src/main/kotlin/com/example/model/CustomerResponse.kt
index e76681c..facfb70 100644
--- a/bank/src/main/kotlin/com/example/model/CustomerResponse.kt
+++ b/bank/src/main/kotlin/com/example/model/CustomerResponse.kt
@@ -1,5 +1,6 @@
 package com.example.model
 
+import com.example.data.Customer
 import java.util.UUID
 
 data class CustomerResponse(
@@ -9,4 +10,16 @@ data class CustomerResponse(
     val middleName: String?,
     val lastName: String,
     val socialSecurityNumber: String, // TODO: may need to be masked in response
-)
\ No newline at end of file
+) {
+    constructor(customer: Customer) : this(
+        customerId = customer.customerId,
+        uri = "/customer/${customer.customerId}",
+        firstName = customer.firstName,
+        middleName = customer.middleName,
+        lastName = customer.lastName,
+        socialSecurityNumber = customer.socialSecurityNumber.let {
+            it.substring(it.length - 4, it.length)
+                .padStart(8, 'X')
+        }
+    )
+}
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/model/UpdateTransferRequest.kt b/bank/src/main/kotlin/com/example/model/UpdateTransferRequest.kt
new file mode 100644
index 0000000..b5a382f
--- /dev/null
+++ b/bank/src/main/kotlin/com/example/model/UpdateTransferRequest.kt
@@ -0,0 +1,9 @@
+package com.example.model
+
+import com.example.data.TransferStatus
+import java.util.UUID
+
+data class UpdateTransferRequest(
+    val id: UUID,
+    val status: TransferStatus,
+)
diff --git a/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt b/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
index 4107ed9..5c2734e 100644
--- a/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
+++ b/bank/src/main/kotlin/com/example/repository/CustomerRepository.kt
@@ -5,6 +5,8 @@ import java.util.UUID
 
 interface CustomerRepository {
     fun get(id: UUID): Customer?
+    fun getAll(offset: Int, count: Int): List<Customer>
     fun save(customer: Customer): Customer
     fun getBySocialSecurityNumber(ssn: String): Customer
+    fun delete(id: UUID): Unit
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt b/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
index 1066a25..826d4c1 100644
--- a/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
+++ b/bank/src/main/kotlin/com/example/repository/InMemoryCustomerRepository.kt
@@ -8,13 +8,28 @@ import java.util.UUID
 class InMemoryCustomerRepository : CustomerRepository {
 
     private val map: MutableMap<UUID, Customer> = mutableMapOf()
+    private val list: MutableList<Customer> = mutableListOf()
 
     override fun get(id: UUID): Customer? = map[id]
 
+    override fun getAll(offset: Int, count: Int): List<Customer> =
+        offset.takeIf { it < list.size }?.let {
+            if ((offset + count) >= list.size) {
+                list.subList(offset, list.size)
+            } else {
+                list.subList(offset, offset + count + 1)
+            }
+        } ?: emptyList()
+
     override fun save(customer: Customer): Customer = customer.let {
         map[it.customerId] = it
+        list.add(it)
         it
     }
 
-    override fun getBySocialSecurityNumber(ssn: String): Customer = TODO("Not yet implemented")
+    override fun getBySocialSecurityNumber(ssn: String): Customer = list.first { it.socialSecurityNumber == ssn }
+
+    override fun delete(id: UUID) {
+        id.takeIf { map.containsKey(id) }?.let { list.remove(map.remove(id)) }
+    }
 }
\ No newline at end of file
diff --git a/bank/src/main/kotlin/com/example/service/CustomerService.kt b/bank/src/main/kotlin/com/example/service/CustomerService.kt
index a10e126..4914331 100644
--- a/bank/src/main/kotlin/com/example/service/CustomerService.kt
+++ b/bank/src/main/kotlin/com/example/service/CustomerService.kt
@@ -10,5 +10,7 @@ class CustomerService(
     private val customerRepository: CustomerRepository,
 ) {
     fun get(id: UUID): Customer? = customerRepository.get(id)
+    fun getAll(offset: Int = 0, count: Int = 10): List<Customer> = customerRepository.getAll(offset, count)
     fun create(customer: Customer): Customer = customerRepository.save(customer)
+    fun delete(id: UUID) = customerRepository.delete(id)
 }
\ No newline at end of file
diff --git a/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt b/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
index a41e1db..115ff54 100644
--- a/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
+++ b/bank/src/test/kotlin/com/example/controller/BankControllerIntegTest.kt
@@ -1,7 +1,6 @@
 package com.example.controller
 
 import io.kotest.core.spec.style.BehaviorSpec
-import io.kotest.core.spec.style.Test
 import io.kotest.matchers.shouldBe
 import io.micronaut.http.client.HttpClient
 import io.micronaut.http.client.annotation.Client