Merge pull request #85 from SimonDmz/fix-person-birthdate-mapping

Fix Person birthdate mapping when creating surveyUnit
InseeFr · Sep 30, 2022 · 4905614 · 4905614
2 parents 3ab1df9 + 4e47537
commit 4905614
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.pearljam</groupId>
 	<artifactId>pearljam-back-office</artifactId>
-	<version>4.0.2</version>
+	<version>4.0.3</version>
 	<packaging>war</packaging>
 	<name>Pearl-Jam-Back-Office</name>
 	<description>Back-office services for for PearlJam</description>

diff --git a/src/main/java/fr/insee/pearljam/api/domain/Person.java b/src/main/java/fr/insee/pearljam/api/domain/Person.java
@@ -94,13 +94,14 @@ public Person() {
 	/**
 	 * Constructor with all args
 	 */
-	public Person(Title title, String firstName, String lastName, String email, boolean favoriteEmail, boolean privileged) {
+	public Person(Title title, String firstName, String lastName, String email, boolean favoriteEmail, boolean privileged, Long birthdate) {
 		this.title = title;
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.email = email;
 		this.favoriteEmail = favoriteEmail;
 		this.privileged = privileged;
+		this.birthdate = birthdate;
 	}
 
 	public Person(PersonDto p, SurveyUnit su) {
@@ -110,6 +111,7 @@ public Person(PersonDto p, SurveyUnit su) {
 		this.email = p.getEmail();
 		this.favoriteEmail = p.isFavoriteEmail();
 		this.privileged = p.isPrivileged();
+		this.birthdate = p.getBirthdate();
 		this.phoneNumbers = p.getPhoneNumbers().stream().map(pn -> new PhoneNumber(pn, this)).collect(Collectors.toSet());
 		this.surveyUnit = su;
 	}

diff --git a/src/main/java/fr/insee/pearljam/api/dto/person/PersonDto.java b/src/main/java/fr/insee/pearljam/api/dto/person/PersonDto.java
@@ -46,13 +46,14 @@ public PersonDto(Person person) {
 	/**
 	 * Constructor with all args
 	 */
-	public PersonDto(Title title, String firstName, String lastName, String email, boolean favoriteEmail, boolean privileged) {
+	public PersonDto(Title title, String firstName, String lastName, String email, boolean favoriteEmail, boolean privileged, Long birthdate) {
 		this.title = title;
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.email = email;
 		this.favoriteEmail = favoriteEmail;
 		this.privileged = privileged;
+		this.birthdate = birthdate;
 	}
 
 	/**