User response + account info

src/main/java/com/ironhack/users_micro/config/AppConfig.java

@@ -0,0 +1,16 @@
+package com.ironhack.users_micro.config;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class AppConfig {
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate(){
+        return new RestTemplate();
+    }
+}

src/main/java/com/ironhack/users_micro/controller/UserController.java

@@ -1,6 +1,7 @@
 package com.ironhack.users_micro.controller;
 
 import com.ironhack.users_micro.dto.UserPatchAccountDTO;
+import com.ironhack.users_micro.dto.UserResponseDTO;
 import com.ironhack.users_micro.exception.UserNotFoundException;
 import com.ironhack.users_micro.model.User;
 import com.ironhack.users_micro.service.UserService;
@@ -27,7 +28,7 @@ public List<User> getAllUsers() {
     @GetMapping("/{id}")
     public ResponseEntity<?> getUserById(@PathVariable long id) {
         try {
-            User foundUser = userService.getUserById(id);
+            UserResponseDTO foundUser = userService.getUserById(id);
             return new ResponseEntity<>(foundUser, HttpStatus.FOUND);
         } catch (UserNotFoundException e) {
             return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);

src/main/java/com/ironhack/users_micro/dto/AccountDTO.java

@@ -0,0 +1,15 @@
+package com.ironhack.users_micro.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccountDTO {
+    private String isbn;
+    private BigDecimal balance;
+}

src/main/java/com/ironhack/users_micro/dto/UserResponseDTO.java

@@ -0,0 +1,15 @@
+package com.ironhack.users_micro.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserResponseDTO {
+    private Long id;
+    private String username;
+    private Long accountID;
+    private AccountDTO accountDTO;
+}

src/main/java/com/ironhack/users_micro/service/UserService.java

@@ -1,11 +1,14 @@
 package com.ironhack.users_micro.service;
 
+import com.ironhack.users_micro.dto.AccountDTO;
+import com.ironhack.users_micro.dto.UserResponseDTO;
 import com.ironhack.users_micro.exception.UserNotFoundException;
 import com.ironhack.users_micro.model.User;
 import com.ironhack.users_micro.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,15 +17,26 @@
 public class UserService {
     private final UserRepository userRepository;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
     public UserService(UserRepository userRepository) {
         this.userRepository = userRepository;
     }
 
-    public User getUserById(long id){
+    public UserResponseDTO getUserById(long id){
         Optional<User> optionalUser = userRepository.findById(id);
 
         if(optionalUser.isPresent()){
-            return optionalUser.get();
+            AccountDTO accountDTO = restTemplate.getForObject("http://accounts-micro/api/account/" + optionalUser.get().getAccountID(), AccountDTO.class);
+
+            UserResponseDTO response = new UserResponseDTO();
+            response.setId(optionalUser.get().getId());
+            response.setAccountID(optionalUser.get().getAccountID());
+            response.setUsername(optionalUser.get().getUsername());
+            response.setAccountDTO(accountDTO);
+
+            return response;
         }else{
             throw new UserNotFoundException("The user was not found");
         }