Split Entities for remove nullable variables

This commit is contained in:
2020-01-28 11:08:43 +01:00
parent 3cdd1f3a46
commit 813d6857e9
52 changed files with 569 additions and 287 deletions

View File

@@ -1,14 +1,14 @@
package feature
import fr.dcproject.entity.Citizen
import fr.dcproject.entity.*
import fr.dcproject.entity.ConstitutionSimple.TitleSimple
import fr.dcproject.entity.request.Constitution
import io.cucumber.java8.En
import org.joda.time.DateTime
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.concurrent.CompletionException
import fr.dcproject.entity.Constitution as ConstitutionEntity
import fr.dcproject.entity.Constitution.Title as TitleEntity
import fr.dcproject.entity.User as UserEntity
import fr.dcproject.repository.Citizen as CitizenRepository
import fr.dcproject.repository.Constitution as ConstitutionRepository
@@ -17,7 +17,7 @@ class ConstitutionSteps : En, KoinTest {
init {
Given("I have constitution with id {string}") { id: String ->
var citizen = Citizen(
name = Citizen.Name("John", "Doe"),
name = CitizenI.Name("John", "Doe"),
email = "john.doe@gmail.com",
birthday = DateTime.now(),
user = UserEntity(username = "john-doe", plainPassword = "azerty")
@@ -29,33 +29,31 @@ class ConstitutionSteps : En, KoinTest {
citizen = get<CitizenRepository>().findByUsername("john-doe")!!
}
val title1 = TitleEntity(
val title1 = Constitution.Title(
name = "My Title"
)
val constitution = ConstitutionEntity(
id = UUID.fromString(id),
val constitution = Constitution(
title = "hello",
titles = listOf(title1),
createdBy = citizen,
titles = mutableListOf(title1),
anonymous = false
)
get<ConstitutionRepository>().upsert(constitution)
get<ConstitutionRepository>().upsert(constitution.create(citizen))
}
Given("I have constitution with id {string} created by {string}") { id: String, username: String ->
val citizen = get<CitizenRepository>().findByUsername(username)!!
val title1 = TitleEntity(
val title1 = TitleSimple<ArticleRef>(
name = "My Title"
)
val constitution = ConstitutionEntity(
val constitution = ConstitutionSimple<CitizenSimple, TitleSimple<ArticleRef>>(
id = UUID.fromString(id),
title = "hello",
titles = listOf(title1),
createdBy = citizen,
anonymous = false
titles = mutableListOf(title1),
anonymous = false,
createdBy = citizen
)
get<ConstitutionRepository>().upsert(constitution)
}