Fix mapper + DTO

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

@@ -34,7 +34,7 @@ public class AuthenticationService {
                 .password(passwordEncoder.encode(request.getPassword()))
                 .username(request.getUsername())
                 .build();
-        System.out.println(user);
+//        System.out.println(user);
         userRepository.save(user);
         Credential credential = new Credential(user, request.getEmail(), passwordEncoder.encode(request.getPassword()));
         credentialRepository.save(credential);
@@ -48,7 +48,7 @@ public class AuthenticationService {
     public AuthenticationResponse authenticate(AuthenticationRequest request) {
         authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(request.getEmail(), request.getPassword()));
 
-         Credential credential = credentialRepository.findByEmail(request.getEmail()).orElseThrow((() -> new UsernameNotFoundException("User not found")));
+        Credential credential = credentialRepository.findByEmail(request.getEmail()).orElseThrow((() -> new UsernameNotFoundException("User not found")));
 
         String jwtToken = jwtService.generateToken(new PersonDetails(credential));
         return AuthenticationResponse.builder()

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

@@ -1,25 +1,36 @@
 package com.faf223.expensetrackerfaf.service;
 
 import com.faf223.expensetrackerfaf.model.Expense;
+import com.faf223.expensetrackerfaf.model.User;
 import com.faf223.expensetrackerfaf.repository.ExpenseRepository;
+import com.faf223.expensetrackerfaf.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 public class ExpenseService {
 
     private final ExpenseRepository expenseRepository;
+    private final UserRepository userRepository;
 
     public void createOrUpdateExpense(Expense expense) {
         expenseRepository.save(expense);
     }
 
     public List<Expense> getExpensesByUserId(String userUuid) {
-        return expenseRepository.findByUserUuid(userUuid);
+
+        Optional<User> user = userRepository.getUserByUserUuid(userUuid);
+        if (user.isPresent()) {
+            return expenseRepository.findByUser(user.get());
+        }
+
+        return new ArrayList<>();
     }
 
     public List<Expense> getExpenses() {

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

@@ -1,18 +1,23 @@
 package com.faf223.expensetrackerfaf.service;
 
 import com.faf223.expensetrackerfaf.model.Income;
+import com.faf223.expensetrackerfaf.model.User;
 import com.faf223.expensetrackerfaf.repository.IncomeRepository;
+import com.faf223.expensetrackerfaf.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 public class IncomeService {
 
     private final IncomeRepository incomeRepository;
+    private final UserRepository userRepository;
 
     public void createOrUpdateIncome(Income income) {
         incomeRepository.save(income);
@@ -23,7 +28,13 @@ public class IncomeService {
     }
 
     public List<Income> getIncomesByUserId(String userUuid) {
-        return incomeRepository.findByUserUuid(userUuid);
+
+        Optional<User> user = userRepository.getUserByUserUuid(userUuid);
+        if (user.isPresent()) {
+            return incomeRepository.findByUser(user.get());
+        }
+
+        return new ArrayList<>();
     }
 
     public Income getIncomeById(long id) {