Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

♻️ バックエンドのモジュールをリネーム #18

Merged
merged 1 commit into from
Nov 20, 2023
Merged

♻️ バックエンドのモジュールをリネーム #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 bff/README.md → app/backend/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions bff/build.gradle.kts → app/backend/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -32,7 +32,7 @@ dependencies {

graphql {
schema {
packages = listOf("nito.club.bff")
packages = listOf("nito.club.backend")
}
client {
serializer = GraphQLSerializer.KOTLINX
Expand Down
2 changes: 1 addition & 1 deletion .../main/kotlin/nito/club/bff/Application.kt → ...n/kotlin/nito/club/backend/Application.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package nito.club.bff
package nito.club.backend

fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
4 changes: 2 additions & 2 deletions ...o/club/bff/CustomGraphQLContextFactory.kt → ...ub/backend/CustomGraphQLContextFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down
22 changes: 11 additions & 11 deletions ...ain/kotlin/nito/club/bff/GraphQLModule.kt → ...kotlin/nito/club/backend/GraphQLModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand All @@ -41,7 +41,7 @@ fun Application.graphQLModule() {
}
install(GraphQL) {
schema {
packages = listOf("nito.club.bff")
packages = listOf("nito.club.backend")
queries = listOf(
HelloQueryService(),
BookQueryService(),
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/nito/club/bff/GraphQLRoutes.kt → ...kotlin/nito/club/backend/GraphQLRoutes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...nito/club/bff/graphql/query/HelloQuery.kt → .../club/backend/graphql/query/HelloQuery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nito.club.bff.graphql.query
package nito.club.backend.graphql.query

import com.expediagroup.graphql.server.operations.Query

Expand Down
2 changes: 1 addition & 1 deletion ...aphql/server/KtorGraphQLContextFactory.kt → ...aphql/server/KtorGraphQLContextFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...raphql/server/KtorGraphQLRequestParser.kt → ...raphql/server/KtorGraphQLRequestParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...b/bff/graphql/server/KtorGraphQLSchema.kt → ...ckend/graphql/server/KtorGraphQLSchema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...b/bff/graphql/server/KtorGraphQLServer.kt → ...ckend/graphql/server/KtorGraphQLServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions .../nito/club/bff/schema/BookQueryService.kt → ...o/club/backend/schema/BookQueryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...ito/club/bff/schema/CourseQueryService.kt → ...club/backend/schema/CourseQueryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion .../bff/schema/ExampleSubscriptionService.kt → ...kend/schema/ExampleSubscriptionService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...nito/club/bff/schema/HelloQueryService.kt → .../club/backend/schema/HelloQueryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nito.club.bff.schema
package nito.club.backend.schema

import com.expediagroup.graphql.server.operations.Query

Expand Down
4 changes: 2 additions & 2 deletions ...o/club/bff/schema/LoginMutationService.kt → ...ub/backend/schema/LoginMutationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
6 changes: 3 additions & 3 deletions ...club/bff/schema/UniversityQueryService.kt → .../backend/schema/UniversityQueryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions .../bff/schema/dataloaders/BookDataLoader.kt → ...kend/schema/dataloaders/BookDataLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...ff/schema/dataloaders/CourseDataLoader.kt → ...nd/schema/dataloaders/CourseDataLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...chema/dataloaders/UniversityDataLoader.kt → ...chema/dataloaders/UniversityDataLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...otlin/nito/club/bff/schema/models/Book.kt → ...n/nito/club/backend/schema/models/Book.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nito.club.bff.schema.models
package nito.club.backend.schema.models

import com.expediagroup.graphql.generator.annotations.GraphQLDescription

Expand Down
6 changes: 3 additions & 3 deletions ...lin/nito/club/bff/schema/models/Course.kt → ...nito/club/backend/schema/models/Course.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...nito/club/bff/schema/models/University.kt → .../club/backend/schema/models/University.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nito.club.bff.schema.models
package nito.club.backend.schema.models

import graphql.GraphQLException

Expand Down
2 changes: 1 addition & 1 deletion ...otlin/nito/club/bff/schema/models/User.kt → ...n/nito/club/backend/schema/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nito.club.bff.schema.models
package nito.club.backend.schema.models

import graphql.GraphQLException

Expand Down
2 changes: 1 addition & 1 deletion bff/src/main/resources/application.conf → ...ckend/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ktor {
}
application {
modules = [
nito.club.bff.GraphQLModuleKt.graphQLModule
nito.club.backend.GraphQLModuleKt.graphQLModule
]
}
}
0 bff/src/main/resources/logback.xml → app/backend/src/main/resources/logback.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ include(
":app:android",
":app:ios-combined",
":app:web",
":bff",
":app:backend",
":core:common",
":core:database",
":core:network",
Expand Down
Loading