From f8b421523376320a3edefa0b3b615cf10e01056a Mon Sep 17 00:00:00 2001
From: Hartmut Bauer <hb42@gmx.de>
Date: Tue, 10 Feb 2026 18:00:01 +0100
Subject: [PATCH] clean up package names

---
 .../app/server/{testdb => books}/db/ArtistDAO.kt     |  2 +-
 .../app/server/{testdb => books}/db/ArtistRoleDAO.kt |  2 +-
 .../server/{testdb => books}/db/ArtistToBookDAO.kt   |  4 ++--
 .../app/server/{testdb => books}/db/BookDAO.kt       |  6 +++---
 .../app/server/{testdb => books}/db/SeriesDAO.kt     |  2 +-
 .../server/{testdb => books}/model/BookRepository.kt |  8 ++++----
 .../{testdb => books}/model/BookRepositoryImpl.kt    | 12 ++++++------
 .../keinekekse/app/{book => books}/model/Artist.kt   |  2 +-
 .../app/{book => books}/model/ArtistRole.kt          |  2 +-
 .../net/keinekekse/app/{book => books}/model/Book.kt |  2 +-
 .../keinekekse/app/{book => books}/model/Series.kt   |  2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/db/ArtistDAO.kt (93%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/db/ArtistRoleDAO.kt (91%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/db/ArtistToBookDAO.kt (86%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/db/BookDAO.kt (87%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/db/SeriesDAO.kt (90%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/model/BookRepository.kt (67%)
 rename server/src/main/kotlin/net/keinekekse/app/server/{testdb => books}/model/BookRepositoryImpl.kt (76%)
 rename shared/src/commonMain/kotlin/net/keinekekse/app/{book => books}/model/Artist.kt (80%)
 rename shared/src/commonMain/kotlin/net/keinekekse/app/{book => books}/model/ArtistRole.kt (77%)
 rename shared/src/commonMain/kotlin/net/keinekekse/app/{book => books}/model/Book.kt (89%)
 rename shared/src/commonMain/kotlin/net/keinekekse/app/{book => books}/model/Series.kt (73%)

diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistDAO.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistDAO.kt
similarity index 93%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistDAO.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistDAO.kt
index eba46ed..fc009a4 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistDAO.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistDAO.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.server.testdb.db
+package books.db
 
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistRoleDAO.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistRoleDAO.kt
similarity index 91%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistRoleDAO.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistRoleDAO.kt
index f69f7a7..5493a38 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistRoleDAO.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistRoleDAO.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.server.testdb.db
+package books.db
 
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistToBookDAO.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistToBookDAO.kt
similarity index 86%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistToBookDAO.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistToBookDAO.kt
index e99aa24..b248abf 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/ArtistToBookDAO.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistToBookDAO.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.server.testdb.db
+package books.db
 
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
@@ -15,6 +15,6 @@ class ArtistToBookDAO(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<ArtistToBookDAO>(ArtistToBookTable)
 
     var artist by ArtistDAO referencedOn ArtistToBookTable.artistId
-    var book by BookDAO referencedOn ArtistToBookTable.bookId
+    var book by BookDAO.Companion referencedOn ArtistToBookTable.bookId
     var role by ArtistRoleDAO referencedOn ArtistToBookTable.role
 }
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/BookDAO.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/db/BookDAO.kt
similarity index 87%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/db/BookDAO.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/db/BookDAO.kt
index 44e1336..3a9a9b6 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/BookDAO.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/db/BookDAO.kt
@@ -1,6 +1,6 @@
-package net.keinekekse.app.server.testdb.db
+package books.db
 
-import net.keinekekse.app.book.model.*
+import net.keinekekse.app.books.model.*
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
 import org.jetbrains.exposed.v1.dao.IntEntity
@@ -18,7 +18,7 @@ class BookDAO(id: EntityID<Int>) : IntEntity(id) {
     var title by BooksTable.title
     var seriesIndex by BooksTable.seriesIndex
 
-    var series by SeriesDAO optionalReferencedOn BooksTable.series
+    var series by SeriesDAO.Companion optionalReferencedOn BooksTable.series
     val artists by ArtistToBookDAO referrersOn ArtistToBookTable.bookId
 }
 
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/SeriesDAO.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/db/SeriesDAO.kt
similarity index 90%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/db/SeriesDAO.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/db/SeriesDAO.kt
index de09a15..1a9965b 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/db/SeriesDAO.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/db/SeriesDAO.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.server.testdb.db
+package books.db
 
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepository.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepository.kt
similarity index 67%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepository.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepository.kt
index 197ec01..debdcec 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepository.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepository.kt
@@ -1,8 +1,8 @@
-package net.keinekekse.app.server.testdb.model
+package books.model
 
-import net.keinekekse.app.book.model.Artist
-import net.keinekekse.app.book.model.Book
-import net.keinekekse.app.book.model.Series
+import net.keinekekse.app.books.model.Artist
+import net.keinekekse.app.books.model.Book
+import net.keinekekse.app.books.model.Series
 
 interface BookRepository {
     suspend fun allBooks(): List<Book>
diff --git a/server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepositoryImpl.kt b/server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepositoryImpl.kt
similarity index 76%
rename from server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepositoryImpl.kt
rename to server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepositoryImpl.kt
index ea679e9..29caa24 100644
--- a/server/src/main/kotlin/net/keinekekse/app/server/testdb/model/BookRepositoryImpl.kt
+++ b/server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepositoryImpl.kt
@@ -1,10 +1,10 @@
-package net.keinekekse.app.server.testdb.model
+package books.model
 
-import net.keinekekse.app.book.model.Artist
-import net.keinekekse.app.book.model.Book
-import net.keinekekse.app.book.model.Series
-import net.keinekekse.app.server.testdb.db.BookDAO
-import net.keinekekse.app.server.testdb.db.daoToModel
+import books.db.BookDAO
+import books.db.daoToModel
+import net.keinekekse.app.books.model.Artist
+import net.keinekekse.app.books.model.Book
+import net.keinekekse.app.books.model.Series
 import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction
 import org.koin.core.annotation.Single
 
diff --git a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Artist.kt b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Artist.kt
similarity index 80%
rename from shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Artist.kt
rename to shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Artist.kt
index c7a0763..129e3d3 100644
--- a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Artist.kt
+++ b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Artist.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.book.model
+package net.keinekekse.app.books.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/ArtistRole.kt b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/ArtistRole.kt
similarity index 77%
rename from shared/src/commonMain/kotlin/net/keinekekse/app/book/model/ArtistRole.kt
rename to shared/src/commonMain/kotlin/net/keinekekse/app/books/model/ArtistRole.kt
index 504cc06..da1c128 100644
--- a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/ArtistRole.kt
+++ b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/ArtistRole.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.book.model
+package net.keinekekse.app.books.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Book.kt b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Book.kt
similarity index 89%
rename from shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Book.kt
rename to shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Book.kt
index f3560c8..8dcadf7 100644
--- a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Book.kt
+++ b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Book.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.book.model
+package net.keinekekse.app.books.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Series.kt b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Series.kt
similarity index 73%
rename from shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Series.kt
rename to shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Series.kt
index 0a353a1..472fc20 100644
--- a/shared/src/commonMain/kotlin/net/keinekekse/app/book/model/Series.kt
+++ b/shared/src/commonMain/kotlin/net/keinekekse/app/books/model/Series.kt
@@ -1,4 +1,4 @@
-package net.keinekekse.app.book.model
+package net.keinekekse.app.books.model
 
 import kotlinx.serialization.Serializable