102

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 {
 
     private Long id;
 

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

@@ -3,7 +3,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount implements Transactable{
+public class BankAccount extends Account implements Transactable{
     private Double val;
 
     public Double getVal() {
@@ -15,22 +15,19 @@ public class BankAccount implements Transactable{
         this.val = val;
     }
 
+
     @Override
     public void deposit(Double amountToIncreaseBy) {
-        BankAccount ba = new BankAccount();
-        ba.setBalance(ba.getBalance() + amountToIncreaseBy);
+
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
-        BankAccount ba = new BankAccount();
-        ba.setBalance(ba.getBalance() + amountToDecreaseBy);
 
     }
 
     @Override
     public Double getBalance() {
-
         return null;
     }
 }

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 Transactable {
+public class Employee implements Transactable, Worker {
     private BankAccount bankAccount;
 
     public Employee() {
@@ -37,4 +37,24 @@ public class Employee implements Transactable {
     public Double getBalance() {
         return null;
     }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+
+    }
+
+    @Override
+    public Double getHoursWorked() {
+        return null;
+    }
+
+    @Override
+    public Double getHourlyWage() {
+        return null;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+        return null;
+    }
 }