restore bidirectional relationship between Serie and Book

komga/src/main/kotlin/org/gotson/komga/domain/model/Book.kt

@@ -11,10 +11,12 @@ import javax.persistence.FetchType
 import javax.persistence.GeneratedValue
 import javax.persistence.Id
 import javax.persistence.JoinColumn
+import javax.persistence.ManyToOne
 import javax.persistence.OneToOne
 import javax.persistence.PrimaryKeyJoinColumn
 import javax.persistence.Table
 import javax.validation.constraints.NotBlank
+import javax.validation.constraints.NotNull
 
 @Entity
 @Table(name = "book")
@@ -35,6 +37,11 @@ class Book(
   @PrimaryKeyJoinColumn
   var id: Long = 0
 
+  @NotNull
+  @ManyToOne(fetch = FetchType.LAZY, optional = false)
+  @JoinColumn(name = "serie_id", nullable = false)
+  lateinit var serie: Serie
+
   @OneToOne(optional = false, orphanRemoval = true, cascade = [CascadeType.ALL], fetch = FetchType.LAZY)
   @JoinColumn(name = "book_metadata_id", nullable = false)
   var metadata: BookMetadata = BookMetadata().also { it.book = this }

komga/src/main/kotlin/org/gotson/komga/domain/model/BookMetadata.kt

@@ -28,9 +28,7 @@ class BookMetadata(
     @Lob
     var thumbnail: ByteArray? = null,
 
-    @ElementCollection(fetch = FetchType.EAGER)
+    pages: Iterable<BookPage> = emptyList()
-    @CollectionTable(name = "book_metadata_page", joinColumns = [JoinColumn(name = "book_metadata_id")])
-    var pages: MutableList<BookPage> = mutableListOf()
 ) {
   @Id
   @GeneratedValue
@@ -40,11 +38,23 @@ class BookMetadata(
   @OneToOne(optional = false, fetch = FetchType.LAZY, mappedBy = "metadata")
   lateinit var book: Book
 
+  @ElementCollection(fetch = FetchType.EAGER)
+  @CollectionTable(name = "book_metadata_page", joinColumns = [JoinColumn(name = "book_metadata_id")])
+  var pages: MutableList<BookPage> = mutableListOf()
+    set(value) {
+      pages.clear()
+      pages.addAll(value)
+    }
+
   fun reset() {
     status = Status.UNKNOWN
     mediaType = null
     thumbnail = null
-    pages = mutableListOf()
+    pages.clear()
+  }
+
+  init {
+    this.pages = pages.toMutableList()
   }
 }
 

komga/src/main/kotlin/org/gotson/komga/domain/model/Serie.kt

@@ -8,8 +8,6 @@ import javax.persistence.Entity
 import javax.persistence.FetchType
 import javax.persistence.GeneratedValue
 import javax.persistence.Id
-import javax.persistence.JoinColumn
-import javax.persistence.JoinTable
 import javax.persistence.OneToMany
 import javax.persistence.Table
 import javax.validation.constraints.NotBlank
@@ -27,7 +25,7 @@ class Serie(
     @Column(name = "file_last_modified", nullable = false)
     var fileLastModified: LocalDateTime,
 
-    books: MutableList<Book>
+    books: Iterable<Book>
 
 ) : AuditableEntity() {
   @Id
@@ -35,15 +33,18 @@ class Serie(
   @Column(name = "id", nullable = false, unique = true)
   var id: Long = 0
 
-  @OneToMany(cascade = [CascadeType.ALL], fetch = FetchType.LAZY, orphanRemoval = true)
+  @OneToMany(cascade = [CascadeType.ALL], fetch = FetchType.LAZY, orphanRemoval = true, mappedBy = "serie")
-  @JoinTable(name = "serie_books_mapping", joinColumns = [JoinColumn(name = "serie_id")], inverseJoinColumns = [JoinColumn(name = "book_id")])
+  private var _books: MutableList<Book> = mutableListOf()
-  var books: MutableList<Book> = mutableListOf()
+
+  var books: List<Book>
+    get() = _books.toList()
     set(value) {
-      books.clear()
+      _books.clear()
-      books.addAll(value)
+      value.forEach { it.serie = this }
+      _books.addAll(value)
     }
 
   init {
-    this.books = books
+    this.books = books.toMutableList()
   }
 }

komga/src/main/kotlin/org/gotson/komga/domain/persistence/BookRepository.kt

@@ -2,16 +2,16 @@ package org.gotson.komga.domain.persistence
 
 import org.gotson.komga.domain.model.Book
 import org.gotson.komga.domain.model.Status
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.net.URL
 
 @Repository
 interface BookRepository : JpaRepository<Book, Long> {
-  //  fun findAllBySerieId(serieId: Long, pageable: Pageable): Page<Book>
+  fun findAllBySerieId(serieId: Long, pageable: Pageable): Page<Book>
-//  fun findAllBySerieIdAndUrlNotIn(serieId: Long, urls: Iterable<URL>): List<Book>
   fun findByUrl(url: URL): Book?
   fun findAllByMetadataStatus(status: Status): List<Book>
-//  fun findAllByMetadataStatusAndSerieId(status: Status, serieId: Long, pageable: Pageable): Page<Book>
+  fun findAllByMetadataStatusAndSerieId(status: Status, serieId: Long, pageable: Pageable): Page<Book>
-//  fun deleteAllBySerieId(serieId: Long)
 }

komga/src/main/kotlin/org/gotson/komga/domain/persistence/SerieRepository.kt

@@ -8,7 +8,6 @@ import java.net.URL
 
 @Repository
 interface SerieRepository : JpaRepository<Serie, Long>, JpaSpecificationExecutor<Serie> {
-  //  fun deleteAllByUrlNotIn(urls: Iterable<URL>)
   fun findByUrlNotIn(urls: Iterable<URL>): List<Serie>
   fun findByUrl(url: URL): Serie?
 }

komga/src/main/kotlin/org/gotson/komga/interfaces/web/SerieController.kt

@@ -53,16 +53,14 @@ class SerieController(
   @GetMapping("{id}/books")
   fun getAllBooksBySerie(
       @PathVariable id: Long,
-      @RequestParam(value = "readyonly", defaultValue = "true") readyFilter: Boolean
+      @RequestParam(value = "readyonly", defaultValue = "true") readyFilter: Boolean,
-//      page: Pageable
+      page: Pageable
-  ): List<BookDto> {
+  ): Page<BookDto> {
-    val serie = serieRepository.findByIdOrNull(id) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
+    if (!serieRepository.existsById(id)) throw ResponseStatusException(HttpStatus.NOT_FOUND)
     return if (readyFilter) {
-//      bookRepository.findAllByMetadataStatusAndSerieId(Status.READY, id, page)
+      bookRepository.findAllByMetadataStatusAndSerieId(Status.READY, id, page)
-      serie.books.filter { it.metadata.status == Status.READY }
     } else {
-//      bookRepository.findAllBySerieId(id, page)
+      bookRepository.findAllBySerieId(id, page)
-      serie.books
     }.map { it.toDto() }
   }
 

komga/src/main/resources/db/migration/V20190819161603__First_Version.sql

@@ -9,6 +9,7 @@ create table book
     name               varchar   not null,
     url                varchar   not null,
     book_metadata_id   bigint    not null,
+    serie_id           bigint    not null,
     primary key (id)
 );
 
@@ -39,26 +40,14 @@ create table serie
     primary key (id)
 );
 
-create table serie_books_mapping
-(
-    serie_id bigint not null,
-    book_id  bigint not null
-);
-
 alter table book
     add constraint uk_book_book_metadata_id unique (book_metadata_id);
 
-alter table serie_books_mapping
-    add constraint UK_ya6l4fjcs4rlhwx1fwqwsmm unique (book_id);
-
 alter table book
     add constraint fk_book_book_metadata_book_metadata_id foreign key (book_metadata_id) references book_metadata (id);
 
+alter table book
+    add constraint fk_book_serie_serie_id foreign key (serie_id) references serie (id);
+
 alter table book_metadata_page
     add constraint fk_book_metadata_page_book_metadata_book_metadata_id foreign key (book_metadata_id) references book_metadata (id);
-
-alter table serie_books_mapping
-    add constraint fk_serie_books_mapping_book_book_id foreign key (book_id) references book (id);
-
-alter table serie_books_mapping
-    add constraint fk_serie_books_mapping_serie_serie_id foreign key (serie_id) references serie (id);