From 541551a57f62054d7394292efc16120ebf6aab86 Mon Sep 17 00:00:00 2001 From: ccornu <ccornu@takima.fr> Date: Tue, 11 Feb 2025 09:05:44 +0100 Subject: [PATCH] feat: rearange file structure --- src/main/kotlin/configuration/DynamoDbMigration.kt | 2 +- src/main/kotlin/configuration/InjectionConfiguration.kt | 6 +++--- src/main/kotlin/configuration/RoutingConfiguration.kt | 2 +- src/main/kotlin/player/dtos/PlayerCreationDTO.kt | 2 +- src/main/kotlin/player/dtos/PlayerInfoDTO.kt | 2 +- src/main/kotlin/player/dtos/PlayerUpdateDTO.kt | 2 +- src/main/kotlin/player/{ => entities}/Player.kt | 2 +- .../kotlin/player/{ => repositories}/PlayerRepository.kt | 9 ++++++--- src/main/kotlin/player/{ => routes}/PlayerRoute.kt | 4 +++- src/main/kotlin/player/{ => services}/PlayerService.kt | 3 ++- .../kotlin/player/{ => services}/PlayerServiceImpl.kt | 4 +++- src/test/kotlin/player/PlayerIntegrationTest.kt | 4 ++-- src/test/kotlin/player/PlayerServiceTest.kt | 6 +++--- 13 files changed, 28 insertions(+), 20 deletions(-) rename src/main/kotlin/player/{ => entities}/Player.kt (93%) rename src/main/kotlin/player/{ => repositories}/PlayerRepository.kt (91%) rename src/main/kotlin/player/{ => routes}/PlayerRoute.kt (91%) rename src/main/kotlin/player/{ => services}/PlayerService.kt (87%) rename src/main/kotlin/player/{ => services}/PlayerServiceImpl.kt (93%) diff --git a/src/main/kotlin/configuration/DynamoDbMigration.kt b/src/main/kotlin/configuration/DynamoDbMigration.kt index b5e4535..3677fc6 100644 --- a/src/main/kotlin/configuration/DynamoDbMigration.kt +++ b/src/main/kotlin/configuration/DynamoDbMigration.kt @@ -1,6 +1,6 @@ package betclic.test.configuration -import betclic.test.player.PlayerEntity +import betclic.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/InjectionConfiguration.kt b/src/main/kotlin/configuration/InjectionConfiguration.kt index e1e4d5d..5d3230f 100644 --- a/src/main/kotlin/configuration/InjectionConfiguration.kt +++ b/src/main/kotlin/configuration/InjectionConfiguration.kt @@ -1,8 +1,8 @@ package betclic.test.configuration -import betclic.test.player.PlayerRepository -import betclic.test.player.PlayerService -import betclic.test.player.PlayerServiceImpl +import betclic.test.player.repositories.PlayerRepository +import betclic.test.player.services.PlayerService +import betclic.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 2e5b34b..43ef97e 100644 --- a/src/main/kotlin/configuration/RoutingConfiguration.kt +++ b/src/main/kotlin/configuration/RoutingConfiguration.kt @@ -1,6 +1,6 @@ package betclic.test.configuration -import betclic.test.player.playerRoutes +import betclic.test.player.routes.playerRoutes import io.ktor.server.application.* import io.ktor.server.routing.* diff --git a/src/main/kotlin/player/dtos/PlayerCreationDTO.kt b/src/main/kotlin/player/dtos/PlayerCreationDTO.kt index eb150a1..d42c2cd 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 -import betclic.test.player.Player +import betclic.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 16b8490..7ba4bfd 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 -import betclic.test.player.Player +import betclic.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 ca5f03e..937f258 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 -import betclic.test.player.Player +import betclic.test.player.entities.Player import kotlinx.serialization.Serializable @Serializable diff --git a/src/main/kotlin/player/Player.kt b/src/main/kotlin/player/entities/Player.kt similarity index 93% rename from src/main/kotlin/player/Player.kt rename to src/main/kotlin/player/entities/Player.kt index 45d7d15..1d4f6e0 100644 --- a/src/main/kotlin/player/Player.kt +++ b/src/main/kotlin/player/entities/Player.kt @@ -1,4 +1,4 @@ -package betclic.test.player +package betclic.test.player.entities import dev.andrewohara.dynamokt.DynamoKtPartitionKey import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/player/PlayerRepository.kt b/src/main/kotlin/player/repositories/PlayerRepository.kt similarity index 91% rename from src/main/kotlin/player/PlayerRepository.kt rename to src/main/kotlin/player/repositories/PlayerRepository.kt index 8aae634..f5b8ef2 100644 --- a/src/main/kotlin/player/PlayerRepository.kt +++ b/src/main/kotlin/player/repositories/PlayerRepository.kt @@ -1,5 +1,9 @@ -package betclic.test.player +package betclic.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 dev.andrewohara.dynamokt.DataClassTableSchema import io.ktor.server.application.* import kotlinx.coroutines.coroutineScope @@ -62,5 +66,4 @@ class PlayerRepository(dynamoDbEnhancedClient: DynamoDbEnhancedAsyncClient) { table.createTable().await() } -} - +} \ No newline at end of file diff --git a/src/main/kotlin/player/PlayerRoute.kt b/src/main/kotlin/player/routes/PlayerRoute.kt similarity index 91% rename from src/main/kotlin/player/PlayerRoute.kt rename to src/main/kotlin/player/routes/PlayerRoute.kt index 439e37b..bdb8158 100644 --- a/src/main/kotlin/player/PlayerRoute.kt +++ b/src/main/kotlin/player/routes/PlayerRoute.kt @@ -1,8 +1,10 @@ -package betclic.test.player +package betclic.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.entities.Player +import betclic.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/PlayerService.kt b/src/main/kotlin/player/services/PlayerService.kt similarity index 87% rename from src/main/kotlin/player/PlayerService.kt rename to src/main/kotlin/player/services/PlayerService.kt index 3214fd6..cb1dc72 100644 --- a/src/main/kotlin/player/PlayerService.kt +++ b/src/main/kotlin/player/services/PlayerService.kt @@ -1,8 +1,9 @@ -package betclic.test.player +package betclic.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 interface PlayerService { suspend fun createNewPlayer(playerCreationDTO: PlayerCreationDTO): Player diff --git a/src/main/kotlin/player/PlayerServiceImpl.kt b/src/main/kotlin/player/services/PlayerServiceImpl.kt similarity index 93% rename from src/main/kotlin/player/PlayerServiceImpl.kt rename to src/main/kotlin/player/services/PlayerServiceImpl.kt index 7e65219..22f92a7 100644 --- a/src/main/kotlin/player/PlayerServiceImpl.kt +++ b/src/main/kotlin/player/services/PlayerServiceImpl.kt @@ -1,11 +1,13 @@ -package betclic.test.player +package betclic.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 io.ktor.server.plugins.* class PlayerServiceImpl(private val playerRepository: PlayerRepository) : PlayerService { diff --git a/src/test/kotlin/player/PlayerIntegrationTest.kt b/src/test/kotlin/player/PlayerIntegrationTest.kt index 896b785..62a9ff8 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.Player -import betclic.test.player.PlayerRepository 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 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 c0a592f..e4aaa14 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.Player -import betclic.test.player.PlayerRepository -import betclic.test.player.PlayerServiceImpl 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 io.ktor.server.plugins.* import io.mockk.coEvery import io.mockk.coVerify -- GitLab