Add ContentRatingFilter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt

@@ -21,6 +21,7 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
+import suwayomi.tachidesk.graphql.queries.filter.ContentRatingFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.IntFilter
@@ -28,6 +29,7 @@ import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -156,7 +158,7 @@ class ExtensionQuery {
         val lang: StringFilter? = null,
         @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
         val isNsfw: BooleanFilter? = null,
-        // val contentRating: EnumFilter<ContentRating>? = null,
+        val contentRating: ContentRatingFilter? = null,
         val isInstalled: BooleanFilter? = null,
         val hasUpdate: BooleanFilter? = null,
         val isObsolete: BooleanFilter? = null,
@@ -177,7 +179,7 @@ class ExtensionQuery {
                 andFilterWithCompareString(ExtensionTable.versionName, versionName),
                 andFilterWithCompare(ExtensionTable.versionCode, versionCodeLong),
                 andFilterWithCompareString(ExtensionTable.lang, lang),
-                // andFilterWithCompareEnum(ExtensionTable.contentRating, contentRating),
+                andFilterWithCompareEnum(ExtensionTable.contentRating, contentRating),
                 andFilterWithCompare(ExtensionTable.isInstalled, isInstalled),
                 andFilterWithCompare(ExtensionTable.hasUpdate, hasUpdate),
                 andFilterWithCompare(ExtensionTable.isObsolete, isObsolete),

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt

@@ -21,12 +21,14 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
+import suwayomi.tachidesk.graphql.queries.filter.ContentRatingFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -122,7 +124,7 @@ class SourceQuery {
         val lang: StringFilter? = null,
         @GraphQLDeprecated("replace with contentRating == ContentRating.PORNOGRAPHIC", ReplaceWith("contentRating"))
         val isNsfw: BooleanFilter? = null,
-        // val contentRating: EnumFilter<ContentRating>? = null,
+        val contentRating: ContentRatingFilter? = null,
         override val and: List<SourceFilter>? = null,
         override val or: List<SourceFilter>? = null,
         override val not: SourceFilter? = null,
@@ -132,7 +134,7 @@ class SourceQuery {
                 andFilterWithCompareEntity(SourceTable.id, id),
                 andFilterWithCompareString(SourceTable.name, name),
                 andFilterWithCompareString(SourceTable.lang, lang),
-                // andFilterWithCompareEnum(SourceTable.contentRating, contentRating)
+                andFilterWithCompareEnum(SourceTable.contentRating, contentRating),
             )
     }
 

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

@@ -28,6 +28,7 @@ import org.jetbrains.exposed.v1.core.upperCase
 import org.jetbrains.exposed.v1.core.wrap
 import org.jetbrains.exposed.v1.jdbc.Query
 import org.jetbrains.exposed.v1.jdbc.andWhere
+import suwayomi.tachidesk.graphql.types.ContentRating
 
 class ILikeEscapeOp(
     expr1: Expression<*>,
@@ -329,23 +330,23 @@ data class DoubleFilter(
         )
 }
 
-data class EnumFilter<T : Enum<T>>(
+data class ContentRatingFilter(
     override val isNull: Boolean? = null,
-    override val equalTo: T? = null,
-    override val notEqualTo: T? = null,
-    override val notEqualToAll: List<T>? = null,
-    override val notEqualToAny: List<T>? = null,
-    override val distinctFrom: T? = null,
-    override val distinctFromAll: List<T>? = null,
-    override val distinctFromAny: List<T>? = null,
-    override val notDistinctFrom: T? = null,
-    override val `in`: List<T>? = null,
-    override val notIn: List<T>? = null,
-    override val lessThan: T? = null,
-    override val lessThanOrEqualTo: T? = null,
-    override val greaterThan: T? = null,
-    override val greaterThanOrEqualTo: T? = null,
-) : ComparableScalarFilter<T>
+    override val equalTo: ContentRating? = null,
+    override val notEqualTo: ContentRating? = null,
+    override val notEqualToAll: List<ContentRating>? = null,
+    override val notEqualToAny: List<ContentRating>? = null,
+    override val distinctFrom: ContentRating? = null,
+    override val distinctFromAll: List<ContentRating>? = null,
+    override val distinctFromAny: List<ContentRating>? = null,
+    override val notDistinctFrom: ContentRating? = null,
+    override val `in`: List<ContentRating>? = null,
+    override val notIn: List<ContentRating>? = null,
+    override val lessThan: ContentRating? = null,
+    override val lessThanOrEqualTo: ContentRating? = null,
+    override val greaterThan: ContentRating? = null,
+    override val greaterThanOrEqualTo: ContentRating? = null,
+) : ComparableScalarFilter<ContentRating>
 
 data class StringFilter(
     override val isNull: Boolean? = null,