diff --git a/authService/src/main/java/com/tutorial/authService/controller/AuthController.java b/authService/src/main/java/com/tutorial/authService/controller/AuthController.java index ba65c70..f0aa14c 100644 --- a/authService/src/main/java/com/tutorial/authService/controller/AuthController.java +++ b/authService/src/main/java/com/tutorial/authService/controller/AuthController.java @@ -25,11 +25,13 @@ public class AuthController { @PostMapping("/register") public ResponseEntity 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); } @@ -37,4 +39,4 @@ public ResponseEntity register(@RequestBody UserRequest user) { public ResponseEntity login(@RequestBody UserRequest userRequest) { return ResponseEntity.ok(authService.login(userRequest)); } -} +} diff --git a/authService/src/main/java/com/tutorial/authService/dto/UserRequest.java b/authService/src/main/java/com/tutorial/authService/dto/UserRequest.java index c58870b..2ffccef 100644 --- a/authService/src/main/java/com/tutorial/authService/dto/UserRequest.java +++ b/authService/src/main/java/com/tutorial/authService/dto/UserRequest.java @@ -4,7 +4,8 @@ @Data public class UserRequest { - private String name; + private String firstName; + private String lastName; private String email; private String password; } diff --git a/authService/src/main/java/com/tutorial/authService/models/User.java b/authService/src/main/java/com/tutorial/authService/models/User.java index 51ea6ef..7faaa0e 100644 --- a/authService/src/main/java/com/tutorial/authService/models/User.java +++ b/authService/src/main/java/com/tutorial/authService/models/User.java @@ -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; diff --git a/userService/src/main/java/com/tutorial/userService/controller/UserController.java b/userService/src/main/java/com/tutorial/userService/controller/UserController.java index d070e5f..acb8813 100644 --- a/userService/src/main/java/com/tutorial/userService/controller/UserController.java +++ b/userService/src/main/java/com/tutorial/userService/controller/UserController.java @@ -38,14 +38,16 @@ public ResponseEntity getUserById(@PathVariable Long id) { @PostMapping public ResponseEntity 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 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); } diff --git a/userService/src/main/java/com/tutorial/userService/model/User.java b/userService/src/main/java/com/tutorial/userService/model/User.java index 9fe4207..b38ddec 100644 --- a/userService/src/main/java/com/tutorial/userService/model/User.java +++ b/userService/src/main/java/com/tutorial/userService/model/User.java @@ -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; diff --git a/userService/src/main/java/com/tutorial/userService/services/UserService.java b/userService/src/main/java/com/tutorial/userService/services/UserService.java index 86de67e..86fde90 100644 --- a/userService/src/main/java/com/tutorial/userService/services/UserService.java +++ b/userService/src/main/java/com/tutorial/userService/services/UserService.java @@ -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());