NCP-3 add UserContent entity #5
@@ -42,6 +42,38 @@ public class UserController {
|
|||||||
return ResponseEntity.ok(allUsers);
|
return ResponseEntity.ok(allUsers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
|
||||||
|
@RequestHeader("Authorization") String tokenHeader) {
|
||||||
|
String token = tokenHeader.replace("Bearer ", "");
|
||||||
|
|
||||||
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
|
||||||
|
|
||||||
|
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
|
||||||
|
|
||||||
|
if (authToken != null) {
|
||||||
|
Optional<User> user = userRepository.findByEmail(email);
|
||||||
|
//TODO add mapper
|
||||||
|
if (user.isPresent()) {
|
||||||
|
UserDTO userDTO = userMapper.toDTO(user.get());
|
||||||
|
userDTO.setEmail(email);
|
||||||
|
userDTO.setFullName(user.get().getFullName());
|
||||||
|
userDTO.setCompany(user.get().getCompany());
|
||||||
|
userDTO.setPhone(user.get().getPhone());
|
||||||
|
userDTO.setGenderType(user.get().getGenderType());
|
||||||
|
userDTO.setBirthday(user.get().getBirthday());
|
||||||
|
userDTO.setCreatedAt(user.get().getCreatedAt());
|
||||||
|
userDTO.setSubscriptionType(user.get().getSubscriptionType());
|
||||||
|
userDTO.setActive(user.get().getIsActive());
|
||||||
|
|
||||||
|
return ResponseEntity.ok(userDTO);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
|
||||||
//TODO fix mapper,doesnot exist all fields
|
//TODO fix mapper,doesnot exist all fields
|
||||||
@PostMapping("/change-password")
|
@PostMapping("/change-password")
|
||||||
public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest,
|
public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest,
|
||||||
|
|||||||
Reference in New Issue
Block a user