From 336359f267fa1a535a4ae6b5e3a9792797923ce8 Mon Sep 17 00:00:00 2001
From: mirrerror <cayote20@mail.ru>
Date: Mon, 2 Oct 2023 08:26:18 +0300
Subject: [PATCH] optimize code

---
 .../expensetrackerfaf/controller/ExpenseController.java    | 6 +++++-
 .../expensetrackerfaf/controller/IncomeController.java     | 7 ++++++-
 .../expensetrackerfaf/controller/UserController.java       | 6 +++++-
 .../faf223/expensetrackerfaf/service/ExpenseService.java   | 6 +++++-
 .../faf223/expensetrackerfaf/service/IncomeService.java    | 7 ++++++-
 .../com/faf223/expensetrackerfaf/service/UserService.java  | 6 +++++-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
index 9769c9a..21bc61a 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
@@ -15,8 +15,12 @@ import java.util.List;
 @RequestMapping("/expenses")
 public class ExpenseController {
 
+    private final ExpenseService expenseService;
+
     @Autowired
-    private ExpenseService expenseService;
+    public ExpenseController(ExpenseService expenseService) {
+        this.expenseService = expenseService;
+    }
 
     @GetMapping("/user/{userUuid}")
     public ResponseEntity<List<Expense>> getExpensesByUser(@PathVariable String userUuid) {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
index 078c65a..984afe9 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
@@ -14,8 +14,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/incomes")
 public class IncomeController {
+
+    private final IncomeService incomeService;
+
     @Autowired
-    private IncomeService incomeService;
+    public IncomeController(IncomeService incomeService) {
+        this.incomeService = incomeService;
+    }
 
     @GetMapping("/user/{userUuid}")
     public ResponseEntity<List<Income>> getIncomesByUser(@PathVariable String userUuid) {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java
index a9de44e..e1afdcd 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java
@@ -13,8 +13,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/users")
 public class UserController {
 
+    private final UserService userService;
+
     @Autowired
-    private UserService userService;
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
 
     @GetMapping("/{userUuid}")
     public ResponseEntity<User> getUser(@PathVariable String userUuid) {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
index 443ca0d..43a6c14 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
@@ -10,9 +10,13 @@ import java.util.List;
 @Service
 public class ExpenseService {
 
-    @Autowired
     private ExpenseRepository expenseRepository;
 
+    @Autowired
+    public ExpenseService(ExpenseRepository expenseRepository) {
+        this.expenseRepository = expenseRepository;
+    }
+
     public List<Expense> getExpensesByUserId(String userUuid) {
         return expenseRepository.findByUserUserUuid(userUuid);
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
index 5ca97d1..3544d2f 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
@@ -9,9 +9,14 @@ import java.util.List;
 
 @Service
 public class IncomeService {
-    @Autowired
+
     private IncomeRepository incomeRepository;
 
+    @Autowired
+    public IncomeService(IncomeRepository incomeRepository) {
+        this.incomeRepository = incomeRepository;
+    }
+
     public List<Income> getIncomesByUserId(String userUuid) {
         return incomeRepository.findByUserUserUuid(userUuid);
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java b/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java
index e9c3798..e75fc82 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/UserService.java
@@ -8,9 +8,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserService {
 
-    @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    public UserService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
     public User getUserById(String userUuid) {
         return userRepository.findById(userUuid).orElse(null);
     }