byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update controllers and services

Browse Source
This commit is contained in:
mirrerror
2023-10-02 08:58:17 +03:00
parent 51b5537558
commit 16d74c0ab6
6 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
View File

@@ -49,7 +49,7 @@ public class ExpenseController {
}
}
@GetMapping("/user/{userUuid}")
@GetMapping("/{userUuid}")
public ResponseEntity<List<Expense>> getExpensesByUser(@PathVariable String userUuid) {
List<Expense> expenses = expenseService.getExpensesByUserId(userUuid);
if (!expenses.isEmpty()) return ResponseEntity.ok(expenses);

42
src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
View File

@@ -4,10 +4,8 @@ import com.faf223.expensetrackerfaf.model.Income;
import com.faf223.expensetrackerfaf.service.IncomeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -22,14 +20,40 @@ public class IncomeController {
this.incomeService = incomeService;
}
@GetMapping("/user/{userUuid}")
public ResponseEntity<List<Income>> getIncomesByUser(@PathVariable String userUuid) {
List<Income> incomes = incomeService.getIncomesByUserId(userUuid);
if (!incomes.isEmpty()) {
return ResponseEntity.ok(incomes);
@GetMapping()
public ResponseEntity<List<Income>> getAllIncomes() {
List<Income> incomes = incomeService.getIncomes();
if (!incomes.isEmpty()) return ResponseEntity.ok(incomes);
else return ResponseEntity.notFound().build();
}
@PostMapping()
public ResponseEntity<Income> createNewIncome(@ModelAttribute("income") Income income,
BindingResult bindingResult) {
if (!bindingResult.hasErrors()) {
incomeService.createOrUpdateIncome(income);
return ResponseEntity.ok(income);
} else {
return ResponseEntity.notFound().build();
}
}
@PatchMapping()
public ResponseEntity<Income> updateIncome(@ModelAttribute("income") Income income,
BindingResult bindingResult) {
if (!bindingResult.hasErrors()) {
incomeService.createOrUpdateIncome(income);
return ResponseEntity.ok(income);
} else {
return ResponseEntity.notFound().build();
}
}
@GetMapping("/{userUuid}")
public ResponseEntity<List<Income>> getIncomesByUser(@PathVariable String userUuid) {
List<Income> incomes = incomeService.getIncomesByUserId(userUuid);
if (!incomes.isEmpty()) return ResponseEntity.ok(incomes);
else return ResponseEntity.notFound().build();
}
}

66
src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java
View File

@@ -1,66 +0,0 @@
//package com.faf223.expensetrackerfaf.controller;
//
//import com.faf223.expensetrackerfaf.model.Expense;
//import com.faf223.expensetrackerfaf.model.Income;
//import com.faf223.expensetrackerfaf.model.Role;
//import com.faf223.expensetrackerfaf.model.User;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//
//@RestController
//public class MainController {
//
// @GetMapping("/")
// public String helloWorld() {
// return "Hello, World!";
// }
//
// @GetMapping("/users/get/{id}")
// public User getUser(@PathVariable int id) {
// return new User(id, "Test", null, null, null, null, null, null);
// }
//
// @PostMapping("/users/set/{id}/name")
// public String setName(@PathVariable int id,
// @RequestParam("name") String name) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/email")
// public String setEmail(@PathVariable int id,
// @RequestParam("email") String email) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/login")
// public String setLogin(@PathVariable int id,
// @RequestParam("login") String login) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/password")
// public String setPassword(@PathVariable int id,
// @RequestParam("password") String password) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/role")
// public String setRole(@PathVariable int id,
// @RequestParam("role") Role role) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/expenses")
// public String setExpenses(@PathVariable int id,
// @RequestParam("expenses") List<Expense> expenses) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
// @PostMapping("/users/set/{id}/incomes")
// public String setIncomes(@PathVariable int id,
// @RequestParam("incomes")List<Income> incomes) {
// throw new UnsupportedOperationException("Waiting for the DB.");
// }
//
//}

42
src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java
View File

@@ -4,10 +4,10 @@ import com.faf223.expensetrackerfaf.model.User;
import com.faf223.expensetrackerfaf.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/users")
@@ -20,14 +20,40 @@ public class UserController {
this.userService = userService;
}
@GetMapping("/{userUuid}")
public ResponseEntity<User> getUser(@PathVariable String userUuid) {
User user = userService.getUserById(userUuid);
if (user != null) {
@GetMapping()
public ResponseEntity<List<User>> getAllUsers() {
List<User> users = userService.getUsers();
if (!users.isEmpty()) return ResponseEntity.ok(users);
else return ResponseEntity.notFound().build();
}
@PostMapping()
public ResponseEntity<User> createNewUser(@ModelAttribute("user") User user,
BindingResult bindingResult) {
if (!bindingResult.hasErrors()) {
userService.createOrUpdateUser(user);
return ResponseEntity.ok(user);
} else {
return ResponseEntity.notFound().build();
}
}
@PatchMapping()
public ResponseEntity<User> updateUser(@ModelAttribute("user") User user,
BindingResult bindingResult) {
if (!bindingResult.hasErrors()) {
userService.createOrUpdateUser(user);
return ResponseEntity.ok(user);
} else {
return ResponseEntity.notFound().build();
}
}
@GetMapping("/{userUuid}")
public ResponseEntity<User> getUser(@PathVariable String userUuid) {
User user = userService.getUserById(userUuid);
if (user != null) return ResponseEntity.ok(user);
else return ResponseEntity.notFound().build();
}
}