Add series issue 6

README.md

@@ -11,7 +11,7 @@
      <img src="https://codecov.io/gh/Project-Books/books-api/branch/main/graph/badge.svg?token=5OF8MVDZW7"/>
   </a>
 
-  <a href="https://join.slack.com/t/teambookproject/shared_invite/zt-ojsgamu9-O4v~714y6G1_0o7HtTZDqw">
+  <a href="https://join.slack.com/t/teambookproject/shared_invite/zt-punc8os7-Iz9PTCAkYcO_0S~XwtO5_A">
     <img src="https://img.shields.io/badge/slack-teambookproject-4A154B?logo=slack" alt="Slack" />
   </a>
 

build.gradle

@@ -1,12 +1,19 @@
+buildscript {
+	dependencies {
+		classpath 'com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-gradle:4.5.2'
+	}
+}
+
 plugins {
 	id 'org.springframework.boot' version '2.4.3'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 	id 'jacoco'
-	id "com.netflix.dgs.codegen" version "4.0.10"
 	id "org.flywaydb.flyway" version "7.5.4"
 }
 
+apply plugin: 'com.netflix.dgs.codegen'
+
 group = 'com.karankumar'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '11'
@@ -33,7 +40,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
     	implementation "org.flywaydb:flyway-core:7.5.4"
-    	// https://mvnrepository.com/artifact/commons-validator/commons-validator
     	implementation "commons-validator:commons-validator:1.7"
 
     	compileOnly 'org.projectlombok:lombok'

src/main/java/com/karankumar/booksapi/BooksApiApplication.java

@@ -29,7 +29,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
-import java.util.List;
 import java.util.Set;
 
 @SpringBootApplication
@@ -44,7 +43,6 @@ public CommandLineRunner populateData(AuthorRepository authorRepository,
                                           PublisherRepository publisherRepository) {
         return args -> {
             Publisher publisher = new Publisher("Bloomsbury");
-            publisherRepository.save(publisher);
 
             Book book1 = createBook(
                     "Harry Potter and the Philosopher's stone",
@@ -77,6 +75,8 @@ public CommandLineRunner populateData(AuthorRepository authorRepository,
             Author author = new Author("J.K. Rowling", Set.of(book1, book2, book3));
             author.setAbout("A fantastic author");
             authorRepository.save(author);
+
+            publisherRepository.save(publisher);
         };
     }
 

src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java

@@ -15,6 +15,7 @@
 
 package com.karankumar.booksapi.datafetchers;
 
+import com.karankumar.booksapi.DgsConstants;
 import com.karankumar.booksapi.model.Book;
 import com.karankumar.booksapi.service.BookService;
 import com.netflix.graphql.dgs.DgsComponent;
@@ -31,23 +32,23 @@ public BookDataFetcher(BookService bookService) {
         this.bookService = bookService;
     }
 
-    @DgsData(parentType = "Query", field = "findAllBooks")
+    @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindAllBooks)
     public List<Book> findAllBooks() {
         return bookService.findAll();
     }
 
-    @DgsData(parentType = "Query", field = "findBookByIsbn13")
-    public Book findBookByIsbn13(@InputArgument("isbn13") String isbn13) {
+    @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindBookByIsbn13)
+    public Book findBookByIsbn13(@InputArgument(DgsConstants.BOOK.Isbn13) String isbn13) {
         return bookService.findBookByIsbn13(isbn13);
     }
 
-    @DgsData(parentType = "Query", field = "findByAuthor")
-    public List<Book> findByAuthor(@InputArgument("fullName") String fullName) {
+    @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByAuthor)
+    public List<Book> findByAuthor(@InputArgument(DgsConstants.AUTHOR.FullName) String fullName) {
         return bookService.findByAuthor(fullName);
     }
 
-    @DgsData(parentType = "Query", field = "findByTitleIgnoreCase")
-    public Book findByTitle(@InputArgument("title") String title) {
+    @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByTitleIgnoreCase)
+    public Book findByTitle(@InputArgument(DgsConstants.BOOK.Title) String title) {
         return bookService.findByTitle(title);
     }
 }

