update expense serivce, controller

src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java

@@ -4,10 +4,8 @@ import com.faf223.expensetrackerfaf.model.Expense;
 import com.faf223.expensetrackerfaf.service.ExpenseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -22,14 +20,40 @@ public class ExpenseController {
         this.expenseService = expenseService;
     }
 
-    @GetMapping("/user/{userUuid}")
+    @GetMapping()
-    public ResponseEntity<List<Expense>> getExpensesByUser(@PathVariable String userUuid) {
+    public ResponseEntity<List<Expense>> getAllExpenses() {
-        List<Expense> expenses = expenseService.getExpensesByUserId(userUuid);
+        List<Expense> expenses = expenseService.getExpenses();
-        if (!expenses.isEmpty()) {
+        if (!expenses.isEmpty()) return ResponseEntity.ok(expenses);
-            return ResponseEntity.ok(expenses);
+        else return ResponseEntity.notFound().build();
+    }
+
+    @PostMapping()
+    public ResponseEntity<Expense> createNewExpense(@ModelAttribute("expense") Expense expense,
+                         BindingResult bindingResult) {
+        if (!bindingResult.hasErrors()) {
+            expenseService.createOrUpdateExpense(expense);
+            return ResponseEntity.ok(expense);
         } else {
             return ResponseEntity.notFound().build();
         }
     }
+
+    @PatchMapping()
+    public ResponseEntity<Expense> updateExpense(@ModelAttribute("expense") Expense expense,
+                                                 BindingResult bindingResult) {
+        if (!bindingResult.hasErrors()) {
+            expenseService.createOrUpdateExpense(expense);
+            return ResponseEntity.ok(expense);
+        } else {
+            return ResponseEntity.notFound().build();
+        }
+    }
+
+    @GetMapping("/user/{userUuid}")
+    public ResponseEntity<List<Expense>> getExpensesByUser(@PathVariable String userUuid) {
+        List<Expense> expenses = expenseService.getExpensesByUserId(userUuid);
+        if (!expenses.isEmpty()) return ResponseEntity.ok(expenses);
+        else return ResponseEntity.notFound().build();
+    }
 }
 

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

@@ -17,7 +17,15 @@ public class ExpenseService {
         this.expenseRepository = expenseRepository;
     }
 
+    public void createOrUpdateExpense(Expense expense) {
+        expenseRepository.save(expense);
+    }
+
     public List<Expense> getExpensesByUserId(String userUuid) {
         return expenseRepository.findByUserUserUuid(userUuid);
     }
+
+    public List<Expense> getExpenses() {
+        return expenseRepository.findAll();
+    }
 }