done

src/main/java/rocks/zipcode/quiz5/collections/Bank.java

@@ -2,18 +2,28 @@ package rocks.zipcode.quiz5.collections;
 
 import rocks.zipcode.quiz5.objectorientation.account.BankAccount;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author leon on 27/12/2018.
  */
 public class Bank {
+
+    List<BankAccount> accounts;
+
+    public Bank(){ accounts = new ArrayList<>(); }
+
     public BankAccount removeBankAccountByIndex(Integer indexNumber) {
+        accounts.remove((int)indexNumber);
         return null;
     }
 
     public void addBankAccount(BankAccount bankAccount) {
+        accounts.add(bankAccount);
     }
 
     public Boolean containsBankAccount(BankAccount bankAccount) {
-        throw new UnsupportedOperationException("Method not yet implemented");
+       return accounts.contains(bankAccount);
     }
 }

src/main/java/rocks/zipcode/quiz5/collections/Food.java

@@ -13,13 +13,13 @@ public class Food {
         return spices;
     }
 
-    public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
-        Map<SpiceType, Integer> count = new HashMap<>();
+    public <SpiceType extends Class<? extends Spice>> Map<Class<? extends Spice> , Integer> getSpiceCount() {
+        Map<Class<? extends Spice>, Integer> count = new HashMap<>();
         for(Spice s : spices) {
             if (count.containsKey(s.getClass()))
-                count.put((SpiceType)s.getClass(), count.get(s) + 1);
+                count.put(s.getClass(), count.get(s.getClass()) + 1);
             else
-                count.put((SpiceType)s.getClass(), 1);
+                count.put(s.getClass(), 1);
         }
         return count;
     }

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

@@ -36,7 +36,7 @@ public class Calculator {
     }
 
     public static Double subtract(Double value1, Double value2) {
-        return DoubleRounder.round(value1 + value2, 2);
+        return value1 - value2;
     }
 
 

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

@@ -4,7 +4,15 @@ package rocks.zipcode.quiz5.objectorientation.account;
  * @author leon on 27/12/2018.
  */
 public class BankAccount extends Account implements Transactable{
+
     private Double balance;
+
+    public BankAccount(){
+        balance = 0.0;
+    }
+    public BankAccount(Double balance){
+        this.balance = balance;
+    }
     public void setBalance(Double val) {
         balance = val;
     }

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

@@ -3,7 +3,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee implements Worker{
+public class Employee implements Worker, Transactable{
     Double hourlyWage;
     Double hoursWorked;
     Double balance;
@@ -13,12 +13,13 @@ public class Employee implements Worker{
          hourlyWage = 35.0;
          hoursWorked = 0.0;
          balance = 0.0;
-         bankAccount.setBalance(0.0);
+         bankAccount = new BankAccount(0.0);
     }
 
     public Employee(BankAccount bankAccount) {
         this();
         this.bankAccount = bankAccount;
+        balance = bankAccount.getBalance();
     }
 
     public BankAccount getBankAccount() {
@@ -27,6 +28,7 @@ public class Employee implements Worker{
 
     public void setBankAccount(BankAccount bankAccount) {
         this.bankAccount = bankAccount;
+        balance = bankAccount.getBalance();
     }
 
     @Override
@@ -48,4 +50,21 @@ public class Employee implements Worker{
     public Double getMoneyEarned() {
         return hourlyWage * hoursWorked;
     }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        balance += amountToIncreaseBy;
+        bankAccount.deposit(amountToIncreaseBy);
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+        balance -= amountToDecreaseBy;
+        bankAccount.withdrawal(amountToDecreaseBy);
+    }
+
+    @Override
+    public Double getBalance() {
+        return balance;
+    }
 }