feat: implements last login of user to any of them when logging

Author: vianavitor-dev

src/main/java/com/vianavitor/simplelibrarygame/repository/aux/LoggableUser.java

@@ -11,7 +11,7 @@ public interface LoggableUser {
     // used to get the user's hashed password based on the unique username
     Optional<UserInfo> getIdAndPasswordByUsername(String username);
 
-//    Optional<User> findByUsername(String username);
+    Optional<User> findByUsername(String username);
 
     boolean existsByUsername(String username);
 

src/main/java/com/vianavitor/simplelibrarygame/service/AdministratorService.java

@@ -1,11 +1,14 @@
 package com.vianavitor.simplelibrarygame.service;
 
 import com.vianavitor.simplelibrarygame.dto.utils.UserInfo;
+import com.vianavitor.simplelibrarygame.model.Administrator;
 import com.vianavitor.simplelibrarygame.repository.AdministratorRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+
 @Service
 public class AdministratorService {
     @Autowired
@@ -15,24 +18,27 @@ public class AdministratorService {
     private PasswordEncoder encoder;
 
     public Long login(String username, String password) {
-        UserInfo userInfo = repository.getIdAndPasswordByUsername(username)
+        Administrator administrator = (Administrator) repository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("invalid username or password"));
 
-        boolean invalidPassword = encoder.matches(password, userInfo.password());
+        boolean invalidPassword = encoder.matches(password, administrator.getPassword());
 
         if (invalidPassword) {
             throw new RuntimeException("invalid username or password");
         }
 
-        boolean wasUserDeactivated = userInfo.active();
+        boolean wasUserDeactivated = administrator.isActive();
         if (wasUserDeactivated) {
             throw new RuntimeException("this user was deactivated, talk with a professor or administrador to get more information");
         }
 
         // TODO: create JWT Token for authentication
         // ...
 
-        return userInfo.id();
+        administrator.setLastLogin(LocalDate.now());
+        repository.save(administrator);
+
+        return administrator.getId();
     }
 
 }

src/main/java/com/vianavitor/simplelibrarygame/service/LibrarianService.java

@@ -8,6 +8,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Service
@@ -34,24 +35,27 @@ public Librarian register(Librarian entity) {
 
     @Override
     public Long login(String username, String password) {
-        UserInfo userInfo = repository.getIdAndPasswordByUsername(username)
+        Librarian librarian = (Librarian) repository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("invalid username or password"));
 
-        boolean invalidPassword = encoder.matches(password, userInfo.password());
+        boolean invalidPassword = encoder.matches(password, librarian.getPassword());
 
         if (invalidPassword) {
             throw new RuntimeException("invalid username or password");
         }
 
-        boolean wasUserDeactivated = userInfo.active();
+        boolean wasUserDeactivated = librarian.isActive();
         if (wasUserDeactivated) {
             throw new RuntimeException("this user was deactivated, talk with a professor or administrador to get more information");
         }
 
         // TODO: create JWT Token for authentication
         // ...
 
-        return userInfo.id();
+        librarian.setLastLogin(LocalDate.now());
+        repository.save(librarian);
+
+        return librarian.getId();
     }
 
     public List<Librarian> getAll() {

src/main/java/com/vianavitor/simplelibrarygame/service/ProfessorService.java

@@ -8,6 +8,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Service
@@ -40,24 +41,27 @@ public void register(Professor newProfessor, String classroomCode) {
 
     @Override
     public Long login(String username, String password) {
-        UserInfo userInfo = repository.getIdAndPasswordByUsername(username)
+        Professor professor = (Professor) repository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("invalid username or password"));
 
-        boolean invalidPassword = encoder.matches(password, userInfo.password());
+        boolean invalidPassword = encoder.matches(password, professor.getPassword());
 
         if (invalidPassword) {
             throw new RuntimeException("invalid username or password");
         }
 
-        boolean wasUserDeactivated = userInfo.active();
+        boolean wasUserDeactivated = professor.isActive();
         if (wasUserDeactivated) {
             throw new RuntimeException("this user was deactivated, talk with a professor or administrador to get more information");
         }
 
         // TODO: create JWT Token for authentication
         // ...
 
-        return userInfo.id();
+        professor.setLastLogin(LocalDate.now());
+        repository.save(professor);
+
+        return professor.getId();
     }
 
     private List<Professor> getAll() {

src/main/java/com/vianavitor/simplelibrarygame/service/StudentService.java

@@ -12,6 +12,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
 
@@ -75,24 +76,27 @@ public StudentStats getStats(Long id) {
 
     @Override
     public Long login(String username, String password) {
-        UserInfo userInfo = repository.getIdAndPasswordByUsername(username)
+        Student student = (Student) repository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("invalid username or password"));
 
-        boolean invalidPassword = encoder.matches(password, userInfo.password());
+        boolean invalidPassword = encoder.matches(password, student.getPassword());
 
         if (invalidPassword) {
             throw new RuntimeException("invalid username or password");
         }
 
-        boolean wasUserDeactivated = userInfo.active();
+        boolean wasUserDeactivated = student.isActive();
         if (wasUserDeactivated) {
             throw new RuntimeException("this user was deactivated, talk with a professor or administrador to get more information");
         }
 
         // TODO: create JWT Token for authentication
         // ...
 
-        return userInfo.id();
+        student.setLastLogin(LocalDate.now());
+        repository.save(student);
+
+        return student.getId();
     }
 
     public List<Student> getAll() {