Deon

src/main/java/runner/controllers/AccountController.java

@@ -1,4 +1,5 @@
 package runner.controllers;
+import com.fasterxml.jackson.annotation.JsonView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -7,10 +8,11 @@
 import runner.entities.Account;
 import runner.entities.Transaction;
 import runner.services.AccountServices;
-import runner.services.CustomerServices;
+import runner.views.Views;
+
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
+
 
 @RequestMapping("/myaccount")
 @RestController
@@ -28,12 +30,14 @@ public String testJWT() {
     }
 
     //get accounts for the authenticated user only, THIS is the homepage once user has logged in
+    @JsonView(Views.AllAccounts.class)
     @GetMapping
     public ResponseEntity<Set<Account>> readAllAccount() {
        String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
        return new ResponseEntity<>(accountServices.getAllAccounts(currentPrincipalName), HttpStatus.OK);
     }
 
+    @JsonView(Views.AccountSpecific.class)
     @GetMapping(value = "/{accountEncryptedUrl}")
     public ResponseEntity<Account> readAccountById(@PathVariable String accountEncryptedUrl){
         return new ResponseEntity<>(accountServices.findAccountByEncryptedUrl(accountEncryptedUrl), HttpStatus.OK);

src/main/java/runner/controllers/CustomerController.java

@@ -1,4 +1,5 @@
 package runner.controllers;
+import com.fasterxml.jackson.annotation.JsonView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -9,8 +10,7 @@
 import runner.entities.Address;
 import runner.entities.Customer;
 import runner.services.CustomerServices;
-
-
+import runner.views.Views;
 import java.net.URI;
 import java.util.logging.Logger;
 
@@ -23,9 +23,9 @@ public class CustomerController {
 
     private final static Logger logger = Logger.getLogger(CustomerController.class.getName());
 
-
+    @JsonView(Views.Profile.class)
     @GetMapping
-    public ResponseEntity<?> readById() {
+    public ResponseEntity<?> getCustomer() {
         String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
         Customer customer =customerServices.readCustomerByLogin(currentPrincipalName);
           if( customer == null)
@@ -62,6 +62,7 @@ public ResponseEntity<Customer> update(@RequestBody Customer customer) throws Ex
         return new ResponseEntity<>(customerServices.updateCustomer(id,customer), HttpStatus.OK);
     }
 
+    @JsonView(Views.PhoneNumber.class)
     @PutMapping(value = "/update/phone")
     public ResponseEntity<?> updatePhone(@RequestBody String phoneNumber) throws Exception {
         String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -77,6 +78,7 @@ else if(response == 1 )
 
     }
 
+    @JsonView(Views.Email.class)
     @PutMapping(value = "/update/email")
     public ResponseEntity<?> updateEmail(@RequestBody String email) throws Exception {
         String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -92,6 +94,7 @@ else if(response == 1 )
 
     }
 
+    @JsonView(Views.Address.class)
     @PutMapping(value = "/update/address")
     public ResponseEntity<?> updateEmail(@RequestBody Address address) throws Exception {
         String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -103,6 +106,7 @@ public ResponseEntity<?> updateEmail(@RequestBody Address address) throws Except
         else
             return new ResponseEntity<>(customerServices.readCustomer(id), HttpStatus.OK);
     }
+
     @DeleteMapping(value = "/delete")
     public ResponseEntity<?> deleteById() {
         String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
@@ -117,14 +121,4 @@ else if(flag==2)
             return new ResponseEntity<>("No accounts/user found", HttpStatus.NOT_FOUND);
     }
 
-    @GetMapping(value = "/accounts")
-    public ResponseEntity<?> getAllAccounts(){
-        String currentPrincipalName = SecurityContextHolder.getContext().getAuthentication().getName();
-        Customer customerReturned =customerServices.readCustomerByLogin(currentPrincipalName);
-        Long id = customerReturned.getId();
-        if(customerServices.getAllAccounts(id) == null)
-            return new ResponseEntity<>("Customer not found", HttpStatus.NOT_FOUND);
-        else
-            return new ResponseEntity<>(customerServices.getAllAccounts(id), HttpStatus.OK);
-    }
 }

src/main/java/runner/entities/Account.java

@@ -1,7 +1,10 @@
 package runner.entities;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonView;
 import runner.enums.AccountType;
+import runner.views.Views;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 
@@ -15,15 +18,30 @@ public class Account {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+
+    @JsonView(Views.AccountNumber.class)
     private String accountNumber;
-    private String routingNumber;
+
+    @JsonView(Views.AccountDetails.class)
+    private String routingNumber = "091000022";
+
+    @JsonView(Views.AccountType.class)
     @Enumerated(EnumType.STRING)
     private AccountType accountType; //enum
+
+    @JsonView(Views.AccountActions.class)
     private Double balance;
+
+    @JsonView(Views.AccountDetails.class)
     private LocalDate dateOfOpening;
+
+    @JsonView(Views.AccountDetails.class)
     private Double interestRate;
+
+    @JsonView(Views.AllAccounts.class) //delete this later in production
     private String encryptedUrl;
 
+    @JsonView(Views.AccountSpecific.class)
     @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             name = "account_transaction",

src/main/java/runner/entities/Address.java

@@ -1,21 +1,29 @@
 package runner.entities;
 
+import com.fasterxml.jackson.annotation.JsonView;
+import runner.views.Views;
+
 import javax.persistence.*;
 
 @Entity
 public class Address {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+    @JsonView(Views.Address.class)
     @Column(nullable = false)
     private String firstLine;
     @Column(nullable = true)
+    @JsonView(Views.Address.class)
     private String secondLIne;
     @Column(nullable = false)
+    @JsonView(Views.Address.class)
     private String city;
     @Column(nullable = false)
+    @JsonView(Views.Address.class)
     private String state;
     @Column(nullable = false)
+    @JsonView(Views.Address.class)
     private String zipcode;
 
     public Long getId() {

src/main/java/runner/entities/Customer.java

@@ -1,6 +1,9 @@
 package runner.entities;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonView;
+import runner.views.Views;
+
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.util.Set;
@@ -12,20 +15,31 @@ public class Customer {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+    @JsonView(Views.Profile.class)
     @Column(nullable = false)
     private String firstName;
+
+    @JsonView(Views.Profile.class)
     private String middleName;
+    @JsonView(Views.Profile.class)
     @Column(nullable = false)
     private String lastName;
+    @JsonView(Views.Profile.class)
     @Column(nullable = false)
     private LocalDate dateOfBirth;
+
     @Column(nullable = false)
     private String socialSecurity;
+
     @Column(nullable = false)
+    @JsonView(Views.Email.class)
     private String email;
+
+    @JsonView(Views.PhoneNumber.class)
     @Column(nullable = false)
     private String phoneNumber;
 
+    @JsonView(Views.Address.class)
     @OneToOne(cascade = ALL, fetch = FetchType.EAGER)
     private Address address;
     @JsonBackReference(value = "login")

src/main/java/runner/entities/Login.java

@@ -2,9 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonView;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import runner.views.Views;
 
 import javax.persistence.*;
 import java.util.Collection;
@@ -15,8 +17,11 @@ public class Login implements UserDetails {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+
+    @JsonView(Views.Profile.class)
     @Column(nullable = false)
     private String username;
+
     @Column(nullable = false)
     private String password;
 

src/main/java/runner/services/AccountServices.java

@@ -24,6 +24,7 @@ public Set<Account> getAllAccounts(String username){
 
     public Account createAccount(Account account) {
         loggerService.log(Level.INFO, "The customer's new account is being saved");
+        account.setAccountNumber(String.valueOf((Math.floor(Math.random()*1000000000))));
         return accountRepo.save(account);
     }
 

src/main/java/runner/services/CustomerServices.java

@@ -48,7 +48,7 @@ public Customer createCustomer(Customer customer) {
     public Boolean checkLogin(Login login) {
 
         List<String> logins= customerRepo.findAllLoginsNative();
-        long count = logins.stream().filter(name -> name.equals(login.getUsername())).count();
+        long count = logins.stream().filter(name -> name.equalsIgnoreCase(login.getUsername())).count();
         return count!=0 ? true:false;
     }
 

src/main/java/runner/views/Views.java

@@ -0,0 +1,49 @@
+package runner.views;
+
+public class Views {
+
+    public static interface AccountNumber{
+
+    }
+
+    public static interface AccountType{
+
+    }
+
+    public static class AllAccounts implements AccountNumber, AccountType{
+        /*
+        payload: multiple accounts: account number, account balance, account type
+         */
+    }
+
+    public static interface AccountActions{
+        /*
+        payload: account balance
+         */
+    }
+
+    public static class AccountDetails implements AccountNumber, AccountType, AccountActions{
+        /*
+        payload: account balance, interest rate, date of creation, account number, routing number, account type
+         */
+    }
+
+    public static class AccountSpecific implements AccountActions{
+        /*
+        payload: account balance, transactions
+         */
+    }
+
+    public static interface Email{
+    }
+
+    public static interface PhoneNumber{
+    }
+
+    public static interface Address{
+    }
+
+    public static class Profile implements Email, PhoneNumber, Address {
+    }
+
+}