From 2e3e634b269f015679f3ee7ee0077605ddea1baf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2024 15:06:03 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.expediagroup:graphql-kotlin-ktor-server to v8 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0bde8b9..976d5ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ supabase = "2.6.1" sqldelight = "2.0.2" stately = "2.1.0" logback = "1.5.8" -graphqlKotlin = "7.1.5" +graphqlKotlin = "8.0.0" kotest = "5.9.1" precompose = "1.6.2" coil = "3.0.0-alpha10" From d7bf7c70308cf2cd7466119803bc4ff8923037f6 Mon Sep 17 00:00:00 2001 From: Ryo Takeuchi Date: Wed, 18 Sep 2024 10:31:14 +0900 Subject: [PATCH 2/2] fix(backend): nullable --- .../main/kotlin/nito/club/backend/schema/BookQueryService.kt | 4 ++-- .../kotlin/nito/club/backend/schema/CourseQueryService.kt | 4 ++-- .../kotlin/nito/club/backend/schema/UniversityQueryService.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt index 488605d..6d81386 100644 --- a/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt @@ -10,9 +10,9 @@ import java.util.concurrent.CompletableFuture class BookQueryService : Query { @GraphQLDescription("Return list of books based on BookSearchParameter options") @Suppress("unused") - fun searchBooks(params: BookSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture> = + fun searchBooks(params: BookSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture>? = dfe.getDataLoader(BookDataLoader.dataLoaderName) - .loadMany(params.ids) + ?.loadMany(params.ids) } data class BookSearchParameters(val ids: List) diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt index c9c0edc..dbc73ea 100644 --- a/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt @@ -7,9 +7,9 @@ import nito.club.backend.schema.models.Course import java.util.concurrent.CompletableFuture class CourseQueryService : Query { - fun searchCourses(params: CourseSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture> = + fun searchCourses(params: CourseSearchParameters, dfe: DataFetchingEnvironment): CompletableFuture>? = dfe.getDataLoader(CourseDataLoader.dataLoaderName) - .loadMany(params.ids) + ?.loadMany(params.ids) } data class CourseSearchParameters(val ids: List) diff --git a/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt index 3bbbfd0..133629a 100644 --- a/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt @@ -10,9 +10,9 @@ class UniversityQueryService : Query { fun searchUniversities( params: UniversitySearchParameters, dfe: DataFetchingEnvironment, - ): CompletableFuture> = + ): CompletableFuture>? = dfe.getDataLoader(UniversityDataLoader.dataLoaderName) - .loadMany(params.ids) + ?.loadMany(params.ids) } data class UniversitySearchParameters(val ids: List)