SD/fix/#66 fixed case sensitivity in book search

online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookController.java

@@ -31,14 +31,14 @@ public ResponseEntity<BookDTO> getBookById(@PathVariable("id") Long id){
     }
 
     @PostMapping
-    public ResponseEntity<?> addBook(@Valid @RequestBody BookDTO bookDTO){
+    public ResponseEntity<BookDTO> addBook(@Valid @RequestBody BookDTO bookDTO){
         BookDTO savedBook = bookService.addBook(bookDTO);
         return ResponseEntity.created(URI.create("/api/v1/books/" + savedBook.id()))
                 .body(savedBook);
     }
 
     @DeleteMapping("{id}")
-    public ResponseEntity<?> deleteBookById(@PathVariable("id") Long id){
+    public ResponseEntity<BookDTO> deleteBookById(@PathVariable("id") Long id){
         bookService.deleteBookById(id);
         return ResponseEntity.noContent().build();
     }

online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookService.java

@@ -21,13 +21,15 @@ public class BookService {
 
     private final int maxPageSize;
     private final int maxQueryLength;
+    private final String notFoundMessage;
 
     public BookService(BookDAO bookDAO,
                        @Value("${spring.search.pageable.max-page-size}") int maxPageSize,
                        @Value("${spring.search.max-query-length}") int maxQueryLength) {
         this.bookDAO = bookDAO;
         this.maxPageSize = maxPageSize;
         this.maxQueryLength = maxQueryLength;
+        this.notFoundMessage = "Book with id [%s] not found.";
     }
 
     public Page<BookDTO> getAllBooks(Pageable pageable) {
@@ -39,7 +41,7 @@ public BookDTO getBookById(Long id){
         return BookDTOMapper.INSTANCE.modelToDTO(
                 bookDAO.findById(id)
                 .orElseThrow(
-                () -> new ResourceNotFoundException("Book with id [%s] not found.".formatted(id))
+                () -> new ResourceNotFoundException(notFoundMessage.formatted(id))
         ));
     }
 
@@ -62,7 +64,7 @@ public void deleteBookById(Long id) {
 
         // check if book with id is present
         if(!bookDAO.existsBookById(id)){
-            throw new ResourceNotFoundException("Book with id [%s] not found.".formatted(id));
+            throw new ResourceNotFoundException(notFoundMessage.formatted(id));
         }
 
         bookDAO.deleteBookById(id);
@@ -72,7 +74,7 @@ public BookDTO updateBook(Long id, BookDTO updateRequest) {
 
         Book existingBook = bookDAO.findById(updateRequest.id())
             .orElseThrow(() -> new ResourceNotFoundException(
-                    "Book with id [%s] not found.".formatted(id)
+                    notFoundMessage.formatted(id)
             ));
 
 
@@ -164,6 +166,4 @@ public Page<BookDTO> searchBooks(BookSearchRequestDTO searchRequest, Pageable pa
 
         return bookDAO.searchBooks(query, pageable);
     }
-
-
 }

online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookSpecifications.java

@@ -10,14 +10,22 @@
 public class BookSpecifications {
 
     public Specification<Book> hasTitleLike(String query) {
-        return (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("title"), "%" + query + "%");
+        return (root, criteriaQuery, criteriaBuilder) -> {
+            String lowercaseQuery = "%" + query.toLowerCase() + "%";
+            return criteriaBuilder.like(criteriaBuilder.lower(root.get("title")), lowercaseQuery);
+        };
     }
 
     public Specification<Book> hasAuthorNameLike(String query) {
         return (root, criteriaQuery, criteriaBuilder) -> {
             Join<Book, Author> join = root.join("authors");
-            Predicate firstNamePredicate = criteriaBuilder.like(join.get("firstName"), "%" + query + "%");
-            Predicate lastNamePredicate = criteriaBuilder.like(join.get("lastName"), "%" + query + "%");
+            String lowerCaseQuery = query.toLowerCase();
+
+            Predicate firstNamePredicate = criteriaBuilder.like(
+                    criteriaBuilder.lower(join.get("firstName")), "%" + lowerCaseQuery + "%");
+            Predicate lastNamePredicate = criteriaBuilder.like(
+                    criteriaBuilder.lower(join.get("lastName")), "%" + lowerCaseQuery + "%");
+
             return criteriaBuilder.or(firstNamePredicate, lastNamePredicate);
         };
     }

online-book-store/src/test/java/com/amigoscode/cohort2d/onlinebookstore/book/BookSpecificationsTest.java

@@ -1,6 +1,5 @@
 package com.amigoscode.cohort2d.onlinebookstore.book;
 
-import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.*;
 
 import com.amigoscode.cohort2d.onlinebookstore.author.Author;
@@ -49,19 +48,22 @@ public void shouldCreateTitleLikeSpecification() {
 
     @Test
     public void shouldCreateAuthorNameLikeSpecification() {
-        String query = "tolkien";
+        String query = "Tolkien";
 
         when(root.<Book, Author>join("authors")).thenReturn(join);
 
         Predicate mockFirstNamePredicate = mock(Predicate.class);
         Predicate mockLastNamePredicate = mock(Predicate.class);
         Predicate mockOrPredicate = mock(Predicate.class);
 
-        when(criteriaBuilder.like(join.get("firstName"), "%" + query + "%")).thenReturn(mockFirstNamePredicate);
-        when(criteriaBuilder.like(join.get("lastName"), "%" + query + "%")).thenReturn(mockLastNamePredicate);
+        when(criteriaBuilder.like(
+                criteriaBuilder.lower(
+                        join.get("firstName")), "%" + query.toLowerCase() + "%")).thenReturn(mockFirstNamePredicate);
+        when(criteriaBuilder.like(
+                criteriaBuilder.lower(
+                        join.get("lastName")), "%" + query.toLowerCase() + "%")).thenReturn(mockLastNamePredicate);
 
-        // TODO - fix firstName stubbing argument
-        when(criteriaBuilder.or(mockLastNamePredicate, mockLastNamePredicate)).thenReturn(mockOrPredicate);
+        doReturn(mockOrPredicate).when(criteriaBuilder).or(any(), any());
 
         Predicate actual = underTest.hasAuthorNameLike(query).toPredicate(root, criteriaQuery, criteriaBuilder);