diff --git a/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java index 69df4a4..18a75b1 100644 --- a/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java +++ b/src/main/java/es/fp/edu/conecta2/controladores/ApiControlador.java @@ -6,27 +6,41 @@ import es.fp.edu.conecta2.servicios.AdminService; import es.fp.edu.conecta2.servicios.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/api") public class ApiControlador { @Autowired private AdminService adminService; + @Autowired private UserService userService; @ResponseStatus(HttpStatus.CREATED) @PostMapping("/admin") public void registrarAdmin(@RequestBody Admin admin){ + adminService.registrar(admin); } @ResponseStatus(HttpStatus.CREATED) @PostMapping("/user") - public void registrarUser(@RequestBody User usuario){ - userService.registrar(usuario); + public User registrarUser(@RequestBody User usuario){ + return this.userService.registrar(usuario); + } + + @Autowired + private UserService servicioUser; + + + @GetMapping() + public List obtenerUsuarios(){ + return servicioUser.listarUser(); } } diff --git a/src/main/java/es/fp/edu/conecta2/servicios/UserService.java b/src/main/java/es/fp/edu/conecta2/servicios/UserService.java index 571c0c6..11b4a6c 100644 --- a/src/main/java/es/fp/edu/conecta2/servicios/UserService.java +++ b/src/main/java/es/fp/edu/conecta2/servicios/UserService.java @@ -12,8 +12,9 @@ public class UserService { @Autowired private IUserRepo repo; - public void registrar(User t){ + public User registrar(User t){ repo.save(t); + return t; } public List listarUser(){