From f91b25b35b823553158dbc560159a25e935b9e10 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Tue, 8 Oct 2019 14:37:21 +0200 Subject: [PATCH] add email to citizen entity --- src/main/kotlin/fr/dcproject/entity/Citizen.kt | 1 + src/test/kotlin/ArticleTest.kt | 2 ++ src/test/kotlin/ConstitutionTest.kt | 3 +++ src/test/kotlin/FollowTest.kt | 2 ++ src/test/kotlin/VoteTest.kt | 3 +++ src/test/kotlin/feature/ArticleSteps.kt | 2 ++ src/test/kotlin/feature/ConstitutionSteps.kt | 1 + src/test/kotlin/feature/KtorServerAuthSteps.kt | 3 +++ src/test/resources/feature/auth.feature | 3 ++- 9 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/fr/dcproject/entity/Citizen.kt b/src/main/kotlin/fr/dcproject/entity/Citizen.kt index a5adc95..af9e695 100644 --- a/src/main/kotlin/fr/dcproject/entity/Citizen.kt +++ b/src/main/kotlin/fr/dcproject/entity/Citizen.kt @@ -7,6 +7,7 @@ import java.util.* class Citizen( id: UUID = UUID.randomUUID(), var name: Name?, + var email: String?, var birthday: DateTime?, var userId: UUID? = null, var voteAnonymous: Boolean = true, diff --git a/src/test/kotlin/ArticleTest.kt b/src/test/kotlin/ArticleTest.kt index fbc0724..0ab39df 100644 --- a/src/test/kotlin/ArticleTest.kt +++ b/src/test/kotlin/ArticleTest.kt @@ -47,6 +47,7 @@ class ArticleTest { "created_at" : null, "updated_at" : null }, + "email": "jaque.bono@gmail.com", "created_at" : null }, "created_at" : null @@ -59,6 +60,7 @@ class ArticleTest { val citizen = Citizen( name = Citizen.Name("Jaque", "Bono"), birthday = DateTime.now(), + email = "jaque.bono@gmail.com", user = user ) val article = Article( diff --git a/src/test/kotlin/ConstitutionTest.kt b/src/test/kotlin/ConstitutionTest.kt index 23b1838..b9fdbe0 100644 --- a/src/test/kotlin/ConstitutionTest.kt +++ b/src/test/kotlin/ConstitutionTest.kt @@ -34,6 +34,7 @@ class ConstitutionTest { "last_name":"Bono", "civility":null }, + "email": "jaque.bono@gmail.com", "birthday":"2019-08-07T20:34:08.013Z", "user_id":null, "vote_anonymous":null, @@ -58,6 +59,7 @@ class ConstitutionTest { "last_name":"Bono", "civility":null }, + "email": "jaque.bono@gmail.com", "birthday":"2019-08-07T20:34:08.013Z", "user_id":null, "vote_anonymous":null, @@ -78,6 +80,7 @@ class ConstitutionTest { val user = User(username = "jaque", plainPassword = "azerty") val citizen = Citizen( name = Citizen.Name("Jaque", "Bono"), + email = "jaque.bono@gmail.com", birthday = DateTime.now(), user = user ) diff --git a/src/test/kotlin/FollowTest.kt b/src/test/kotlin/FollowTest.kt index ccdfb52..e9505c7 100644 --- a/src/test/kotlin/FollowTest.kt +++ b/src/test/kotlin/FollowTest.kt @@ -28,6 +28,7 @@ class FollowTest { "last_name":"Bono", "civility":null }, + "email": "jaque.bono@gmail.com", "birthday":"2019-08-09T11:42:47.168Z", "user_id":null, "vote_anonymous":null, @@ -66,6 +67,7 @@ class FollowTest { val user = User(username = "jaque", plainPassword = "azerty") val citizen = Citizen( name = Citizen.Name("Jaque", "Bono"), + email = "jaque.bono@gmail.com", birthday = DateTime.now(), user = user ) diff --git a/src/test/kotlin/VoteTest.kt b/src/test/kotlin/VoteTest.kt index 97b3362..a179117 100644 --- a/src/test/kotlin/VoteTest.kt +++ b/src/test/kotlin/VoteTest.kt @@ -29,6 +29,7 @@ class VoteTest { "last_name": "Bono", "civility": null }, + "email": "jaque.bono@gmail.com", "birthday": "2019-10-01T10:59:40.570Z", "user_id": null, "vote_anonymous": true, @@ -62,6 +63,7 @@ class VoteTest { "last_name": "Bono", "civility": null }, + "email": "jaque.bono@gmail.com", "birthday": "2019-10-01T10:59:40.570Z", "user_id": null, "vote_anonymous": true, @@ -102,6 +104,7 @@ class VoteTest { val user = User(username = "jaque", plainPassword = "azerty") val citizen = Citizen( name = Citizen.Name("Jaque", "Bono"), + email = "jaque.bono@gmail.com", birthday = DateTime.now(), user = user ) diff --git a/src/test/kotlin/feature/ArticleSteps.kt b/src/test/kotlin/feature/ArticleSteps.kt index 8aab8ce..1d294b9 100644 --- a/src/test/kotlin/feature/ArticleSteps.kt +++ b/src/test/kotlin/feature/ArticleSteps.kt @@ -19,6 +19,7 @@ class ArticleSteps: En, KoinTest { Given("I have article with id {string}") { id: String -> var citizen = Citizen( name = Citizen.Name("John", "Doe"), + email = "john.doe@gmail.com", birthday = DateTime.now(), user = UserEntity(username = "john-doe", plainPassword = "azerty") ) @@ -55,6 +56,7 @@ class ArticleSteps: En, KoinTest { Given("I have comment {string} on article {string}") { commentId: String, articleId: String -> var citizen = Citizen( name = Citizen.Name("John", "Doe"), + email = "john.doe@gmail.com", birthday = DateTime.now(), user = UserEntity(username = "john-doe", plainPassword = "azerty") ) diff --git a/src/test/kotlin/feature/ConstitutionSteps.kt b/src/test/kotlin/feature/ConstitutionSteps.kt index 30dff3f..4405729 100644 --- a/src/test/kotlin/feature/ConstitutionSteps.kt +++ b/src/test/kotlin/feature/ConstitutionSteps.kt @@ -18,6 +18,7 @@ class ConstitutionSteps: En, KoinTest { Given("I have constitution with id {string}") { id: String -> var citizen = Citizen( name = Citizen.Name("John", "Doe"), + email = "john.doe@gmail.com", birthday = DateTime.now(), user = UserEntity(username = "john-doe", plainPassword = "azerty") ) diff --git a/src/test/kotlin/feature/KtorServerAuthSteps.kt b/src/test/kotlin/feature/KtorServerAuthSteps.kt index 6c0e7e8..630fd92 100644 --- a/src/test/kotlin/feature/KtorServerAuthSteps.kt +++ b/src/test/kotlin/feature/KtorServerAuthSteps.kt @@ -31,6 +31,7 @@ class KtorServerAuthSteps: En, KoinTest { val citizen = Citizen( id = UUID.fromString(data["id"]), name = Citizen.Name(data["firstName"], data["lastName"]), + email = ((data["firstName"] + "-" + data["lastName"]).toLowerCase()) + "@gmail.com", birthday = DateTime.now(), user = user ) @@ -53,6 +54,7 @@ class KtorServerAuthSteps: En, KoinTest { val citizen = Citizen( id = UUID.fromString(id), name = Citizen.Name(firstName, lastName), + email = ("$firstName-$lastName".toLowerCase())+"@gmail.com", birthday = DateTime.now(), user = user ) @@ -77,6 +79,7 @@ class KtorServerAuthSteps: En, KoinTest { val citizen = Citizen( id = UUID.fromString(id), name = Citizen.Name(firstName, lastName), + email = "$firstName-$lastName".toLowerCase() + "@gmail.com", birthday = DateTime.now(), user = user, followAnonymous = false, diff --git a/src/test/resources/feature/auth.feature b/src/test/resources/feature/auth.feature index 4fd762c..199d490 100644 --- a/src/test/resources/feature/auth.feature +++ b/src/test/resources/feature/auth.feature @@ -9,7 +9,8 @@ Feature: Auth routes "user":{ "username": "george-junior", "plain_password": "azerty" - } + }, + "email": "george-junior@gmail.com" } """ Then the response status code should be 200