temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-04 11:24:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Support sending floats" and convert DoubleFilter to FloatFilter (#1747)

Browse Source 
* Revert "[#1739] Support sending floats (#1740)"

This reverts commit c1f2aae90d.

Closes #1746

* Use `DoubleFilter` for GQL interface, convert to `FloatFilter`

Closes #1739 (again)
This commit is contained in:
Constantin Piber
2025-10-26 17:37:50 +01:00
committed by GitHub
parent 21e64eb54a
commit 3e7c5e2948
4 changed files with 23 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
View File

@@ -20,8 +20,8 @@ import org.jetbrains.exposed.sql.selectAll
import org.jetbrains.exposed.sql.transactions.transaction
import suwayomi.tachidesk.graphql.directives.RequireAuth
import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter
import suwayomi.tachidesk.graphql.queries.filter.Filter
import suwayomi.tachidesk.graphql.queries.filter.FloatFilter
import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
import suwayomi.tachidesk.graphql.queries.filter.IntFilter
import suwayomi.tachidesk.graphql.queries.filter.LongFilter
@@ -158,7 +158,7 @@ class ChapterQuery {
val url: StringFilter? = null,
val name: StringFilter? = null,
val uploadDate: LongFilter? = null,
val chapterNumber: FloatFilter? = null,
val chapterNumber: DoubleFilter? = null,
val scanlator: StringFilter? = null,
val mangaId: IntFilter? = null,
val isRead: BooleanFilter? = null,
@@ -181,7 +181,7 @@ class ChapterQuery {
andFilterWithCompareString(ChapterTable.url, url),
andFilterWithCompareString(ChapterTable.name, name),
andFilterWithCompare(ChapterTable.date_upload, uploadDate),
andFilterWithCompare(ChapterTable.chapter_number, chapterNumber),
andFilterWithCompare(ChapterTable.chapter_number, chapterNumber?.toFloatFilter()),
andFilterWithCompareString(ChapterTable.scanlator, scanlator),
andFilterWithCompareEntity(ChapterTable.manga, mangaId),
andFilterWithCompare(ChapterTable.isRead, isRead),

21
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
View File

@@ -304,7 +304,26 @@ data class DoubleFilter(
override val lessThanOrEqualTo: Double? = null,
override val greaterThan: Double? = null,
override val greaterThanOrEqualTo: Double? = null,
) : ComparableScalarFilter<Double>
) : ComparableScalarFilter<Double> {
fun toFloatFilter(): FloatFilter =
FloatFilter(
isNull = isNull,
equalTo = equalTo?.toFloat(),
notEqualTo = notEqualTo?.toFloat(),
notEqualToAll = notEqualToAll?.map { it.toFloat() },
notEqualToAny = notEqualToAny?.map { it.toFloat() },
distinctFrom = distinctFrom?.toFloat(),
distinctFromAll = distinctFromAll?.map { it.toFloat() },
distinctFromAny = distinctFromAny?.map { it.toFloat() },
notDistinctFrom = notDistinctFrom?.toFloat(),
`in` = `in`?.map { it.toFloat() },
notIn = notIn?.map { it.toFloat() },
lessThan = lessThan?.toFloat(),
lessThanOrEqualTo = lessThanOrEqualTo?.toFloat(),
greaterThan = greaterThan?.toFloat(),
greaterThanOrEqualTo = greaterThanOrEqualTo?.toFloat(),
)
}
data class StringFilter(
override val isNull: Boolean? = null,