src/main/java/com/karankumar/booksapi/model/Book.java

@@ -30,7 +30,10 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 @Entity
@@ -75,6 +78,9 @@ public class Book {
     @Column(nullable = false)
     private BookFormat format;
 
+    @OneToMany(mappedBy = "book")
+    private List<BookSeriesMapping> bookSeriesMapping;
+
     public Book(@NonNull String title, @NonNull Language language, @NonNull String blurb,
                 @NonNull BookGenre genre, @NonNull BookFormat format) {
         this.title = title;

src/main/java/com/karankumar/booksapi/model/BookSeries.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021  Karan Kumar
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.karankumar.booksapi.model;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.NonNull;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class BookSeries {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Setter(AccessLevel.NONE)
+    private Long id;
+
+    @Column(nullable = false, name = "series_name")
+    private String seriesName;
+
+    @OneToMany(mappedBy = "bookSeries")
+    private List<BookSeriesMapping> bookSeriesMapping;
+
+    public BookSeries(@NonNull String seriesName){
+        this.seriesName = seriesName;
+    }
+}

src/main/java/com/karankumar/booksapi/model/BookSeriesMapping.java

@@ -0,0 +1,60 @@
+/*
+The book project lets a user keep track of different books they would like to read, are currently reading, have read or did not finish.
+Copyright (C) 2020  Karan Kumar
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.
+If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package com.karankumar.booksapi.model;
+
+import lombok.*;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Table(
+        name="Book_To_BookSeries_Mapping",
+        uniqueConstraints = {
+                @UniqueConstraint(
+                        name = "UK_bookSeriesId_bookId",
+                        columnNames = {"book_series_id","book_id"}
+                ),
+                @UniqueConstraint(
+                        name = "UK_bookSeriesId_serialNumber",
+                        columnNames = {"book_series_id","serial_number"}
+                )
+        }
+)
+public class BookSeriesMapping {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Setter(AccessLevel.NONE)
+    private Long id;
+
+    @ManyToOne(optional = false)
+    private BookSeries bookSeries;
+
+    @ManyToOne(optional = false)
+    private Book book;
+
+    @Column(nullable = false, name = "serial_number")
+    private Integer seriesPosition;
+
+    public BookSeriesMapping(@NonNull BookSeries bookSeries, @NonNull Book bookInSeries,
+                             @NonNull Integer seriesPosition) {
+        this.bookSeries = bookSeries;
+        this.book = bookInSeries;
+        this.seriesPosition = seriesPosition;
+    }
+}

src/main/java/com/karankumar/booksapi/mutations/AuthorMutation.java

@@ -15,6 +15,7 @@
 
 package com.karankumar.booksapi.mutations;
 
+import com.karankumar.booksapi.DgsConstants;
 import com.karankumar.booksapi.model.Author;
 import com.karankumar.booksapi.service.AuthorService;
 import com.netflix.graphql.dgs.DgsComponent;
@@ -31,9 +32,9 @@ public AuthorMutation(AuthorService authorService) {
         this.authorService = authorService;
     }
 
-    @DgsData(parentType = "Mutation", field = "addAuthor")
+    @DgsData(parentType = DgsConstants.MUTATION.TYPE_NAME, field = DgsConstants.MUTATION.AddAuthor)
     public Author addAuthor(DataFetchingEnvironment dataFetchingEnvironment) {
-        String fullName = dataFetchingEnvironment.getArgument("fullName");
+        String fullName = dataFetchingEnvironment.getArgument(DgsConstants.AUTHOR.FullName);
         return authorService.save(new Author(fullName, new HashSet<>()));
     }
 }

src/main/java/com/karankumar/booksapi/mutations/BookMutation.java

@@ -15,6 +15,7 @@
 
 package com.karankumar.booksapi.mutations;
 
+import com.karankumar.booksapi.DgsConstants;
 import com.karankumar.booksapi.exception.InvalidISBN10Exception;
 import com.karankumar.booksapi.exception.InvalidISBN13Exception;
 import com.karankumar.booksapi.model.Book;
@@ -37,29 +38,30 @@ public BookMutation(BookService bookService) {
     }
 
     // TODO: change this to update a book rather than updating a specific field
-    @DgsData(parentType = "Mutation", field = "addIsbn13")
+    @DgsData(parentType = DgsConstants.MUTATION.TYPE_NAME, field = DgsConstants.MUTATION.AddIsbn13)
     public Book addIsbn13(DataFetchingEnvironment dataFetchingEnvironment)
             throws InvalidISBN10Exception, InvalidISBN13Exception {
         Optional<Book> optionalBook = bookService.findById(
-                dataFetchingEnvironment.getArgument("bookId")
+                dataFetchingEnvironment.getArgument(DgsConstants.BOOK.Id)
         );
 
         if (optionalBook.isEmpty()) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, NOT_FOUND_ERROR_MESSAGE);
         }
 
-        String isbn13 = dataFetchingEnvironment.getArgument("isbn13");
+        String isbn13 = dataFetchingEnvironment.getArgument(DgsConstants.BOOK.Isbn13);
         Book book = optionalBook.get();
         book.setIsbn13(isbn13);
         return bookService.save(optionalBook.get());
     }
 
-    @DgsData(parentType = "Mutation", field = "deleteBook")
+    @DgsData(parentType = DgsConstants.MUTATION.TYPE_NAME, field = DgsConstants.MUTATION.DeleteBook)
     public Book deleteBook(DataFetchingEnvironment dataFetchingEnvironment) {
-        Long id = dataFetchingEnvironment.getArgument("bookId");
-        if (id == null) {
+        String stringId = dataFetchingEnvironment.getArgument(DgsConstants.BOOK.Id);
+        if (stringId == null) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, NOT_FOUND_ERROR_MESSAGE);
         }
+        Long id = Long.parseLong(stringId);
 
         Optional<Book> book = bookService.findById(id);
         if (book.isEmpty()) {

src/main/java/com/karankumar/booksapi/repository/BookRepository.java

@@ -16,6 +16,8 @@
 package com.karankumar.booksapi.repository;
 
 import com.karankumar.booksapi.model.Book;
+import com.karankumar.booksapi.model.BookSeries;
+import com.karankumar.booksapi.model.BookSeriesMapping;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
@@ -32,4 +34,11 @@ public interface BookRepository extends CrudRepository<Book, Long> {
     Book findBookByIsbn13(String isbn13);
 
     Book findByTitleIgnoreCase(String title);
+
+    @Query("SELECT a.bookSeries FROM BookSeriesMapping a WHERE a.book = ?1")
+    List<BookSeries> getAllBookSeriesForBook(Book book);
+
+    @Query("SELECT a.seriesPosition FROM BookSeriesMapping a WHERE a.book = ?1 AND a.bookSeries = ?2")
+    Integer getBookPositionInBookSeries(Book book, BookSeries bookSeries);
+
 }

src/main/java/com/karankumar/booksapi/repository/BookSeriesMappingRepository.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021  Karan Kumar
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.karankumar.booksapi.repository;
+
+import com.karankumar.booksapi.model.Book;
+import com.karankumar.booksapi.model.BookSeries;
+import com.karankumar.booksapi.model.BookSeriesMapping;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+public interface BookSeriesMappingRepository extends CrudRepository<BookSeriesMapping, Long> {
+    @Query("SELECT a.book FROM BookSeriesMapping a WHERE a.bookSeries = ?1")
+    List<Book> getAllBooksByBookSeries(BookSeries bookSeries);
+}

src/main/java/com/karankumar/booksapi/repository/BookSeriesRepository.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021  Karan Kumar
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.karankumar.booksapi.repository;
+
+import com.karankumar.booksapi.model.BookSeries;
+import org.springframework.data.repository.CrudRepository;
+
+public interface BookSeriesRepository extends CrudRepository<BookSeries, Long> {
+}