Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel

# Conflicts:
#	src/main/resources/application.properties

.gitignore

@@ -32,3 +32,5 @@ build/
 
 ### VS Code ###
 .vscode/
+
+!**/src/main/resources/application.properties

src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java

@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ExpenseTrackerFafApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(ExpenseTrackerFafApplication.class, args);
     }

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;

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

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();