refactor: modify both service and model classes to support unit tests

Author: vianavitor-dev

src/main/java/com/vianavitor/simplelibrarygame/model/BookReadHistory.java

@@ -1,6 +1,7 @@
 package com.vianavitor.simplelibrarygame.model;
 
 import jakarta.persistence.*;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.LocalDate;
 
@@ -24,6 +25,15 @@ public class BookReadHistory {
     @Column(nullable = false)
     private LocalDate lastUpdate = LocalDate.now();
 
+    @Autowired
+    public BookReadHistory() {}
+
+    public BookReadHistory(Book book, Student student) {
+        this.book = book;
+        this.student = student;
+        this.lastUpdate = LocalDate.now();
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/com/vianavitor/simplelibrarygame/model/Classroom.java

@@ -13,8 +13,13 @@ public class Classroom {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToMany(mappedBy = "classrooms")
-    private Set<UserClassroom> users = new HashSet<>();
+    @ManyToMany()
+    @JoinTable(
+            name = "user_classroom",
+            joinColumns = @JoinColumn(name = "user_id"),
+            inverseJoinColumns = @JoinColumn(name = "classroom_id")
+    )
+    private Set<UserClassroom> usersInClassroom = new HashSet<>();
 
     @Column(unique = true)
     private String name;
@@ -31,11 +36,11 @@ public void setId(Long id) {
     }
 
     public Set<UserClassroom> getUsers() {
-        return users;
+        return usersInClassroom;
     }
 
-    public void setUsers(Set<UserClassroom> users) {
-        this.users = users;
+    public void setUsers(Set<UserClassroom> usersInClassroom) {
+        this.usersInClassroom = usersInClassroom;
     }
 
     public String getName() {

src/main/java/com/vianavitor/simplelibrarygame/model/Student.java

@@ -10,7 +10,7 @@
 @Entity
 @DiscriminatorValue("student")
 public class Student extends UserClassroom {
-    @OneToOne(mappedBy = "student", cascade = CascadeType.ALL)
+    @OneToOne(mappedBy = "student", cascade = CascadeType.ALL, orphanRemoval = true)
     private StudentStats stats;
 
     @ManyToMany

src/main/java/com/vianavitor/simplelibrarygame/model/StudentStats.java

@@ -13,7 +13,7 @@ public class StudentStats {
     @JoinColumn(name = "book_read_hisory_id")
     private BookReadHistory currentBook;    // it saves only the history of the last book read by the user
 
-    @OneToOne
+    @OneToOne(cascade = CascadeType.PERSIST)
     @MapsId
     @JoinColumn(name = "user_id")
     private Student student;

src/main/java/com/vianavitor/simplelibrarygame/model/utils/classes/UserClassroom.java

@@ -12,12 +12,7 @@
 
 @Entity
 public abstract class UserClassroom extends User {
-    @ManyToMany
-    @JoinTable(
-            name = "user_classroom",
-            joinColumns = @JoinColumn(name = "user_id"),
-            inverseJoinColumns = @JoinColumn(name = "classroom_id")
-    )
+    @ManyToMany(mappedBy = "usersInClassroom")
     private Set<Classroom> classrooms = new HashSet<>();
 
     @Autowired

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

@@ -3,21 +3,32 @@
 import com.vianavitor.simplelibrarygame.model.Author;
 import com.vianavitor.simplelibrarygame.model.Book;
 import com.vianavitor.simplelibrarygame.repository.AuthorRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
 public class AuthorService {
+    @Autowired
     private AuthorRepository repository;
 
+    private Author author;
+
+    @Autowired
+    public AuthorService() {}
+
+    public AuthorService(AuthorRepository repository, Author author) {
+        this.repository = repository;
+        this.author = author;
+    }
+
     public void add(String name) {
         repository.findByName(name)
                 .ifPresent((a) -> {
                     throw new RuntimeException("author already registered");
                 });
 
-        Author author = new Author();
         author.setName(name);
 
         repository.save(author);

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

@@ -6,13 +6,15 @@
 import com.vianavitor.simplelibrarygame.repository.BookReadHistoryRepository;
 import com.vianavitor.simplelibrarygame.repository.BookRepository;
 import com.vianavitor.simplelibrarygame.repository.StudentRepository;
+import com.vianavitor.simplelibrarygame.repository.StudentStatsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Service
 public class BookReadHistoryService {
@@ -25,6 +27,9 @@ public class BookReadHistoryService {
     @Autowired
     private StudentRepository studentRepository;
 
+    @Autowired
+    private StudentStatsRepository statsRepository;
+
     public void register(BookReadHistory data) {
         Book book = bookRepository.findById(data.getBook().getId())
                 .orElseThrow(() -> new RuntimeException("not found book"));
@@ -43,13 +48,18 @@ public void register(BookReadHistory data) {
             data.setBook(book);
             data.setUser(student);
         } else {
+            int page = data.getLastPageRead();
+
             data = result.get();
+            data.setLastPageRead(page);
         }
 
-        LocalDate now = LocalDate.now();
-        data.setLastUpdate(now);
-        
-        repository.save(data);
+        data.setLastUpdate(LocalDate.now());
+
+        BookReadHistory current = repository.save(data);
+        student.getStats().setCurrentBook(current);
+
+        statsRepository.save(student.getStats());
     }
 
     public List<BookReadHistory> getByStudent(Long studentId) {
@@ -70,9 +80,10 @@ public BookReadHistory getByStudentTheLastOne(Long studentId) {
         Student student = studentRepository.findById(studentId)
                 .orElseThrow(() -> new RuntimeException("not found student"));
 
-        return repository.findByStudent(student)
-                .stream()
-                .findFirst()
-                .orElseGet(BookReadHistory::new);
+        AtomicReference<BookReadHistory> lastOne = new AtomicReference<>();
+        repository.findByStudent(student)
+                .forEach(lastOne::set);
+
+        return lastOne.get();
     }
 }

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

@@ -24,7 +24,10 @@ public class BookService {
     @Autowired
     private GenreRepository genreRepository;
 
-    private static final Map<Long, Book> cache = new HashMap<>();
+    private static final double maxRateValue = 5;
+    private static final double minRateValue = 0;
+
+//    private static final Map<Long, Book> cache = new HashMap<>();
 
     public void add(Book newBook, boolean confirmed) {
         if (!confirmed) {
@@ -74,7 +77,7 @@ public void setAvailable(Long id, boolean value) {
         repository.save(book);
     }
 
-    public void modify(Long id, Book data, boolean confirmed)  {
+    public Book modify(Long id, Book data, boolean confirmed, Map<Long, Book> cache)  {
         // TODO: implement a more efficient way to stores a cache to deal with no long accessed data
         Book book = cache.containsKey(id)
                 ? cache.remove(id)
@@ -87,20 +90,18 @@ public void modify(Long id, Book data, boolean confirmed)  {
 
         boolean isTitleFilledIn = data.getTitle() != null &&  !data.getTitle().isBlank();
 
-//         check if the title is duplicate and the librarian hadn't confirmed the action
+//        check if the title is a duplicate
         if (isTitleFilledIn && !confirmed) {
             List<Book> results = repository.findByTitle(data.getTitle());
 
             if (!results.isEmpty()) {
-//                 if the search returns something it means that this tittle already belongs to another book registered
+//                 if the search returns something it means that this title already belongs to another book registered
                 Optional<Book> duplicateBookTitle = results.stream()
-                        .filter(b -> !Objects.equals(b.getId(), id))
+                        .filter(b -> Objects.equals(b.getId(), id))
                         .findFirst();
 
                 if (duplicateBookTitle.isPresent()) {
-                    throw new RuntimeException("""
-                                there is a book with the same title registered, even so do you wish to proceed?
-                                """);
+                    throw new RuntimeException("there is a book with the same title registered, even so do you wish to proceed?");
                 }
             }
         }
@@ -126,7 +127,7 @@ public void modify(Long id, Book data, boolean confirmed)  {
             book.setBookGenres(bookGenres);
         }
 
-        repository.save(book);
+        return repository.save(book);
     }
 
     private Set<Author> getBookAuthorsHelper(Set<Author> bookAuthors) {

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

@@ -1,5 +1,6 @@
 package com.vianavitor.simplelibrarygame.service;
 
+import com.vianavitor.simplelibrarygame.model.Book;
 import com.vianavitor.simplelibrarygame.model.Classroom;
 import com.vianavitor.simplelibrarygame.model.Professor;
 import com.vianavitor.simplelibrarygame.model.Student;
@@ -26,6 +27,21 @@ public class ClassroomService {
     @Autowired
     private StudentRepository studentRepository;
 
+    private Classroom classroom;
+
+    @Autowired
+    public ClassroomService() { }
+
+    public ClassroomService(
+            ClassroomRepository repository, ProfessorRepository professorRepository,
+            StudentRepository studentRepository, Classroom classroom
+    ) {
+        this.repository = repository;
+        this.professorRepository = professorRepository;
+        this.studentRepository = studentRepository;
+        this.classroom = classroom;
+    }
+
     private String generatePublicCode() {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
@@ -36,23 +52,22 @@ public void create(String name) {
             throw new RuntimeException("this classroom already exists");
         }
 
-        Classroom classroom = new Classroom();
         classroom.setPublicCode(this.generatePublicCode());
         classroom.setName(name);
 
         repository.save(classroom);
     }
 
     public Set<UserClassroom> modifyUsersInClassroom(Long id, Set<UserClassroom> students) {
-        Classroom classroom = repository.findById(id)
+        classroom = repository.findById(id)
                 .orElseThrow(() -> new RuntimeException("classroom not found"));
 
         classroom.setUsers(students);
         return repository.save(classroom).getUsers();
     }
 
-    public boolean changeName(Long id, String name) {
-        Classroom classroom = repository.findById(id)
+    public Classroom changeName(Long id, String name) {
+        classroom = repository.findById(id)
                 .orElseThrow(() -> new RuntimeException("classroom not found"));
 
         boolean exists = repository.findByName(name).isPresent();
@@ -62,28 +77,13 @@ public boolean changeName(Long id, String name) {
 
         classroom.setName(name);
 
-        repository.save(classroom);
-        return true;
+        return repository.save(classroom);
     }
 
     public void delete(Long id) {
-        Classroom classroom = repository.findById(id)
+        classroom = repository.findById(id)
                 .orElseThrow(() -> new RuntimeException("classroom not found"));
 
-        classroom.getUsers().forEach(user -> {
-            Set<Classroom> userClasses = user.getClassrooms();
-            userClasses.remove(classroom);
-
-            if (user instanceof Student) {
-                studentRepository.save((Student) user);
-            }
-            if (user instanceof Professor) {
-                professorRepository.save((Professor) user);
-            }
-
-            user.setClassrooms(userClasses);
-        });
-
         repository.delete(classroom);
     }
 }

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

@@ -10,6 +10,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+
 @Service
 public class GroupOfBookService {
     @Autowired
@@ -21,6 +23,21 @@ public class GroupOfBookService {
     @Autowired
     private GroupRepository groupRepository;
 
+    private GroupOfBook groupOfBook;
+
+    @Autowired
+    public GroupOfBookService() {}
+
+    public GroupOfBookService(
+            GroupOfBookRepository repository, BookRepository bookRepository,
+            GroupRepository groupRepository, GroupOfBook groupOfBook
+    ) {
+        this.repository = repository;
+        this.bookRepository = bookRepository;
+        this.groupRepository = groupRepository;
+        this.groupOfBook = groupOfBook;
+    }
+
     public void addBookToGroup(Long groupId, Long bookId) {
         Group group = groupRepository.findById(groupId)
                 .orElseThrow(() -> new RuntimeException("not found group"));
@@ -34,9 +51,9 @@ public void addBookToGroup(Long groupId, Long bookId) {
                     throw new RuntimeException("book already saved into the group");
                 });
 
-        GroupOfBook groupOfBook = new GroupOfBook();
         groupOfBook.setBook(book);
         groupOfBook.setGroup(group);
+        groupOfBook.setCreatedAt(LocalDate.now());
 
         repository.save(groupOfBook);
     }