Clean Citizen entities

Change plainPassword to just password
Add request Input for /login

src/test/kotlin/steps/ArticleSteps.kt

@@ -4,7 +4,9 @@ import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleForUpdate
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRepository
+import fr.dcproject.component.auth.UserForCreate
 import fr.dcproject.component.citizen.Citizen
+import fr.dcproject.component.citizen.CitizenForCreate
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.comment.article.CommentArticleRepository
@@ -16,7 +18,6 @@ import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
 import java.util.UUID
-import fr.dcproject.component.auth.User as UserEntity
 
 class ArticleSteps : En, KoinTest {
     init {
@@ -57,16 +58,16 @@ class ArticleSteps : En, KoinTest {
         } else {
             val first = "firstName" + UUID.randomUUID().toString()
             val last = "lastName" + UUID.randomUUID().toString()
-            Citizen(
+            CitizenForCreate(
                 birthday = DateTime.now(),
                 name = CitizenI.Name(
                     first,
                     last
                 ),
                 email = "$first@fakeemail.com",
-                user = UserEntity(username = username, plainPassword = "azerty")
-            ).also {
-                get<CitizenRepository>().insertWithUser(it)
+                user = UserForCreate(username = username, password = "azerty")
+            ).let {
+                get<CitizenRepository>().insertWithUser(it) ?: error("Unable to create User")
             }
         }
 

src/test/kotlin/steps/CitizenSteps.kt

@@ -1,7 +1,7 @@
 package steps
 
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.citizen.Citizen
+import fr.dcproject.component.auth.UserForCreate
+import fr.dcproject.component.citizen.CitizenForCreate
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
 import io.cucumber.datatable.DataTable
@@ -40,12 +40,12 @@ class CitizenSteps : En, KoinTest {
         val id: UUID = id ?: params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID()
         val email = params?.get("email") ?: ("$firstName-$lastName".toLowerCase()) + "@dc-project.fr"
 
-        val user = User(
+        val user = UserForCreate(
             id = id,
             username = "$firstName-$lastName".toLowerCase(),
-            plainPassword = "azerty"
+            password = "azerty",
         )
-        val citizen = Citizen(
+        val citizen = CitizenForCreate(
             id = id,
             name = CitizenI.Name(firstName, lastName),
             email = email,

src/test/kotlin/steps/ConstitutionSteps.kt

@@ -2,7 +2,9 @@ package steps
 
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.UserForCreate
 import fr.dcproject.component.citizen.Citizen
+import fr.dcproject.component.citizen.CitizenForCreate
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenWithUserI
@@ -18,7 +20,6 @@ import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
 import java.util.UUID
-import fr.dcproject.component.auth.User as UserEntity
 
 class ConstitutionSteps : En, KoinTest {
     init {
@@ -55,16 +56,16 @@ class ConstitutionSteps : En, KoinTest {
         } else {
             val first = "firstName" + UUID.randomUUID().toString()
             val last = "lastName" + UUID.randomUUID().toString()
-            Citizen(
+            CitizenForCreate(
                 birthday = DateTime.now(),
                 name = CitizenI.Name(
                     first,
                     last
                 ),
                 email = "$first@fakeemail.com",
-                user = UserEntity(username = username, plainPassword = "azerty")
-            ).also {
-                get<CitizenRepository>().insertWithUser(it)
+                user = UserForCreate(username = username, password = "azerty")
+            ).let {
+                get<CitizenRepository>().insertWithUser(it) ?: error("Unable to create User")
             }
         }
 

src/test/kotlin/steps/WorkgroupSteps.kt

@@ -1,8 +1,8 @@
 package steps
 
 import fr.dcproject.common.utils.toUUID
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.citizen.Citizen
+import fr.dcproject.component.auth.UserForCreate
+import fr.dcproject.component.citizen.CitizenForCreate
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.citizen.CitizenRepository
@@ -39,17 +39,17 @@ class WorkgroupSteps : En, KoinTest {
                 get<CitizenRepository>().findByUsername(it.toLowerCase().replace(' ', '-'))
             } ?: run {
                 val username = "paul-langevin".toLowerCase() + UUID.randomUUID()
-                val user = User(
+                val user = UserForCreate(
                     username = username,
-                    plainPassword = "azerty"
+                    password = "azerty",
                 )
-                Citizen(
+                CitizenForCreate(
                     name = CitizenI.Name("Paul", "Langevin"),
                     email = "$username@dc-project.fr",
                     birthday = DateTime.now(),
                     user = user
-                ).also {
-                    get<CitizenRepository>().insertWithUser(it)
+                ).let {
+                    get<CitizenRepository>().insertWithUser(it) ?: error("Unable to create User")
                 }
             }