progress

server/src/main/kotlin/books/db/schema/BookDAO.kt

@@ -12,11 +12,13 @@ object BooksTable : IntIdTable("books") {
     var originalTitle = varchar("original_title", 150).nullable()
     var year = integer("year")
     var originalYear = integer("original_year").nullable()
-    var language = varchar("language", 2)
+    var language = integer("language")
     var isbn = varchar("isbn", 13).index()
     var publisher = reference("publisher_id", PublisherTable.id)
     var series = optReference("series_id", SeriesTable.id)
     var seriesIndex = integer("seriesIndex").nullable()
+    var type = integer("type")
+    var read = bool("read").default(false)
     var comments = varchar("comments", 255)
     var parentBook = optReference("parent_book_id", id)
     val cover = blob("cover").nullable()
@@ -31,9 +33,13 @@ class BookDAO(id: EntityID<Int>) : IntEntity(id) {
     var originalTitle by BooksTable.originalTitle
     var year by BooksTable.year
     var originalYear by BooksTable.originalYear
-    var language: Languages by BooksTable.language.transform({ it.name }, { Languages.valueOf(it) })
+    var language: Languages by BooksTable.language.transform(
+        { it.ordinal },
+        { Languages.entries[it] })
     var isbn by BooksTable.isbn
     var publisher by PublisherDAO.Companion referencedOn BooksTable.publisher
+    var type by BooksTable.type.transform({ it.ordinal }, { BookType.entries[it] })
+    var read by BooksTable.read
     var comments by BooksTable.comments
     var cover by BooksTable.cover
 
@@ -58,6 +64,8 @@ fun bookDaoToModel(dao: BookDAO, includeChildren: Boolean = true): Book = Book(
     dao.language,
     dao.isbn,
     publisher = Publisher(dao.publisher.id.value, dao.publisher.name),
+    dao.type,
+    dao.read,
     dao.comments,
     cover = dao.cover?.bytes ?: ByteArray(0),