Mergeo con rama jorge

CodeURJC-DAW-2019-20 · Feb 23, 2020 · 207b45d · 207b45d
1 parent 1f28461
commit 207b45d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/practica/src/main/java/com/practica/demo/WebController.java b/practica/src/main/java/com/practica/demo/WebController.java
@@ -22,9 +22,12 @@
 import org.springframework.security.web.server.csrf.CsrfToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.practica.demo.data.Games;
 import com.practica.demo.data.user.UserRepository;
 import com.practica.demo.data.user.User;
@@ -89,8 +92,8 @@ public String goLeaderBoard(Model model) {
 
 	@GetMapping("/profile")
 	public String goProfile(Model model, @RequestParam(required = false) int id) {
-
-		Optional<User> usuario = repositoruUser.findById(id);
+		
+		Optional<User> usuario = userRepository.findById(Integer.toString(id));
 
 		if(userComponent.getLoggedUser().getIduser()==usuario.get().getIduser()) {
 			model.addAttribute("myprofile", true);

diff --git a/practica/src/main/java/com/practica/demo/data/user/UserRepository.java b/practica/src/main/java/com/practica/demo/data/user/UserRepository.java
@@ -1,5 +1,7 @@
 package com.practica.demo.data.user;
 
+import java.util.Optional;
+
 import org.springframework.data.repository.CrudRepository;
 
 
@@ -10,4 +12,5 @@ public interface UserRepository extends CrudRepository<User, String> {
 
 	User findByemail(String email);
 
+
 }