Skip to content

Commit

Permalink
fix: bug in some queries
Browse files Browse the repository at this point in the history
  • Loading branch information
bayang committed Feb 21, 2022
1 parent 448e284 commit af546dd
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/main/kotlin/io/github/bayang/jelu/dao/BookRepository.kt
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ class BookRepository(
val booksWithSameIdAndUserHasUserbook = BookTable.join(UserBookTable, JoinType.LEFT)
.slice(BookTable.id)
.select { UserBookTable.book eq BookTable.id and (UserBookTable.user eq user.id) }
.withDistinct()
val query = BookTable.join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
.slice(BookTable.columns)
.selectAll()
.withDistinct()

title?.let {
query.andWhere { BookTable.title like "%$title%" }
}
Expand Down Expand Up @@ -150,8 +154,10 @@ class BookRepository(
val booksWithSameIdAndUserHasUserbook = BookTable.join(UserBookTable, JoinType.LEFT)
.slice(BookTable.id)
.select { UserBookTable.book eq BookTable.id and (UserBookTable.user eq user.id) }
.withDistinct()
val query = BookTable.join(BookTags, JoinType.LEFT)
.join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
.slice(BookTable.columns)
.select { BookTags.tag eq tagId }
if (filter == LibraryFilter.ONLY_USER_BOOKS) {
// only books where user has an userbook
Expand All @@ -176,10 +182,10 @@ class BookRepository(
val booksWithSameIdAndUserHasUserbook = BookTable.join(UserBookTable, JoinType.LEFT)
.slice(BookTable.id)
.select { UserBookTable.book eq BookTable.id and (UserBookTable.user eq user.id) }
// val a = Author[authorId]
.withDistinct()
val query = BookTable.join(BookAuthors, JoinType.LEFT)
.join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
// .slice(BookTable.columns)
.slice(BookTable.columns)
.select { BookAuthors.author eq authorId }
if (libaryFilter == LibraryFilter.ONLY_USER_BOOKS) {
// only books where user has an userbook
Expand Down

0 comments on commit af546dd

Please sign in to comment.