SD/feat/#58 Added book delete

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

@@ -32,12 +32,14 @@ public ResponseEntity<?> addBook(@Valid @RequestBody BookDTO bookDTO){
                 .build();
     }
 
+    @DeleteMapping("{id}")
+    public void deleteBookById(@PathVariable("id") Long id){
+        bookService.deleteBookById(id);
+    }
     @PutMapping("{id}")
     public void updateBook(
             @PathVariable("id") Long id,
             @RequestBody BookDTO updateRequest) {
         bookService.updateBook(id, updateRequest);
     }
-
-
 }

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

@@ -11,8 +11,10 @@ public interface BookDAO {
 
     Book addBook(Book book);
 
-    boolean existsBookWithIsbn(String isbn);
+    boolean existsBookByIsbn(String isbn);
 
-    Book updateBook(Book book);
+    boolean existsBookById(Long id);
 
+    void deleteBookById(Long id);
+    Book updateBook(Book book);
 }

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

@@ -29,11 +29,20 @@ public Book addBook(Book book) {
     }
 
     @Override
-    public boolean existsBookWithIsbn(String isbn) throws DuplicateResourceException {
+    public boolean existsBookByIsbn(String isbn) throws DuplicateResourceException {
         return bookRepository.existsBooksByIsbn(isbn);
     }
 
     @Override
+    public boolean existsBookById(Long id) {
+        return bookRepository.existsBookById(id);
+    }
+
+    @Override
+    public void deleteBookById(Long id) {
+        bookRepository.deleteById(id);
+    }
+
     public Book updateBook(Book book) {
         return bookRepository.save(book);
     }

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

@@ -7,4 +7,6 @@
 public interface BookRepository extends JpaRepository<Book, Long> {
 
     boolean existsBooksByIsbn(String isbn);
+
+    boolean existsBookById(Long id);
 }

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

@@ -34,7 +34,7 @@ public BookDTO getBookById(Long id){
     public void addBook(BookDTO request) {
 
         // check if book isbn exists
-        if(bookDAO.existsBookWithIsbn(request.isbn())){
+        if(bookDAO.existsBookByIsbn(request.isbn())){
             throw new DuplicateResourceException(
                     "Book with ISBN [%s] already exists.".formatted(request.isbn())
             );
@@ -45,8 +45,17 @@ public void addBook(BookDTO request) {
 
     }
 
+  public void deleteBookById(Long id) {
 
-    public void updateBook(Long id, BookDTO updateRequest) {
+        // check if book with id is present
+        if(!bookDAO.existsBookById(id)){
+            throw new ResourceNotFoundException("Book with id [%s] not found.".formatted(id));
+        }
+
+        bookDAO.deleteBookById(id);
+  }
+
+  public void updateBook(Long id, BookDTO updateRequest) {
 
         Book existingBook = bookDAO.findById(updateRequest.id())
             .orElseThrow(() -> new ResourceNotFoundException(
@@ -60,7 +69,7 @@ public void updateBook(Long id, BookDTO updateRequest) {
 
         // isbn
         if (!updateRequest.isbn().equals(existingBook.getIsbn())) {
-            if (bookDAO.existsBookWithIsbn(updateRequest.isbn())) {
+            if (bookDAO.existsBookByIsbn(updateRequest.isbn())) {
                 throw new DuplicateResourceException(
                         "Book with ISBN [%s] already exists.".formatted(updateRequest.isbn())
                 );
@@ -117,5 +126,5 @@ public void updateBook(Long id, BookDTO updateRequest) {
 
 
         bookDAO.updateBook(existingBook);
-    }
+  }
 }

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

@@ -84,6 +84,31 @@ void shouldAddBook(){
     }
 
     @Test
+    void shouldDeleteBook() {
+        // Given
+        Long id = 1L;
+
+        // When
+        underTest.deleteBookById(id);
+
+        // Then
+        verify(bookRepository).deleteById(id);
+
+    }
+
+    @Test
+    void checksExistsBookWithId() {
+        // Given
+        Long id = 1L;
+
+        // When
+        underTest.existsBookById(id);
+
+        // Then
+        verify(bookRepository).existsBookById(id);
+
+    }
+
     void shouldUpdateBook(){
         // Given
         Author author = new Author(1L, "Douglas", "Norman");
@@ -115,16 +140,14 @@ void shouldUpdateBook(){
         verify(bookRepository).save(book);
     }
 
-
-
     @Test
     void checksExistsBookWithIsbn() {
 
         // Given
         String isbn = "13043953922";
 
         // When
-        underTest.existsBookWithIsbn(isbn);
+        underTest.existsBookByIsbn(isbn);
 
         // Then
         verify(bookRepository).existsBooksByIsbn(isbn);

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

@@ -5,6 +5,7 @@
 import com.amigoscode.cohort2d.onlinebookstore.author.AuthorRepository;
 import com.amigoscode.cohort2d.onlinebookstore.category.Category;
 import com.amigoscode.cohort2d.onlinebookstore.category.CategoryRepository;
+import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +42,35 @@ void setUp(){
     @Test
     void itShouldCheckIfBookExistsByIsbn() {
         // Given
+        Long id = 1L;
         String isbn = "1234567891234";
 
+        Book book = getBook(id, isbn);
+        underTest.save(book);
+
+        // When
+        boolean actual = underTest.existsBooksByIsbn(isbn);
+
+        // Then
+        assertThat(actual).isTrue();
+    }
+
+    @Test
+    void shouldCheckIfBookExistsById() {
+        // Given
+        Long id = 1L;
+        String isbn = "1234567891234";
+        Book book = getBook(id, isbn);
+        underTest.save(book);
+
+        // When
+        boolean actual = underTest.existsBookById(id);
+
+        // Then
+        assertThat(actual).isTrue();
+    }
+
+    Book getBook(Long id, String isbn) {
         Author author = authorRepository.save(new Author(1L, "Douglas", "Norman"));
         List<Author> authors = new ArrayList<>();
         authors.add(author);
@@ -64,12 +92,6 @@ void itShouldCheckIfBookExistsByIsbn() {
                 authors,
                 categories
         );
-        underTest.save(book);
-
-        // When
-        boolean actual = underTest.existsBooksByIsbn(isbn);
-
-        // Then
-        assertThat(actual).isTrue();
+        return book;
     }
 }

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

@@ -83,8 +83,8 @@ void shouldAddBook() {
 
         // Given
         String isbn = "12043953324";
-        BookDTO request = getBookDTO(null, isbn, "The Lord of the Rings");
-        given(bookDAO.existsBookWithIsbn(isbn)).willReturn(false);
+        BookDTO request = getBookDTO(isbn, null);
+        given(bookDAO.existsBookByIsbn(isbn)).willReturn(false);
 
         // When
         underTest.addBook(request);
@@ -107,7 +107,31 @@ void shouldAddBook() {
     }
 
     @Test
-    void shouldUpdateBook() {
+    void shouldDeleteBookById() {
+        // Given
+        Long id = 1L;
+        given(bookDAO.existsBookById(id)).willReturn(true);
+
+        // When
+        underTest.deleteBookById(id);
+
+        // Then
+        verify(bookDAO).deleteBookById(id);
+    }
+
+    @Test
+    void shouldThrowIfBookNotFoundWhenDeleting() {
+        // Given
+        Long id = 10L;
+
+        // When && Then
+        assertThatThrownBy(() -> underTest.deleteBookById(id))
+                .isInstanceOf(ResourceNotFoundException.class)
+                .hasMessage("Book with id [%s] not found.".formatted(id));
+        verify(bookDAO, never()).deleteBookById(id);
+    }
+
+void shouldUpdateBook() {
         // Given
         Long id = 10L;
         String isbn = "1234567891234";
@@ -196,6 +220,7 @@ void shouldThrowWhenUpdateBookReturnEmptyOptional() {
                 .hasMessage("Book with id [%s] not found.".formatted(id));
     }
 
+
     @Test
     void shouldThrowWhenGetBookReturnEmptyOptional() {
         // Given
@@ -214,7 +239,7 @@ void shouldThrowWhenAddingBookWithExistingIsbn() {
         String isbn = "12043953321";
         BookDTO request = getBookDTO(1L, isbn, "Lord of the Rings");
 
-        given(bookDAO.existsBookWithIsbn(isbn)).willReturn(true);
+        given(bookDAO.existsBookByIsbn(isbn)).willReturn(true);
 
         // When && Then
         assertThatThrownBy(() -> underTest.addBook(request))