diff --git a/bff/README.md b/app/backend/README.md similarity index 100% rename from bff/README.md rename to app/backend/README.md diff --git a/bff/build.gradle.kts b/app/backend/build.gradle.kts similarity index 91% rename from bff/build.gradle.kts rename to app/backend/build.gradle.kts index 3e3f2a98..1e54f8aa 100644 --- a/bff/build.gradle.kts +++ b/app/backend/build.gradle.kts @@ -11,7 +11,7 @@ group = "club.nito" version = "0.1.0" application { - mainClass.set("nito.club.bff.ApplicationKt") + mainClass.set("nito.club.backend.ApplicationKt") val isDevelopment: Boolean = project.ext.has("development") applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") @@ -32,7 +32,7 @@ dependencies { graphql { schema { - packages = listOf("nito.club.bff") + packages = listOf("nito.club.backend") } client { serializer = GraphQLSerializer.KOTLINX diff --git a/bff/src/main/kotlin/nito/club/bff/Application.kt b/app/backend/src/main/kotlin/nito/club/backend/Application.kt similarity index 75% rename from bff/src/main/kotlin/nito/club/bff/Application.kt rename to app/backend/src/main/kotlin/nito/club/backend/Application.kt index 5dbebe27..e4e1c20c 100644 --- a/bff/src/main/kotlin/nito/club/bff/Application.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/Application.kt @@ -1,3 +1,3 @@ -package nito.club.bff +package nito.club.backend fun main(args: Array): Unit = io.ktor.server.netty.EngineMain.main(args) diff --git a/bff/src/main/kotlin/nito/club/bff/CustomGraphQLContextFactory.kt b/app/backend/src/main/kotlin/nito/club/backend/CustomGraphQLContextFactory.kt similarity index 92% rename from bff/src/main/kotlin/nito/club/bff/CustomGraphQLContextFactory.kt rename to app/backend/src/main/kotlin/nito/club/backend/CustomGraphQLContextFactory.kt index 0e110684..d34c3a2e 100644 --- a/bff/src/main/kotlin/nito/club/bff/CustomGraphQLContextFactory.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/CustomGraphQLContextFactory.kt @@ -1,10 +1,10 @@ -package nito.club.bff +package nito.club.backend import com.expediagroup.graphql.generator.extensions.plus import com.expediagroup.graphql.server.ktor.DefaultKtorGraphQLContextFactory import graphql.GraphQLContext import io.ktor.server.request.ApplicationRequest -import nito.club.bff.schema.models.User +import nito.club.backend.schema.models.User class CustomGraphQLContextFactory : DefaultKtorGraphQLContextFactory() { override suspend fun generateContext(request: ApplicationRequest): GraphQLContext = diff --git a/bff/src/main/kotlin/nito/club/bff/GraphQLModule.kt b/app/backend/src/main/kotlin/nito/club/backend/GraphQLModule.kt similarity index 78% rename from bff/src/main/kotlin/nito/club/bff/GraphQLModule.kt rename to app/backend/src/main/kotlin/nito/club/backend/GraphQLModule.kt index 077750e1..8794903d 100644 --- a/bff/src/main/kotlin/nito/club/bff/GraphQLModule.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/GraphQLModule.kt @@ -1,4 +1,4 @@ -package nito.club.bff +package nito.club.backend import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory import com.expediagroup.graphql.server.ktor.GraphQL @@ -15,15 +15,15 @@ import io.ktor.server.routing.Routing import io.ktor.server.websocket.WebSockets import io.ktor.server.websocket.pingPeriod import kotlinx.serialization.json.Json -import nito.club.bff.schema.BookQueryService -import nito.club.bff.schema.CourseQueryService -import nito.club.bff.schema.ExampleSubscriptionService -import nito.club.bff.schema.HelloQueryService -import nito.club.bff.schema.LoginMutationService -import nito.club.bff.schema.UniversityQueryService -import nito.club.bff.schema.dataloaders.BookDataLoader -import nito.club.bff.schema.dataloaders.CourseDataLoader -import nito.club.bff.schema.dataloaders.UniversityDataLoader +import nito.club.backend.schema.BookQueryService +import nito.club.backend.schema.CourseQueryService +import nito.club.backend.schema.ExampleSubscriptionService +import nito.club.backend.schema.HelloQueryService +import nito.club.backend.schema.LoginMutationService +import nito.club.backend.schema.UniversityQueryService +import nito.club.backend.schema.dataloaders.BookDataLoader +import nito.club.backend.schema.dataloaders.CourseDataLoader +import nito.club.backend.schema.dataloaders.UniversityDataLoader import java.time.Duration @Suppress("unused") @@ -41,7 +41,7 @@ fun Application.graphQLModule() { } install(GraphQL) { schema { - packages = listOf("nito.club.bff") + packages = listOf("nito.club.backend") queries = listOf( HelloQueryService(), BookQueryService(), diff --git a/bff/src/main/kotlin/nito/club/bff/GraphQLRoutes.kt b/app/backend/src/main/kotlin/nito/club/backend/GraphQLRoutes.kt similarity index 98% rename from bff/src/main/kotlin/nito/club/bff/GraphQLRoutes.kt rename to app/backend/src/main/kotlin/nito/club/backend/GraphQLRoutes.kt index 10d4d7d8..07168895 100644 --- a/bff/src/main/kotlin/nito/club/bff/GraphQLRoutes.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/GraphQLRoutes.kt @@ -1,4 +1,4 @@ -package nito.club.bff +package nito.club.backend import com.expediagroup.graphql.server.ktor.GraphQL import com.expediagroup.graphql.server.ktor.KtorGraphQLServer diff --git a/bff/src/main/kotlin/nito/club/bff/graphql/query/HelloQuery.kt b/app/backend/src/main/kotlin/nito/club/backend/graphql/query/HelloQuery.kt similarity index 75% rename from bff/src/main/kotlin/nito/club/bff/graphql/query/HelloQuery.kt rename to app/backend/src/main/kotlin/nito/club/backend/graphql/query/HelloQuery.kt index f8cc6f04..58974d23 100644 --- a/bff/src/main/kotlin/nito/club/bff/graphql/query/HelloQuery.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/graphql/query/HelloQuery.kt @@ -1,4 +1,4 @@ -package nito.club.bff.graphql.query +package nito.club.backend.graphql.query import com.expediagroup.graphql.server.operations.Query diff --git a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLContextFactory.kt b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLContextFactory.kt similarity index 82% rename from bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLContextFactory.kt rename to app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLContextFactory.kt index 5aa962d2..f9f196cf 100644 --- a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLContextFactory.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLContextFactory.kt @@ -1,4 +1,4 @@ -package nito.club.bff.graphql.server +package nito.club.backend.graphql.server import com.expediagroup.graphql.server.execution.GraphQLContextFactory import io.ktor.server.request.ApplicationRequest diff --git a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLRequestParser.kt b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLRequestParser.kt similarity index 95% rename from bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLRequestParser.kt rename to app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLRequestParser.kt index 7bacb906..ccae93fc 100644 --- a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLRequestParser.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLRequestParser.kt @@ -1,4 +1,4 @@ -package nito.club.bff.graphql.server +package nito.club.backend.graphql.server import com.expediagroup.graphql.server.execution.GraphQLRequestParser import com.expediagroup.graphql.server.types.GraphQLServerRequest diff --git a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLSchema.kt b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLSchema.kt similarity index 89% rename from bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLSchema.kt rename to app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLSchema.kt index adc1bfd3..dcfea4db 100644 --- a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLSchema.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLSchema.kt @@ -1,11 +1,11 @@ -package nito.club.bff.graphql.server +package nito.club.backend.graphql.server import com.expediagroup.graphql.generator.SchemaGeneratorConfig import com.expediagroup.graphql.generator.TopLevelObject import com.expediagroup.graphql.generator.scalars.IDValueUnboxer import com.expediagroup.graphql.generator.toSchema import graphql.GraphQL -import nito.club.bff.graphql.query.HelloQuery +import nito.club.backend.graphql.query.HelloQuery object KtorGraphQLSchema { private val config = SchemaGeneratorConfig( diff --git a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLServer.kt b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLServer.kt similarity index 96% rename from bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLServer.kt rename to app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLServer.kt index 19ad8e8b..95d25566 100644 --- a/bff/src/main/kotlin/nito/club/bff/graphql/server/KtorGraphQLServer.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/graphql/server/KtorGraphQLServer.kt @@ -1,4 +1,4 @@ -package nito.club.bff.graphql.server +package nito.club.backend.graphql.server import com.expediagroup.graphql.server.execution.GraphQLRequestHandler import com.expediagroup.graphql.server.execution.GraphQLServer diff --git a/bff/src/main/kotlin/nito/club/bff/schema/BookQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt similarity index 82% rename from bff/src/main/kotlin/nito/club/bff/schema/BookQueryService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt index 8c9a5470..488605db 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/BookQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/BookQueryService.kt @@ -1,10 +1,10 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.generator.annotations.GraphQLDescription import com.expediagroup.graphql.server.operations.Query import graphql.schema.DataFetchingEnvironment -import nito.club.bff.schema.dataloaders.BookDataLoader -import nito.club.bff.schema.models.Book +import nito.club.backend.schema.dataloaders.BookDataLoader +import nito.club.backend.schema.models.Book import java.util.concurrent.CompletableFuture class BookQueryService : Query { diff --git a/bff/src/main/kotlin/nito/club/bff/schema/CourseQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt similarity index 76% rename from bff/src/main/kotlin/nito/club/bff/schema/CourseQueryService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt index d800b207..c9c0edcc 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/CourseQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/CourseQueryService.kt @@ -1,9 +1,9 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.server.operations.Query import graphql.schema.DataFetchingEnvironment -import nito.club.bff.schema.dataloaders.CourseDataLoader -import nito.club.bff.schema.models.Course +import nito.club.backend.schema.dataloaders.CourseDataLoader +import nito.club.backend.schema.models.Course import java.util.concurrent.CompletableFuture class CourseQueryService : Query { diff --git a/bff/src/main/kotlin/nito/club/bff/schema/ExampleSubscriptionService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/ExampleSubscriptionService.kt similarity index 98% rename from bff/src/main/kotlin/nito/club/bff/schema/ExampleSubscriptionService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/ExampleSubscriptionService.kt index 04b6f9bd..ffe7ca20 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/ExampleSubscriptionService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/ExampleSubscriptionService.kt @@ -1,4 +1,4 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.generator.annotations.GraphQLDescription import com.expediagroup.graphql.server.operations.Subscription diff --git a/bff/src/main/kotlin/nito/club/bff/schema/HelloQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/HelloQueryService.kt similarity index 78% rename from bff/src/main/kotlin/nito/club/bff/schema/HelloQueryService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/HelloQueryService.kt index 0494893e..f7aa444b 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/HelloQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/HelloQueryService.kt @@ -1,4 +1,4 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.server.operations.Query diff --git a/bff/src/main/kotlin/nito/club/bff/schema/LoginMutationService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/LoginMutationService.kt similarity index 87% rename from bff/src/main/kotlin/nito/club/bff/schema/LoginMutationService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/LoginMutationService.kt index c73ce029..a8ed883c 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/LoginMutationService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/LoginMutationService.kt @@ -1,7 +1,7 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.server.operations.Mutation -import nito.club.bff.schema.models.User +import nito.club.backend.schema.models.User data class AuthPayload(val token: String? = null, val user: User? = null) diff --git a/bff/src/main/kotlin/nito/club/bff/schema/UniversityQueryService.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt similarity index 77% rename from bff/src/main/kotlin/nito/club/bff/schema/UniversityQueryService.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt index 117c7f3b..3bbbfd0e 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/UniversityQueryService.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/UniversityQueryService.kt @@ -1,9 +1,9 @@ -package nito.club.bff.schema +package nito.club.backend.schema import com.expediagroup.graphql.server.operations.Query import graphql.schema.DataFetchingEnvironment -import nito.club.bff.schema.dataloaders.UniversityDataLoader -import nito.club.bff.schema.models.University +import nito.club.backend.schema.dataloaders.UniversityDataLoader +import nito.club.backend.schema.models.University import java.util.concurrent.CompletableFuture class UniversityQueryService : Query { diff --git a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/BookDataLoader.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/BookDataLoader.kt similarity index 86% rename from bff/src/main/kotlin/nito/club/bff/schema/dataloaders/BookDataLoader.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/BookDataLoader.kt index 644133c8..4b7b8d82 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/BookDataLoader.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/BookDataLoader.kt @@ -1,9 +1,9 @@ -package nito.club.bff.schema.dataloaders +package nito.club.backend.schema.dataloaders import com.expediagroup.graphql.dataloader.KotlinDataLoader import graphql.GraphQLContext import kotlinx.coroutines.runBlocking -import nito.club.bff.schema.models.Book +import nito.club.backend.schema.models.Book import org.dataloader.DataLoaderFactory import java.util.concurrent.CompletableFuture diff --git a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/CourseDataLoader.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/CourseDataLoader.kt similarity index 86% rename from bff/src/main/kotlin/nito/club/bff/schema/dataloaders/CourseDataLoader.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/CourseDataLoader.kt index 009e8dcd..bc437378 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/CourseDataLoader.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/CourseDataLoader.kt @@ -1,9 +1,9 @@ -package nito.club.bff.schema.dataloaders +package nito.club.backend.schema.dataloaders import com.expediagroup.graphql.dataloader.KotlinDataLoader import graphql.GraphQLContext import kotlinx.coroutines.runBlocking -import nito.club.bff.schema.models.Course +import nito.club.backend.schema.models.Course import org.dataloader.DataLoaderFactory import java.util.concurrent.CompletableFuture diff --git a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/UniversityDataLoader.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/UniversityDataLoader.kt similarity index 86% rename from bff/src/main/kotlin/nito/club/bff/schema/dataloaders/UniversityDataLoader.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/UniversityDataLoader.kt index 560b8fa2..7e1c09f9 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/dataloaders/UniversityDataLoader.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/dataloaders/UniversityDataLoader.kt @@ -1,9 +1,9 @@ -package nito.club.bff.schema.dataloaders +package nito.club.backend.schema.dataloaders import com.expediagroup.graphql.dataloader.KotlinDataLoader import graphql.GraphQLContext import kotlinx.coroutines.runBlocking -import nito.club.bff.schema.models.University +import nito.club.backend.schema.models.University import org.dataloader.DataLoaderFactory import java.util.concurrent.CompletableFuture diff --git a/bff/src/main/kotlin/nito/club/bff/schema/models/Book.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/models/Book.kt similarity index 94% rename from bff/src/main/kotlin/nito/club/bff/schema/models/Book.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/models/Book.kt index 99ce299a..647002f0 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/models/Book.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/models/Book.kt @@ -1,4 +1,4 @@ -package nito.club.bff.schema.models +package nito.club.backend.schema.models import com.expediagroup.graphql.generator.annotations.GraphQLDescription diff --git a/bff/src/main/kotlin/nito/club/bff/schema/models/Course.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/models/Course.kt similarity index 89% rename from bff/src/main/kotlin/nito/club/bff/schema/models/Course.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/models/Course.kt index 63b15823..3a42fac1 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/models/Course.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/models/Course.kt @@ -1,10 +1,10 @@ -package nito.club.bff.schema.models +package nito.club.backend.schema.models import com.expediagroup.graphql.server.extensions.getValueFromDataLoader import com.expediagroup.graphql.server.extensions.getValuesFromDataLoader import graphql.schema.DataFetchingEnvironment -import nito.club.bff.schema.dataloaders.BookDataLoader -import nito.club.bff.schema.dataloaders.UniversityDataLoader +import nito.club.backend.schema.dataloaders.BookDataLoader +import nito.club.backend.schema.dataloaders.UniversityDataLoader import java.util.concurrent.CompletableFuture data class Course( diff --git a/bff/src/main/kotlin/nito/club/bff/schema/models/University.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/models/University.kt similarity index 94% rename from bff/src/main/kotlin/nito/club/bff/schema/models/University.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/models/University.kt index 1e08dba5..3cc29426 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/models/University.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/models/University.kt @@ -1,4 +1,4 @@ -package nito.club.bff.schema.models +package nito.club.backend.schema.models import graphql.GraphQLException diff --git a/bff/src/main/kotlin/nito/club/bff/schema/models/User.kt b/app/backend/src/main/kotlin/nito/club/backend/schema/models/User.kt similarity index 91% rename from bff/src/main/kotlin/nito/club/bff/schema/models/User.kt rename to app/backend/src/main/kotlin/nito/club/backend/schema/models/User.kt index f271f239..305f4ca1 100644 --- a/bff/src/main/kotlin/nito/club/bff/schema/models/User.kt +++ b/app/backend/src/main/kotlin/nito/club/backend/schema/models/User.kt @@ -1,4 +1,4 @@ -package nito.club.bff.schema.models +package nito.club.backend.schema.models import graphql.GraphQLException diff --git a/bff/src/main/resources/application.conf b/app/backend/src/main/resources/application.conf similarity index 63% rename from bff/src/main/resources/application.conf rename to app/backend/src/main/resources/application.conf index 97ab4976..5ca4f50c 100644 --- a/bff/src/main/resources/application.conf +++ b/app/backend/src/main/resources/application.conf @@ -4,7 +4,7 @@ ktor { } application { modules = [ - nito.club.bff.GraphQLModuleKt.graphQLModule + nito.club.backend.GraphQLModuleKt.graphQLModule ] } } diff --git a/bff/src/main/resources/logback.xml b/app/backend/src/main/resources/logback.xml similarity index 100% rename from bff/src/main/resources/logback.xml rename to app/backend/src/main/resources/logback.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index a31836dd..eb9c38d3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ include( ":app:android", ":app:ios-combined", ":app:web", - ":bff", + ":app:backend", ":core:common", ":core:database", ":core:network",