feat: creat account

Author: Nayananga

mvnw

@@ -32,6 +32,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.mifmif</groupId>
+			<artifactId>generex</artifactId>
+			<version>1.0.2</version>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

pom.xml

@@ -3,6 +3,7 @@
 import com.example.paul.models.Account;
 import com.example.paul.services.AccountService;
 import com.example.paul.utils.AccountInput;
+import com.example.paul.utils.CreateAccountInput;
 import com.example.paul.utils.InputValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +31,9 @@ public class AccountRestController {
     private static final String NO_ACCOUNT_FOUND =
             "Unable to find an account matching this sort code and account number";
 
+    private static final String CREATE_ACCOUNT_FAILED =
+            "Error happened during creating new account";
+
     private final AccountService accountService;
 
     @Autowired
@@ -62,6 +66,31 @@ public ResponseEntity<?> checkAccountBalance(
         }
     }
 
+
+    @PutMapping(value = "/accounts",
+            consumes = MediaType.APPLICATION_JSON_VALUE,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> createAccount(
+            @Valid @RequestBody CreateAccountInput createAccountInput) {
+        LOGGER.debug("Triggered AccountRestController.accountInput");
+
+        // Validate input
+        if (InputValidator.isCreateAccountCriteriaValid(createAccountInput)) {
+            // Attempt to retrieve the account information
+            Account account = accountService.createAccount(
+                    createAccountInput.getBankName(), createAccountInput.getOwnerName());
+
+            // Return the account details, or warn that no account was found for given input
+            if (account == null) {
+                return new ResponseEntity<>(CREATE_ACCOUNT_FAILED, HttpStatus.NO_CONTENT);
+            } else {
+                return new ResponseEntity<>(account, HttpStatus.OK);
+            }
+        } else {
+            return new ResponseEntity<>(INVALID_SEARCH_CRITERIA, HttpStatus.BAD_REQUEST);
+        }
+    }
+
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Map<String, String> handleValidationExceptions(

src/main/java/com/example/paul/controllers/AccountRestController.java

@@ -1,6 +1,7 @@
 package com.example.paul.models;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
@@ -11,7 +12,7 @@
 @Table(name = "account", schema = "online_bank")
 public class Account {
 
-    @Id
+    @Id @GeneratedValue
     private long id;
 
     private String sortCode;
@@ -27,6 +28,13 @@ public class Account {
     private transient List<Transaction> transactions;
 
     protected Account() {}
+    public Account(String bankName, String ownerName, String generateSortCode, String generateAccountNumber, double currentBalance) {
+        this.sortCode = generateSortCode;
+        this.accountNumber = generateAccountNumber;
+        this.currentBalance = currentBalance;
+        this.bankName = bankName;
+        this.ownerName = ownerName;
+    }
     public Account(long id, String sortCode, String accountNumber, double currentBalance, String bankName, String ownerName) {
         this.id = id;
         this.sortCode = sortCode;
@@ -35,6 +43,7 @@ public Account(long id, String sortCode, String accountNumber, double currentBal
         this.bankName = bankName;
         this.ownerName = ownerName;
     }
+
     public Account(long id, String sortCode, String accountNumber, double currentBalance, String bankName, String ownerName, List<Transaction> transactions) {
         this.id = id;
         this.sortCode = sortCode;

src/main/java/com/example/paul/models/Account.java

@@ -3,6 +3,7 @@
 import com.example.paul.models.Account;
 import com.example.paul.repositories.AccountRepository;
 import com.example.paul.repositories.TransactionRepository;
+import com.example.paul.utils.CreateAccountInput;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,4 +28,10 @@ public Account getAccount(String sortCode, String accountNumber) {
 
         return account.orElse(null);
     }
+
+    public Account createAccount(String bankName, String ownerName) {
+        CreateAccountInput createAccountInput = new CreateAccountInput();
+        Account newAccount = new Account(bankName, ownerName, createAccountInput.generateSortCode(), createAccountInput.generateAccountNumber(), 0.00);
+        return accountRepository.save(newAccount);
+    }
 }

src/main/java/com/example/paul/services/AccountService.java

@@ -0,0 +1,66 @@
+package com.example.paul.utils;
+
+import com.mifmif.common.regex.Generex;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Objects;
+
+public class CreateAccountInput {
+
+    @NotBlank(message = "Bank name is mandatory")
+    private String bankName;
+
+    @NotBlank(message = "Owner name is mandatory")
+    private String ownerName;
+
+
+    public CreateAccountInput() {}
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String generateSortCode() {
+        Generex generex = new Generex(InputValidator.sortCodePattern.toString());
+        return generex.getMatchedString(2);
+    }
+
+    public String generateAccountNumber() {
+        Generex generex = new Generex(InputValidator.accountNumberPattern.toString());
+        return generex.getMatchedString(2);
+    }
+
+    @Override
+    public String toString() {
+        return "CreateAccountInput{" +
+                "bankName='" + bankName + '\'' +
+                ", ownerName='" + ownerName + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CreateAccountInput that = (CreateAccountInput) o;
+        return Objects.equals(bankName, that.bankName) &&
+                Objects.equals(ownerName, that.ownerName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bankName, ownerName);
+    }
+}

src/main/java/com/example/paul/utils/CreateAccountInput.java

@@ -4,15 +4,19 @@
 
 public class InputValidator {
 
-    private static final Pattern sortCodePattern = Pattern.compile("^[0-9]{2}-[0-9]{2}-[0-9]{2}$");
+    static final Pattern sortCodePattern = Pattern.compile("^[0-9]{2}-[0-9]{2}-[0-9]{2}$");
 
-    private static final Pattern accountNumberPattern = Pattern.compile("^[0-9]{8}$");
+    static final Pattern accountNumberPattern = Pattern.compile("^[0-9]{8}$");
 
     public static boolean isSearchCriteriaValid(AccountInput accountInput) {
         return sortCodePattern.matcher(accountInput.getSortCode()).find() &&
                 accountNumberPattern.matcher(accountInput.getAccountNumber()).find();
     }
 
+    public static boolean isCreateAccountCriteriaValid(CreateAccountInput createAccountInput) {
+        return (!createAccountInput.getBankName().isBlank() && !createAccountInput.getOwnerName().isBlank());
+    }
+
     public static boolean isSearchTransactionValid(TransactionInput transactionInput) {
         // TODO Add checks for large amounts; consider past history of account holder and location of transfers
 

src/main/java/com/example/paul/utils/InputValidator.java

@@ -12,6 +12,6 @@ spring:
       path: /h2-console
   jpa:
     hibernate:
-      ddl-auto: none
+      ddl-auto: create-drop
 server:
   port: 8080