[small]Feature/773

build.gradle.kts

@@ -29,7 +29,7 @@ val cglibVersion by extra("3.3.0")
 val mockitoKotlinVersion by extra("6.1.0")
 
 group = "com.josdem.vetlog"
-version = "3.3.2"
+version = "3.3.3"
 
 configurations {
   compileOnly {

src/main/java/com/josdem/vetlog/controller/VetController.java

@@ -62,7 +62,7 @@ ModelAndView form() {
     ModelAndView search(@Valid UsernameCommand command) {
         log.info("Listing pets");
         var modelAndView = new ModelAndView("vet/list");
-        var user = userService.getByUsername(command.getUsername());
+        var user = userService.getUser(command.getUsername());
         var pets = petService.getPetsByUser(user);
         pets.forEach(pet -> pet.setVaccines(vaccinationService.getVaccinesByStatus(pet, VaccinationStatus.PENDING)));
         modelAndView.addObject("pets", pets);

src/main/java/com/josdem/vetlog/service/UserService.java

@@ -21,7 +21,7 @@
 import java.util.Locale;
 
 public interface UserService {
-    User getByUsername(String username);
+    User getUser(String identifier);
 
     User getByEmail(String email);
 

src/main/java/com/josdem/vetlog/service/impl/UserServiceImpl.java

@@ -44,10 +44,11 @@ public class UserServiceImpl implements UserService {
     private final ApplicationProperties applicationProperties;
     private final EmailService emailService;
 
-    public User getByUsername(String username) {
+    public User getUser(String identifier) {
         return userRepository
-                .findByUsername(username)
-                .or(() -> userRepository.findByMobile(username))
+                .findByUsername(identifier)
+                .or(() -> userRepository.findByMobile(identifier))
+                .or(() -> userRepository.findByEmail(identifier))
                 .orElseThrow(() -> new UserNotFoundException("User " + NOT_FOUND));
     }
 

src/test/java/com/josdem/vetlog/service/UserServiceTest.kt

@@ -75,15 +75,36 @@ internal class UserServiceTest {
     fun `Getting user by username`(testInfo: TestInfo) {
         log.info(testInfo.displayName)
         whenever(userRepository.findByUsername(USERNAME)).thenReturn(Optional.of(user))
-        val result = service.getByUsername(USERNAME)
+        val result = service.getUser(USERNAME)
         assertEquals(user, result)
     }
 
     @Test
-    fun `Not finding user by username`(testInfo: TestInfo) {
+    fun `Getting user by mobile when username not found`(testInfo: TestInfo) {
         log.info(testInfo.displayName)
         whenever(userRepository.findByUsername(USERNAME)).thenReturn(Optional.empty())
-        assertThrows<UserNotFoundException> { service.getByUsername(USERNAME) }
+        whenever(userRepository.findByMobile(USERNAME)).thenReturn(Optional.of(user))
+        val result = service.getUser(USERNAME)
+        assertEquals(user, result)
+    }
+
+    @Test
+    fun `Getting user by email when username and mobile not found`(testInfo: TestInfo) {
+        log.info(testInfo.displayName)
+        whenever(userRepository.findByUsername(USERNAME)).thenReturn(Optional.empty())
+        whenever(userRepository.findByMobile(USERNAME)).thenReturn(Optional.empty())
+        whenever(userRepository.findByEmail(USERNAME)).thenReturn(Optional.of(user))
+        val result = service.getUser(USERNAME)
+        assertEquals(user, result)
+    }
+
+    @Test
+    fun `Not finding user`(testInfo: TestInfo) {
+        log.info(testInfo.displayName)
+        whenever(userRepository.findByUsername(USERNAME)).thenReturn(Optional.empty())
+        whenever(userRepository.findByMobile(USERNAME)).thenReturn(Optional.empty())
+        whenever(userRepository.findByEmail(USERNAME)).thenReturn(Optional.empty())
+        assertThrows<UserNotFoundException> { service.getUser(USERNAME) }
     }
 
     @Test