Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,18 @@ public class AuthController {
@PostMapping("/register")
public ResponseEntity<User> register(@RequestBody UserRequest user) {
User newUser = new User();
newUser.setName(user.getName());
newUser.setFirstName(user.getFirstName());
newUser.setLastName(user.getLastName());
newUser.setEmail(user.getEmail());
newUser.setPassword(user.getPassword());
User savedUser=authService.register(newUser);
authEventProducer.sendUserEvent(savedUser.getId(), savedUser.getName(), savedUser.getEmail(),"USER_REGISTERED");
User savedUser = authService.register(newUser);
authEventProducer.sendUserEvent(savedUser.getId(), savedUser.getFirstName() + " " + savedUser.getLastName(),
savedUser.getEmail(), "USER_REGISTERED");
return ResponseEntity.ok(savedUser);
}

@PostMapping("/login")
public ResponseEntity<String> login(@RequestBody UserRequest userRequest) {
return ResponseEntity.ok(authService.login(userRequest));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

@Data
public class UserRequest {
private String name;
private String firstName;
private String lastName;
private String email;
private String password;
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ public class User {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String name;
private String firstName;

private String lastName;

@Column(unique = true)
private String email;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ public ResponseEntity<User> getUserById(@PathVariable Long id) {
@PostMapping
public ResponseEntity<User> createUser(@RequestBody User user) {
User createdUser = userService.createUser(user);
userEventProducer.sendUserCreatedEvent(createdUser.getId(), createdUser.getName(), createdUser.getEmail());
userEventProducer.sendUserCreatedEvent(createdUser.getId(),
createdUser.getFirstName() + " " + createdUser.getLastName(), createdUser.getEmail());
return ResponseEntity.ok(createdUser);
}

@PutMapping("/{id}")
public ResponseEntity<User> updateUser(@PathVariable Long id, @RequestBody User user) {
User updatedUser = userService.updateUser(id, user);
userEventProducer.sendUserUpdatedEvent(updatedUser.getId(), updatedUser.getName(), updatedUser.getEmail());
userEventProducer.sendUserUpdatedEvent(updatedUser.getId(),
updatedUser.getFirstName() + " " + updatedUser.getLastName(), updatedUser.getEmail());
return ResponseEntity.ok(updatedUser);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ public class User {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String name;
private String firstName;
private String lastName;

@Column(unique = true)
private String email;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public User createUser(User user) {
@CacheEvict(value = "users", key = "'all'")
public User updateUser(Long id, User userDetails) {
User existingUser = getUserById(id);
existingUser.setName(userDetails.getName());
existingUser.setFirstName(userDetails.getFirstName());
existingUser.setLastName(userDetails.getLastName());
existingUser.setEmail(userDetails.getEmail());
if (userDetails.getPassword() != null && !userDetails.getPassword().isEmpty()) {
existingUser.setPassword(userDetails.getPassword());
Expand Down
Loading