Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/main/java/com/ironhack/users_micro/config/AppConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public List<User> getAllUsers() {
@GetMapping("/{id}")
public ResponseEntity<?> getUserById(@PathVariable long id) {
try {
User foundUser = userService.getUserById(id);
ResponseEntity<?> foundUser = userService.getUserById(id);

return new ResponseEntity<>(foundUser, HttpStatus.FOUND);
} catch (UserNotFoundException e) {
return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/ironhack/users_micro/dto/AccountDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.ironhack.users_micro.dto;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class AccountDTO {
private Long id;
private String username;
private Long accountID;
}

28 changes: 28 additions & 0 deletions src/main/java/com/ironhack/users_micro/dto/UserResponseDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.ironhack.users_micro.dto;

import com.ironhack.users_micro.model.User;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserResponseDTO {
private Long id;
private String username;
private Long accountID;
private AccountDTO account;

public UserResponseDTO(User user,AccountDTO account) {
setId(user.getId());
setUsername(user.getUsername());
setAccountID(user.getAccountID());
setAccount(account);

}

}


14 changes: 11 additions & 3 deletions src/main/java/com/ironhack/users_micro/service/UserService.java
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
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;

@Service
public class UserService {
private final UserRepository userRepository;
private final RestTemplate restTemplate;

public UserService(UserRepository userRepository) {
public UserService(UserRepository userRepository, RestTemplate restTemplate) {
this.userRepository = userRepository;
this.restTemplate = restTemplate;
}

public User getUserById(long id){
public ResponseEntity<?> getUserById(long id){
Optional<User> optionalUser = userRepository.findById(id);

if(optionalUser.isPresent()){
return optionalUser.get();
//return optionalUser.get();
AccountDTO accountDTO = restTemplate.getForObject("http://accounts-micro/api/account/" + optionalUser.get().getAccountID(), AccountDTO.class);
UserResponseDTO response= new UserResponseDTO(optionalUser.get(), accountDTO);
return ResponseEntity.ok(response);
}else{
throw new UserNotFoundException("The user was not found");
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
spring.application.name=users-micro
spring.datasource.url=jdbc:mysql://localhost:3306/users_micro
spring.datasource.username=root
spring.datasource.password=admin
spring.datasource.password=mysqlpass
server.port=8080
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
spring.jpa.hibernate.ddl-auto=update
Expand Down