Mostly Finished. Will finish mock tests tomorrow

pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.5.2.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 	</properties>
 
 	<dependencies>
@@ -38,17 +38,30 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.hsqldb</groupId>-->
+			<!--<artifactId>hsqldb</artifactId>-->
+			<!--<scope>runtime</scope>-->
+		<!--</dependency>-->
+		<!--<dependency>-->
+			<!--<groupId>com.h2database</groupId>-->
+			<!--<artifactId>h2</artifactId>-->
+			<!--<scope>runtime</scope>-->
+		<!--</dependency>-->
 		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>runtime</scope>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/io/zipcoder/ZcwbankApplication.java

@@ -1,12 +1,26 @@
 package io.zipcoder;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+
+import javax.servlet.annotation.WebServlet;
 
 @SpringBootApplication
+//@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class ZcwbankApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(ZcwbankApplication.class, args);
 	}
+
+//	@Bean
+//	ServletRegistrationBean h2servletRegistration(){
+//		ServletRegistrationBean registrationBean = new ServletRegistrationBean( new org.h2.server.web.WebServlet());
+//		registrationBean.addUrlMappings("/console/*");
+//		return registrationBean;
+//	}
 }

src/main/java/io/zipcoder/controllers/AccountController.java

@@ -0,0 +1,45 @@
+package io.zipcoder.controllers;
+
+import io.zipcoder.entities.Account;
+import io.zipcoder.services.AccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+public class AccountController {
+
+    @Autowired
+    private AccountService accountService;
+
+    @RequestMapping(value = "/accounts", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Account>> getAllAccounts(){
+        return accountService.getAllAccounts();
+    }
+
+    @RequestMapping(value = "/accounts/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Account> getAccountById(@PathVariable Long id){
+        return accountService.getAccountById(id);
+    }
+
+    @RequestMapping(value = "/customers/{customerId}/accounts", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Account>> getAllAccountsByCustomer(@PathVariable Long customerId){
+        return accountService.getAllAccountsByCustomer(customerId);
+    }
+
+    @RequestMapping(value = "/customers/{customerId}/accounts", method = RequestMethod.POST)
+    public ResponseEntity<Account> createAccount(@RequestBody Account account, @PathVariable Long customerId){
+        return accountService.createAccount(account, customerId);
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}", method = RequestMethod.PUT)
+    public ResponseEntity<Account> updateAccount(@PathVariable Long accountId, @RequestBody Account account){
+        return accountService.updateAccount(accountId, account);
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}", method = RequestMethod.DELETE)
+    public ResponseEntity deleteAccount(@PathVariable Long accountId){
+        return accountService.deleteAccount(accountId);
+    }
+}

src/main/java/io/zipcoder/controllers/BillController.java

@@ -0,0 +1,49 @@
+package io.zipcoder.controllers;
+
+import io.zipcoder.entities.Bill;
+import io.zipcoder.services.BillService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class BillController {
+
+    private BillService billService;
+
+    @Autowired
+    public BillController(BillService billService) {
+        this.billService = billService;
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}/bills", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Bill>> getBillsByAccount(@PathVariable Long accountId) {
+        return this.billService.getBillsByAccount(accountId);
+    }
+
+    @RequestMapping(value = "/bills/{billId}/bills", method = RequestMethod.GET)
+    public ResponseEntity<Bill> getBillByBillId(@PathVariable Long billId) {
+        return this.billService.getBillByBillId(billId);
+    }
+
+    @RequestMapping(value = "/customers/{customerId}/bills", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Bill>> getBillsByCustomerId(@PathVariable Long customerId) {
+        return this.billService.getBillsByCustomerId(customerId);
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}/bills", method = RequestMethod.POST)
+    public ResponseEntity<Bill> createBill(@PathVariable Long accountId, @RequestBody Bill bill) {
+        return this.billService.createBill(accountId, bill);
+    }
+
+    @RequestMapping(value = "/bills/{billId}", method = RequestMethod.PUT)
+    public ResponseEntity<Bill> updateBill(@PathVariable Long billId, @RequestBody Bill bill) {
+        return this.billService.updateBill(billId, bill);
+    }
+
+    @RequestMapping(value = "/bills/{billId}", method = RequestMethod.DELETE)
+    public ResponseEntity deleteBill(@PathVariable Long billId) {
+        return this.billService.deleteBill(billId);
+    }
+
+}

src/main/java/io/zipcoder/controllers/CustomerController.java

@@ -0,0 +1,44 @@
+package io.zipcoder.controllers;
+
+import io.zipcoder.entities.Customer;
+import io.zipcoder.services.CustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class CustomerController {
+
+    private CustomerService customerService;
+
+    @Autowired
+    public CustomerController(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}/customer", method = RequestMethod.GET)
+    public ResponseEntity<Customer> getCustomerByAccountId(@PathVariable Long accountId) {
+        return customerService.getCustomerByAccountId(accountId);
+    }
+
+    @RequestMapping(value = "/customers", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Customer>> getAllCustomers() {
+        return customerService.getAllCustomers();
+    }
+
+    @RequestMapping(value = "/customers/{id}", method = RequestMethod.GET)
+    public ResponseEntity<Customer> getCustomerByCustomerId(@PathVariable Long id) {
+        return customerService.getCustomerByCustomerId(id);
+    }
+
+    @RequestMapping(value = "/customers", method = RequestMethod.POST)
+    public ResponseEntity<Customer> createCustomer(@RequestBody Customer customer) {
+        return customerService.createCustomer(customer);
+    }
+
+    @RequestMapping(value = "/customers/{customerId}", method = RequestMethod.PUT)
+    public ResponseEntity<Customer> updateCustomer(@PathVariable Long customerId, @RequestBody Customer customer) {
+        return customerService.updateCustomer(customerId, customer);
+    }
+
+}

src/main/java/io/zipcoder/controllers/DepositController.java

@@ -0,0 +1,43 @@
+package io.zipcoder.controllers;
+
+import io.zipcoder.entities.Deposit;
+import io.zipcoder.services.DepositService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class DepositController {
+
+    private DepositService depositService;
+
+    @Autowired
+    public DepositController(DepositService depositService) {
+        this.depositService = depositService;
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}/deposits", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Deposit>> getAllDeposits(@PathVariable Long accountId) {
+        return this.depositService.getAllDepositsFromAccount(accountId);
+    }
+
+    @RequestMapping(value = "/deposits/{depositId}", method = RequestMethod.GET)
+    public ResponseEntity<Deposit> getDepositById(@PathVariable Long depositId) {
+        return this.depositService.getDepositById(depositId);
+    }
+
+    @RequestMapping(value = "/accounts/{accountId}/deposits", method = RequestMethod.POST)
+    public ResponseEntity<Deposit> createDeposit(@PathVariable Long accountId, @RequestBody Deposit deposit) {
+        return this.depositService.createDeposit(accountId, deposit);
+    }
+
+    @RequestMapping(value = "/deposits/{depositId}", method = RequestMethod.PUT)
+    public ResponseEntity<Deposit> updateDeposit(@PathVariable Long depositId, @RequestBody Deposit deposit) {
+        return this.depositService.updateDeposit(depositId, deposit);
+    }
+
+    @RequestMapping(value = "/deposits/{depositId}", method = RequestMethod.DELETE)
+    public ResponseEntity deleteDeposit(@PathVariable Long depositId) {
+        return this.depositService.deleteDeposit(depositId);
+    }
+}

src/main/java/io/zipcoder/controllers/WithdrawalController.java

@@ -0,0 +1,35 @@
+package io.zipcoder.controllers;
+
+import io.zipcoder.entities.Withdrawal;
+import io.zipcoder.services.WithdrawalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class WithdrawalController {
+
+    @Autowired
+    private WithdrawalService withdrawalService;
+
+    @RequestMapping(value = "/accounts/{accountId}/withdrawals", method = RequestMethod.GET)
+    public ResponseEntity<Iterable<Withdrawal>> getAllWithdrawalsFromAccountId(@PathVariable Long accountId){
+        return withdrawalService.getAllWithdrawalsFromAccountId(accountId);
+    }
+    @RequestMapping(value = "/withdrawals/{withdrawalId}", method = RequestMethod.GET)
+    public ResponseEntity<Withdrawal> getWithdrawalsByWithdrawalId(@PathVariable Long withdrawalId){
+        return withdrawalService.getWithdrawalsByWithdrawalId(withdrawalId);
+    }
+    @RequestMapping(value = "/accounts/{accountId}/withdrawals", method = RequestMethod.POST)
+    public ResponseEntity<Withdrawal> createWithdrawal(@PathVariable Long accountId, @RequestBody Withdrawal withdrawal){
+        return withdrawalService.createWithdrawal(accountId, withdrawal);
+    }
+    @RequestMapping(value = "/withdrawals/{withdrawalId}", method = RequestMethod.PUT)
+    public ResponseEntity<Withdrawal> updateWithdrawal(@PathVariable Long withdrawalId, @RequestBody Withdrawal withdrawal){
+        return withdrawalService.updateWithdrawal(withdrawalId, withdrawal);
+    }
+    @RequestMapping(value = "/withdrawals/{withdrawalId}", method = RequestMethod.DELETE)
+    public ResponseEntity deleteWithdrawal(@PathVariable Long withdrawalId){
+        return withdrawalService.deleteWithdrawal(withdrawalId);
+    }
+}

src/main/java/io/zipcoder/entities/Account.java

@@ -0,0 +1,88 @@
+package io.zipcoder.entities;
+
+import io.zipcoder.utilities.AccountType;
+
+import javax.persistence.*;
+
+@Entity
+public class Account {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "ACCOUNT_ID")
+    private Long id;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "ACCOUNT_TYPE")
+    private AccountType type;
+
+    @Column(name = "NICKNAME")
+    private String nickname;
+
+    @Column(name = "REWARDS_POINTS")
+    private Integer rewards;
+
+    @Column(name = "ACCOUNT_BALANCE")
+    private Double balance;
+
+    @ManyToOne
+    @JoinColumn(name = "CUSTOMER_ID")
+    private Customer customer;
+
+    public Account(){}
+
+    public Account(String nickname, AccountType type, Double balance, Customer customer){
+        this.nickname = nickname;
+        this.type = type;
+        this.balance = balance;
+        this.customer = customer;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public AccountType getType() {
+        return this.type;
+    }
+
+    public void setType(AccountType type) {
+        this.type = type;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public Integer getRewards() {
+        return rewards;
+    }
+
+    public void setRewards(Integer rewards) {
+        this.rewards = rewards;
+    }
+
+    public Double getBalance() {
+        return balance;
+    }
+
+    public void setBalance(Double balance) {
+        this.balance = balance;
+    }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+}