Fix merge

Author: OscarArranz

backend/src/main/java/com/youdemy/controller/OrderPController.java

@@ -44,9 +44,6 @@ public class OrderPController {
 	@Autowired
 	private UserService userService;
 
-	@Autowired
-	private OrderPRepository orderRepository;
-	
 	@Autowired
 	private UserRepository userRepository;
 
@@ -67,7 +64,7 @@ public String showOrders(Model model, HttpServletRequest request) {
 			String userName = principal.getName();
 			Optional<User> pUser = userRepository.findByFirstName(userName);
 			long userId = pUser.get().getId();
-			model.addAttribute("orders", orderRepository.findByUser(userId));
+			model.addAttribute("orders", orderService.findByUserId(userId));
 		}
 
 		return "orders";	
@@ -137,7 +134,7 @@ public String createOrder(Model model, @RequestParam long userId ,
 		dbOrder.setUserName(uname);
 		dbOrder.setCourseTitle(ctitle);
 		dbOrder.setDataCard(ccnumber);
-		orderRepository.save(dbOrder);
+		orderService.save(dbOrder);
 
 		model.addAttribute("order", dbOrder);
 		model.addAttribute("user", dbUser);

backend/src/main/java/com/youdemy/controller/UserController.java

@@ -97,7 +97,7 @@ public String showUserInfo(Model model, @PathVariable long id, HttpServletReques
 			if (userId != id) {
 				return "accessDenied";
 			}
-			model.addAttribute("orders", (ArrayList) orderPService.findByUser(userId));
+			model.addAttribute("orders", orderPService.findByUserId(userId));
 			model.addAttribute("user", user);
 		}
 		return "myAccount";