|
|
|
@ -71,7 +71,7 @@ public class UserDto implements OdinDto {
|
|
|
|
|
@Size(min = Constants.MIN_PASSWORD_LENGTH, max = 50)
|
|
|
|
|
private String passwordConfirm;
|
|
|
|
|
|
|
|
|
|
private Date birthYear;
|
|
|
|
|
private Date birthDate;
|
|
|
|
|
|
|
|
|
|
private User.UserDegree degree;
|
|
|
|
|
|
|
|
|
@ -91,7 +91,7 @@ public class UserDto implements OdinDto {
|
|
|
|
|
this.roles.addAll(user.getRoles().stream()
|
|
|
|
|
.map(UserRoleDto::new)
|
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
|
this.birthYear = user.getBirthYear();
|
|
|
|
|
this.birthDate = user.getBirthDate();
|
|
|
|
|
this.degree = user.getDegree();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -170,12 +170,12 @@ public class UserDto implements OdinDto {
|
|
|
|
|
return passwordConfirm;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Date getBirthYear() {
|
|
|
|
|
return birthYear;
|
|
|
|
|
public Date getBirthDate() {
|
|
|
|
|
return birthDate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setBirthYear(Date birthYear) {
|
|
|
|
|
this.birthYear = birthYear;
|
|
|
|
|
public void setBirthDate(Date birthDate) {
|
|
|
|
|
this.birthDate = birthDate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public User.UserDegree getDegree() {
|
|
|
|
@ -211,7 +211,7 @@ public class UserDto implements OdinDto {
|
|
|
|
|
", roles=" + roles +
|
|
|
|
|
", password='" + password + '\'' +
|
|
|
|
|
", passwordConfirm='" + passwordConfirm + '\'' +
|
|
|
|
|
", birthYear='" + birthYear + '\'' +
|
|
|
|
|
", birthDate='" + birthDate + '\'' +
|
|
|
|
|
", degree='" + degree + '\'' +
|
|
|
|
|
'}';
|
|
|
|
|
}
|
|
|
|
|