added dob filed for user
This commit is contained in:
@@ -17,7 +17,7 @@ public class SamlFailureHandler implements AuthenticationFailureHandler {
|
|||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(SamlSuccessHandler.class);
|
private final Logger logger = LoggerFactory.getLogger(SamlSuccessHandler.class);
|
||||||
|
|
||||||
@Value("fe.base.url")
|
@Value("${fe.base.url}")
|
||||||
private String feBaseUrl;
|
private String feBaseUrl;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ public class UserDao {
|
|||||||
userEntity.setPhoneNumber(userReq.getPhoneNumber());
|
userEntity.setPhoneNumber(userReq.getPhoneNumber());
|
||||||
userEntity.setRoleEntity(roleDao.validateRole(userReq.getRoleId()));
|
userEntity.setRoleEntity(roleDao.validateRole(userReq.getRoleId()));
|
||||||
userEntity.setCodiceFiscale(userReq.getCodiceFiscale());
|
userEntity.setCodiceFiscale(userReq.getCodiceFiscale());
|
||||||
|
userEntity.setDateOfBirth(userReq.getDateOfBirth());
|
||||||
return userEntity;
|
return userEntity;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,6 +131,8 @@ public class UserDao {
|
|||||||
RoleResponseBean roleResponseBean = roleDao.convertRoleEntityToRoleResponse(userEntity.getRoleEntity());
|
RoleResponseBean roleResponseBean = roleDao.convertRoleEntityToRoleResponse(userEntity.getRoleEntity());
|
||||||
userResponseBean.setRole(roleResponseBean);
|
userResponseBean.setRole(roleResponseBean);
|
||||||
userResponseBean.setLastLogin(userEntity.getLastLogin());
|
userResponseBean.setLastLogin(userEntity.getLastLogin());
|
||||||
|
userResponseBean.setCodiceFiscale(userEntity.getCodiceFiscale());
|
||||||
|
userResponseBean.setDateOfBirth(userEntity.getDateOfBirth());
|
||||||
return userResponseBean;
|
return userResponseBean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,4 +61,7 @@ public class UserEntity extends BaseEntity {
|
|||||||
|
|
||||||
@Column(name = "CODICE_FISCALE")
|
@Column(name = "CODICE_FISCALE")
|
||||||
private String codiceFiscale;
|
private String codiceFiscale;
|
||||||
|
|
||||||
|
@Column(name = "DATE_OF_BIRTH")
|
||||||
|
private LocalDateTime dateOfBirth;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package net.gepafin.tendermanagement.model.request;
|
package net.gepafin.tendermanagement.model.request;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import jakarta.validation.constraints.Email;
|
import jakarta.validation.constraints.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
@@ -33,5 +35,7 @@ public class UserReq {
|
|||||||
private String country;
|
private String country;
|
||||||
|
|
||||||
private String codiceFiscale;
|
private String codiceFiscale;
|
||||||
|
|
||||||
|
private LocalDateTime dateOfBirth;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ public class LoginResponse {
|
|||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
private LocalDateTime lastLogin;
|
private LocalDateTime lastLogin;
|
||||||
|
|
||||||
|
private String codiceFiscale;
|
||||||
|
|
||||||
|
private LocalDateTime dateOfBirth;
|
||||||
|
|
||||||
private LocalDateTime createdDate;
|
private LocalDateTime createdDate;
|
||||||
|
|
||||||
|
|||||||
@@ -32,5 +32,9 @@ public class UserResponseBean extends BaseBean {
|
|||||||
private UserStatusEnum status;
|
private UserStatusEnum status;
|
||||||
|
|
||||||
private LocalDateTime lastLogin;
|
private LocalDateTime lastLogin;
|
||||||
|
|
||||||
|
private String codiceFiscale;
|
||||||
|
|
||||||
|
private LocalDateTime dateOfBirth;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,6 +104,8 @@ public class AuthenticationService {
|
|||||||
loginResponse.setStatus(user.getStatus());
|
loginResponse.setStatus(user.getStatus());
|
||||||
loginResponse.setCity(user.getCity());
|
loginResponse.setCity(user.getCity());
|
||||||
loginResponse.setLastLogin(user.getLastLogin());
|
loginResponse.setLastLogin(user.getLastLogin());
|
||||||
|
loginResponse.setCodiceFiscale(user.getCodiceFiscale());
|
||||||
|
loginResponse.setDateOfBirth(user.getDateOfBirth());
|
||||||
loginResponse.setCreatedDate(user.getCreatedDate());
|
loginResponse.setCreatedDate(user.getCreatedDate());
|
||||||
loginResponse.setUpdatedDate(user.getUpdatedDate());
|
loginResponse.setUpdatedDate(user.getUpdatedDate());
|
||||||
return loginResponse;
|
return loginResponse;
|
||||||
|
|||||||
@@ -726,6 +726,7 @@
|
|||||||
<column name="codice_fiscale" type="varchar(255)">
|
<column name="codice_fiscale" type="varchar(255)">
|
||||||
<constraints nullable="true" unique="true"/>
|
<constraints nullable="true" unique="true"/>
|
||||||
</column>
|
</column>
|
||||||
|
<column name="date_of_birth" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||||
</addColumn>
|
</addColumn>
|
||||||
<dropNotNullConstraint tableName="gepafin_user" columnName="password"/>
|
<dropNotNullConstraint tableName="gepafin_user" columnName="password"/>
|
||||||
</changeSet>
|
</changeSet>
|
||||||
|
|||||||
Reference in New Issue
Block a user