Merge updates from master

src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java

@@ -3,6 +3,7 @@ package com.faf223.expensetrackerfaf.service;
 import com.faf223.expensetrackerfaf.model.Expense;
 import com.faf223.expensetrackerfaf.repository.ExpenseRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,7 +14,19 @@ public class ExpenseService {
 
     private final ExpenseRepository expenseRepository;
 
+    public void createOrUpdateExpense(Expense expense) {
+        expenseRepository.save(expense);
+    }
+
     public List<Expense> getExpensesByUserId(String userUuid) {
-        return expenseRepository.findByUserUserUuid(userUuid);
+        return expenseRepository.findByUserUuid(userUuid);
+    }
+
+    public List<Expense> getExpenses() {
+        return expenseRepository.findAll();
+    }
+
+    public Expense getExpenseById(long id) {
+        return expenseRepository.findById(id).orElse(null);
     }
 }

src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java

@@ -3,6 +3,7 @@ package com.faf223.expensetrackerfaf.service;
 import com.faf223.expensetrackerfaf.model.Income;
 import com.faf223.expensetrackerfaf.repository.IncomeRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,7 +14,19 @@ public class IncomeService {
 
     private final IncomeRepository incomeRepository;
 
+    public void createOrUpdateIncome(Income income) {
+        incomeRepository.save(income);
+    }
+
+    public List<Income> getIncomes() {
+        return incomeRepository.findAll();
+    }
+
     public List<Income> getIncomesByUserId(String userUuid) {
-        return incomeRepository.findByUserUserUuid(userUuid);
+        return incomeRepository.findByUserUuid(userUuid);
+    }
+
+    public Income getIncomeById(long id) {
+        return incomeRepository.findById(id).orElse(null);
     }
 }

src/main/java/com/faf223/expensetrackerfaf/service/UserService.java

@@ -3,14 +3,25 @@ package com.faf223.expensetrackerfaf.service;
 import com.faf223.expensetrackerfaf.model.User;
 import com.faf223.expensetrackerfaf.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class UserService {
 
     private final UserRepository userRepository;
 
+    public void createOrUpdateUser(User user) {
+        userRepository.save(user);
+    }
+
+    public List<User> getUsers() {
+        return userRepository.findAll();
+    }
+
     public User getUserById(String userUuid) {
         return userRepository.findById(userUuid).orElse(null);
     }