diff --git a/api/src/main/java/edu/csumb/cst438/api/service/UserService.java b/api/src/main/java/edu/csumb/cst438/api/service/UserService.java index fd2cfc8..19f4d76 100644 --- a/api/src/main/java/edu/csumb/cst438/api/service/UserService.java +++ b/api/src/main/java/edu/csumb/cst438/api/service/UserService.java @@ -26,12 +26,15 @@ public UserService(UserRepository userRepository){ /** * Gets user by email for future oauth stuff + * This also creates the user on the first sign in * @param email user email * @return the user */ public UserResponseDTO getUserByEmail(String email){ User user = userRepository.findByEmail(email) - .orElseThrow(() -> new EntityNotFoundException("No user found for the authenticated account")); + .orElseGet(() -> userRepository.save( + new User(email, email, "USER") + )); return new UserResponseDTO( user.getId(), user.getEmail(), diff --git a/api/src/test/java/edu/csumb/cst438/api/UserServiceTest.java b/api/src/test/java/edu/csumb/cst438/api/UserServiceTest.java index aaa74f0..93d61c9 100644 --- a/api/src/test/java/edu/csumb/cst438/api/UserServiceTest.java +++ b/api/src/test/java/edu/csumb/cst438/api/UserServiceTest.java @@ -190,7 +190,22 @@ void testPatchUserNotFound(){ */ @Test void testGetUserByEmailNotFound(){ - Mockito.when(userRepository.findByEmail("no@gmail.com")).thenReturn(Optional.empty()); - assertThrows(EntityNotFoundException.class, () -> userService.getUserByEmail("no@gmail.com")); + Mockito.when(userRepository.findByEmail("no@gmail.com")) + .thenReturn(Optional.empty()); + + User savedUser = new User("no@gmail.com", "no@gmail.com", "USER"); + + Mockito.when(userRepository.save(any(User.class))) + .thenReturn(savedUser); + + UserResponseDTO result = + userService.getUserByEmail("no@gmail.com"); + + assertNotNull(result); + assertEquals("no@gmail.com", result.email()); + assertEquals("no@gmail.com", result.displayName()); + assertEquals("USER", result.role()); + + Mockito.verify(userRepository).save(any(User.class)); } }