From 9f87b983b45ef6de5274c4b5e655bb966fc7f0f6 Mon Sep 17 00:00:00 2001 From: ccornu <ccornu@takima.fr> Date: Tue, 11 Feb 2025 22:24:49 +0100 Subject: [PATCH] feat: renaming wrong mentions --- README.md | 4 ++-- build.gradle.kts | 2 +- src/main/kotlin/Application.kt | 12 ++++++------ .../kotlin/configuration/ApiConfiguration.kt | 2 +- .../configuration/DynamoDbConfiguration.kt | 2 +- .../kotlin/configuration/DynamoDbMigration.kt | 4 ++-- .../configuration/ExceptionConfiguration.kt | 4 ++-- .../configuration/InjectionConfiguration.kt | 10 +++++----- .../configuration/RoutingConfiguration.kt | 4 ++-- .../kotlin/player/dtos/PlayerCreationDTO.kt | 4 ++-- src/main/kotlin/player/dtos/PlayerInfoDTO.kt | 4 ++-- src/main/kotlin/player/dtos/PlayerUpdateDTO.kt | 4 ++-- src/main/kotlin/player/entities/Player.kt | 2 +- .../exceptions/AlreadyExistingException.kt | 2 +- .../player/repositories/PlayerRepository.kt | 4 ++-- .../repositories/PlayerRepositoryImpl.kt | 10 +++++----- src/main/kotlin/player/routes/PlayerRoute.kt | 10 +++++----- .../kotlin/player/services/PlayerService.kt | 10 +++++----- .../player/services/PlayerServiceImpl.kt | 18 +++++++++--------- src/main/resources/application.yaml | 2 +- src/test/kotlin/TestApplication.kt | 6 +++--- .../kotlin/player/PlayerIntegrationTest.kt | 8 ++++---- src/test/kotlin/player/PlayerServiceTest.kt | 12 ++++++------ 23 files changed, 70 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index e4f26ef..024773f 100644 --- a/README.md +++ b/README.md @@ -118,8 +118,8 @@ To deploy this application in a production environment, there are several key ar - Currently, table creation is handled at application startup. The logic is implemented to execute the migration only if needed. - To correctly handle migrations, it could be useful to handle it through a migration tool, like Liquibase. -- Considering that you are using Terraform at Betclic, it could also be a way to set up the database. Indeed, Terraform - plays nicely with DynamoDB to manage the setup of table and to establish connections with AWS. +- When working with Terraform, it could also be a way to set up the database. Indeed, Terraform plays nicely with + DynamoDB to manage the setup of table and to establish connections with AWS. ### 3. CI/CD Pipelines diff --git a/build.gradle.kts b/build.gradle.kts index f43499f..2e3df65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ plugins { kotlin("plugin.serialization") version "1.9.0" } -group = "betclic.test" +group = "tournament.test" version = "0.0.1-SNAPSHOT" application { diff --git a/src/main/kotlin/Application.kt b/src/main/kotlin/Application.kt index 8814813..49d8fe9 100644 --- a/src/main/kotlin/Application.kt +++ b/src/main/kotlin/Application.kt @@ -1,10 +1,10 @@ -package betclic.test +package tournament.test -import betclic.test.configuration.configureExceptionHandling -import betclic.test.configuration.configureKoin -import betclic.test.configuration.configureRouting -import betclic.test.configuration.configureSerialization -import betclic.test.configuration.migrateTables +import tournament.test.configuration.configureExceptionHandling +import tournament.test.configuration.configureKoin +import tournament.test.configuration.configureRouting +import tournament.test.configuration.configureSerialization +import tournament.test.configuration.migrateTables import io.ktor.server.application.* import kotlinx.coroutines.runBlocking diff --git a/src/main/kotlin/configuration/ApiConfiguration.kt b/src/main/kotlin/configuration/ApiConfiguration.kt index 7e4ac30..92d949d 100644 --- a/src/main/kotlin/configuration/ApiConfiguration.kt +++ b/src/main/kotlin/configuration/ApiConfiguration.kt @@ -1,4 +1,4 @@ -package betclic.test.configuration +package tournament.test.configuration import io.ktor.serialization.kotlinx.json.* import io.ktor.server.application.* diff --git a/src/main/kotlin/configuration/DynamoDbConfiguration.kt b/src/main/kotlin/configuration/DynamoDbConfiguration.kt index b55b82c..ddf2cb0 100644 --- a/src/main/kotlin/configuration/DynamoDbConfiguration.kt +++ b/src/main/kotlin/configuration/DynamoDbConfiguration.kt @@ -1,4 +1,4 @@ -package betclic.test.configuration +package tournament.test.configuration import io.ktor.server.config.* import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/configuration/DynamoDbMigration.kt b/src/main/kotlin/configuration/DynamoDbMigration.kt index 3677fc6..b91ef07 100644 --- a/src/main/kotlin/configuration/DynamoDbMigration.kt +++ b/src/main/kotlin/configuration/DynamoDbMigration.kt @@ -1,6 +1,6 @@ -package betclic.test.configuration +package tournament.test.configuration -import betclic.test.player.entities.PlayerEntity +import tournament.test.player.entities.PlayerEntity import dev.andrewohara.dynamokt.DataClassTableSchema import io.ktor.server.application.* import kotlinx.coroutines.future.await diff --git a/src/main/kotlin/configuration/ExceptionConfiguration.kt b/src/main/kotlin/configuration/ExceptionConfiguration.kt index 7c6ad94..d8dcf39 100644 --- a/src/main/kotlin/configuration/ExceptionConfiguration.kt +++ b/src/main/kotlin/configuration/ExceptionConfiguration.kt @@ -1,6 +1,6 @@ -package betclic.test.configuration +package tournament.test.configuration -import betclic.test.player.exceptions.AlreadyExistingPlayerException +import tournament.test.player.exceptions.AlreadyExistingPlayerException import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.* diff --git a/src/main/kotlin/configuration/InjectionConfiguration.kt b/src/main/kotlin/configuration/InjectionConfiguration.kt index 57d0f07..9dd3199 100644 --- a/src/main/kotlin/configuration/InjectionConfiguration.kt +++ b/src/main/kotlin/configuration/InjectionConfiguration.kt @@ -1,9 +1,9 @@ -package betclic.test.configuration +package tournament.test.configuration -import betclic.test.player.repositories.PlayerRepository -import betclic.test.player.repositories.PlayerRepositoryImpl -import betclic.test.player.services.PlayerService -import betclic.test.player.services.PlayerServiceImpl +import tournament.test.player.repositories.PlayerRepository +import tournament.test.player.repositories.PlayerRepositoryImpl +import tournament.test.player.services.PlayerService +import tournament.test.player.services.PlayerServiceImpl import io.ktor.server.application.* import org.koin.dsl.module import org.koin.ktor.plugin.Koin diff --git a/src/main/kotlin/configuration/RoutingConfiguration.kt b/src/main/kotlin/configuration/RoutingConfiguration.kt index c0efa27..e5d883b 100644 --- a/src/main/kotlin/configuration/RoutingConfiguration.kt +++ b/src/main/kotlin/configuration/RoutingConfiguration.kt @@ -1,6 +1,6 @@ -package betclic.test.configuration +package tournament.test.configuration -import betclic.test.player.routes.playerRoutes +import tournament.test.player.routes.playerRoutes import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.plugins.cors.routing.* diff --git a/src/main/kotlin/player/dtos/PlayerCreationDTO.kt b/src/main/kotlin/player/dtos/PlayerCreationDTO.kt index d42c2cd..b57254c 100644 --- a/src/main/kotlin/player/dtos/PlayerCreationDTO.kt +++ b/src/main/kotlin/player/dtos/PlayerCreationDTO.kt @@ -1,6 +1,6 @@ -package betclic.test.player.dtos +package tournament.test.player.dtos -import betclic.test.player.entities.Player +import tournament.test.player.entities.Player import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/player/dtos/PlayerInfoDTO.kt b/src/main/kotlin/player/dtos/PlayerInfoDTO.kt index 7ba4bfd..4b3c050 100644 --- a/src/main/kotlin/player/dtos/PlayerInfoDTO.kt +++ b/src/main/kotlin/player/dtos/PlayerInfoDTO.kt @@ -1,6 +1,6 @@ -package betclic.test.player.dtos +package tournament.test.player.dtos -import betclic.test.player.entities.Player +import tournament.test.player.entities.Player import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/player/dtos/PlayerUpdateDTO.kt b/src/main/kotlin/player/dtos/PlayerUpdateDTO.kt index 937f258..43310a8 100644 --- a/src/main/kotlin/player/dtos/PlayerUpdateDTO.kt +++ b/src/main/kotlin/player/dtos/PlayerUpdateDTO.kt @@ -1,6 +1,6 @@ -package betclic.test.player.dtos +package tournament.test.player.dtos -import betclic.test.player.entities.Player +import tournament.test.player.entities.Player import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/player/entities/Player.kt b/src/main/kotlin/player/entities/Player.kt index 1d4f6e0..6d4e136 100644 --- a/src/main/kotlin/player/entities/Player.kt +++ b/src/main/kotlin/player/entities/Player.kt @@ -1,4 +1,4 @@ -package betclic.test.player.entities +package tournament.test.player.entities import dev.andrewohara.dynamokt.DynamoKtPartitionKey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/player/exceptions/AlreadyExistingException.kt b/src/main/kotlin/player/exceptions/AlreadyExistingException.kt index 4deded5..694d99d 100644 --- a/src/main/kotlin/player/exceptions/AlreadyExistingException.kt +++ b/src/main/kotlin/player/exceptions/AlreadyExistingException.kt @@ -1,4 +1,4 @@ -package betclic.test.player.exceptions +package tournament.test.player.exceptions class AlreadyExistingPlayerException(val pseudo: String) : RuntimeException("$pseudo already exists. You still can update this player points") \ No newline at end of file diff --git a/src/main/kotlin/player/repositories/PlayerRepository.kt b/src/main/kotlin/player/repositories/PlayerRepository.kt index 0aa713a..440825b 100644 --- a/src/main/kotlin/player/repositories/PlayerRepository.kt +++ b/src/main/kotlin/player/repositories/PlayerRepository.kt @@ -1,6 +1,6 @@ -package betclic.test.player.repositories +package tournament.test.player.repositories -import betclic.test.player.entities.Player +import tournament.test.player.entities.Player interface PlayerRepository { diff --git a/src/main/kotlin/player/repositories/PlayerRepositoryImpl.kt b/src/main/kotlin/player/repositories/PlayerRepositoryImpl.kt index 278a263..9a99c23 100644 --- a/src/main/kotlin/player/repositories/PlayerRepositoryImpl.kt +++ b/src/main/kotlin/player/repositories/PlayerRepositoryImpl.kt @@ -1,9 +1,9 @@ -package betclic.test.player.repositories +package tournament.test.player.repositories -import betclic.test.player.entities.Player -import betclic.test.player.entities.PlayerEntity -import betclic.test.player.entities.toPlayer -import betclic.test.player.entities.toPlayerEntity +import tournament.test.player.entities.Player +import tournament.test.player.entities.PlayerEntity +import tournament.test.player.entities.toPlayer +import tournament.test.player.entities.toPlayerEntity import dev.andrewohara.dynamokt.DataClassTableSchema import kotlinx.coroutines.future.await import kotlinx.coroutines.reactive.asFlow diff --git a/src/main/kotlin/player/routes/PlayerRoute.kt b/src/main/kotlin/player/routes/PlayerRoute.kt index fc4c201..512ecc6 100644 --- a/src/main/kotlin/player/routes/PlayerRoute.kt +++ b/src/main/kotlin/player/routes/PlayerRoute.kt @@ -1,9 +1,9 @@ -package betclic.test.player.routes +package tournament.test.player.routes -import betclic.test.player.dtos.PlayerCreationDTO -import betclic.test.player.dtos.PlayerInfoDTO -import betclic.test.player.dtos.PlayerUpdateDTO -import betclic.test.player.services.PlayerService +import tournament.test.player.dtos.PlayerCreationDTO +import tournament.test.player.dtos.PlayerInfoDTO +import tournament.test.player.dtos.PlayerUpdateDTO +import tournament.test.player.services.PlayerService import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.request.* diff --git a/src/main/kotlin/player/services/PlayerService.kt b/src/main/kotlin/player/services/PlayerService.kt index c457780..9602b3d 100644 --- a/src/main/kotlin/player/services/PlayerService.kt +++ b/src/main/kotlin/player/services/PlayerService.kt @@ -1,9 +1,9 @@ -package betclic.test.player.services +package tournament.test.player.services -import betclic.test.player.dtos.PlayerCreationDTO -import betclic.test.player.dtos.PlayerInfoDTO -import betclic.test.player.dtos.PlayerUpdateDTO -import betclic.test.player.entities.Player +import tournament.test.player.dtos.PlayerCreationDTO +import tournament.test.player.dtos.PlayerInfoDTO +import tournament.test.player.dtos.PlayerUpdateDTO +import tournament.test.player.entities.Player interface PlayerService { suspend fun createNewPlayer(playerCreationDTO: PlayerCreationDTO): Player diff --git a/src/main/kotlin/player/services/PlayerServiceImpl.kt b/src/main/kotlin/player/services/PlayerServiceImpl.kt index c061dd2..16b0ca4 100644 --- a/src/main/kotlin/player/services/PlayerServiceImpl.kt +++ b/src/main/kotlin/player/services/PlayerServiceImpl.kt @@ -1,13 +1,13 @@ -package betclic.test.player.services +package tournament.test.player.services -import betclic.test.player.dtos.PlayerCreationDTO -import betclic.test.player.dtos.PlayerInfoDTO -import betclic.test.player.dtos.PlayerUpdateDTO -import betclic.test.player.dtos.toPlayer -import betclic.test.player.dtos.toPlayerInfoDTO -import betclic.test.player.entities.Player -import betclic.test.player.exceptions.AlreadyExistingPlayerException -import betclic.test.player.repositories.PlayerRepository +import tournament.test.player.dtos.PlayerCreationDTO +import tournament.test.player.dtos.PlayerInfoDTO +import tournament.test.player.dtos.PlayerUpdateDTO +import tournament.test.player.dtos.toPlayer +import tournament.test.player.dtos.toPlayerInfoDTO +import tournament.test.player.entities.Player +import tournament.test.player.exceptions.AlreadyExistingPlayerException +import tournament.test.player.repositories.PlayerRepository import io.ktor.server.application.* import io.ktor.server.plugins.* import org.slf4j.LoggerFactory diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d9ece3a..30849d1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,7 +1,7 @@ ktor: application: modules: - - betclic.test.ApplicationKt.module + - tournament.test.ApplicationKt.module deployment: port: 8080 database: diff --git a/src/test/kotlin/TestApplication.kt b/src/test/kotlin/TestApplication.kt index 0380507..e43bf9e 100644 --- a/src/test/kotlin/TestApplication.kt +++ b/src/test/kotlin/TestApplication.kt @@ -1,6 +1,6 @@ -import betclic.test.configuration -import betclic.test.configuration.DynamoDbMigrationService -import betclic.test.initialize +import tournament.test.configuration +import tournament.test.configuration.DynamoDbMigrationService +import tournament.test.initialize import io.ktor.server.application.* import org.koin.core.context.loadKoinModules import org.koin.dsl.module diff --git a/src/test/kotlin/player/PlayerIntegrationTest.kt b/src/test/kotlin/player/PlayerIntegrationTest.kt index f085e32..4cff812 100644 --- a/src/test/kotlin/player/PlayerIntegrationTest.kt +++ b/src/test/kotlin/player/PlayerIntegrationTest.kt @@ -1,10 +1,10 @@ package player import BaseIntegrationTest -import betclic.test.player.dtos.PlayerCreationDTO -import betclic.test.player.dtos.PlayerUpdateDTO -import betclic.test.player.entities.Player -import betclic.test.player.repositories.PlayerRepository +import tournament.test.player.dtos.PlayerCreationDTO +import tournament.test.player.dtos.PlayerUpdateDTO +import tournament.test.player.entities.Player +import tournament.test.player.repositories.PlayerRepository import io.ktor.client.request.* import io.ktor.http.* import kotlinx.serialization.encodeToString diff --git a/src/test/kotlin/player/PlayerServiceTest.kt b/src/test/kotlin/player/PlayerServiceTest.kt index 75b98b6..28979fa 100644 --- a/src/test/kotlin/player/PlayerServiceTest.kt +++ b/src/test/kotlin/player/PlayerServiceTest.kt @@ -1,11 +1,11 @@ package player -import betclic.test.player.dtos.PlayerCreationDTO -import betclic.test.player.dtos.PlayerUpdateDTO -import betclic.test.player.entities.Player -import betclic.test.player.exceptions.AlreadyExistingPlayerException -import betclic.test.player.repositories.PlayerRepository -import betclic.test.player.services.PlayerServiceImpl +import tournament.test.player.dtos.PlayerCreationDTO +import tournament.test.player.dtos.PlayerUpdateDTO +import tournament.test.player.entities.Player +import tournament.test.player.exceptions.AlreadyExistingPlayerException +import tournament.test.player.repositories.PlayerRepository +import tournament.test.player.services.PlayerServiceImpl import io.ktor.server.plugins.* import io.mockk.coEvery import io.mockk.coVerify -- GitLab