diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java index 48f80c4..5c43723 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java @@ -26,20 +26,23 @@ public class Expense implements IMoneyTransaction { public Expense() {} + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + @Override public User getUser() { return user; } - public void setUserId(int userId) { + public void setUser(User user) { this.user = user; } - @Override - public long getUserId() { - return 0; - } - @Override public int getAmount() { return amount; diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java index 098c4de..55fbaef 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java +++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java @@ -26,14 +26,21 @@ public class Income implements IMoneyTransaction { public Income() {} - @Override - public User getUser() { - return user; + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public void setUser(User user) { + this.user = user; } @Override - public long getUserId() { - return 0; + public User getUser() { + return user; } @Override diff --git a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java index 7dfe2fd..8817420 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java +++ b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java @@ -5,8 +5,6 @@ import com.faf223.expensetrackerfaf.model.User; public interface IMoneyTransaction { User getUser(); - - long getUserId(); int getAmount(); String getCategory();