136 passed

src/main/java/rocks/zipcode/quiz5/fundamentals/StringUtils.java

@@ -50,9 +50,6 @@ public class StringUtils {
         boolean isContinued = true;
         String[] strArray = str.split("");
         String fin = "";
-        while(isContinued){
-            //if(strArray)
-        }
         return fin;
     }
 

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Account.java

@@ -3,7 +3,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Account extends BankAccount {
+public class Account{
     public Long getId() {
         return null;
     }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/BankAccount.java

@@ -3,7 +3,30 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount {
+public class BankAccount extends Account implements Transactable{
+    private Double balance = 0d;
+
     public void setBalance(Double val) {
+        balance = val;
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+
+           if(amountToIncreaseBy < 0) throw new IllegalArgumentException("Please enter valid number");
+
+           balance += amountToIncreaseBy;
+
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+        if(amountToDecreaseBy > balance || amountToDecreaseBy < 0) throw new IllegalArgumentException("Please enter valid number");
+        balance -= amountToDecreaseBy;
+    }
+
+    @Override
+    public Double getBalance() {
+        return balance;
     }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Employee.java

@@ -3,18 +3,59 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee {
+public class Employee implements Worker, Transactable{
+    private BankAccount bankAccount = new BankAccount();
+    private Double hours = 0d;
+    private Double wage = 35d;
+
     public Employee() {
+
     }
 
     public Employee(BankAccount bankAccount) {
+        this.bankAccount = bankAccount;
     }
 
     public BankAccount getBankAccount() {
-        return null;
+        return bankAccount;
     }
 
     public void setBankAccount(BankAccount bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+        hours += numberOfHours;
+    }
+
+    @Override
+    public Double getHoursWorked() {
+        return hours;
+    }
+
+    @Override
+    public Double getHourlyWage() {
+        return wage;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+        return hours*wage;
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        bankAccount.deposit(amountToIncreaseBy);
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+        bankAccount.withdrawal(amountToDecreaseBy);
+    }
 
+    @Override
+    public Double getBalance() {
+        return bankAccount.getBalance();
     }
 }