#68 Clean vote and citizen Entity

remove last warnings
This commit is contained in:
2021-03-03 02:25:24 +01:00
parent 2e8215eafc
commit 79feed54dd
17 changed files with 52 additions and 142 deletions

View File

@@ -46,13 +46,13 @@ fun createConstitution(
): Constitution {
val constitutionRepository: ConstitutionRepository by lazy { GlobalContext.get().koin.get() }
val createdBy: CitizenWithUserI = createCitizen(createdBy)
val creator: CitizenWithUserI = createCitizen(createdBy)
val constitution = ConstitutionSimple(
id = id ?: UUID.randomUUID(),
title = LoremIpsum().getTitle(3),
titles = titles ?: createTitles(5),
createdBy = createdBy,
createdBy = creator,
versionId = UUID.randomUUID()
)
return constitutionRepository.upsert(constitution) ?: error("Cannot create constitution")

View File

@@ -34,6 +34,7 @@ fun WorkgroupForView<CitizenCreator>.`With members`(
addMemberToWorkgroup(this, *member)
}
@Suppress("UNCHECKED_CAST")
fun addMemberToWorkgroup(workgroup: WorkgroupForView<CitizenCreator>, vararg membersNames: CitizenI.Name) {
val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
val workgroupRepository: WorkgroupRepository by lazy { GlobalContext.get().koin.get() }
@@ -58,8 +59,8 @@ private fun createWorkgroup(
val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
val workgroupRepository: WorkgroupRepository by lazy { GlobalContext.get().koin.get() }
val createdBy = createdBy ?: CitizenI.Name("Paul", "Langevin")
val creator = citizenRepository.findByName(createdBy) ?: run {
val creatorName = createdBy ?: CitizenI.Name("Paul", "Langevin")
val creator = citizenRepository.findByName(creatorName) ?: run {
val username = ("username" + UUID.randomUUID().toString())
.toLowerCase().replace(' ', '-')
val user = UserForCreate(
@@ -67,7 +68,7 @@ private fun createWorkgroup(
password = "azerty",
)
CitizenForCreate(
name = createdBy,
name = creatorName,
email = "$username@dc-project.fr",
birthday = DateTime.now(),
user = user