diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java index 1e740869..81df79e3 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java @@ -17,7 +17,7 @@ public class SamlFailureHandler implements AuthenticationFailureHandler { private final Logger logger = LoggerFactory.getLogger(SamlSuccessHandler.class); - @Value("fe.base.url") + @Value("${fe.base.url}") private String feBaseUrl; @Override diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java index 8dddbfea..b615f263 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java @@ -110,6 +110,7 @@ public class UserDao { userEntity.setPhoneNumber(userReq.getPhoneNumber()); userEntity.setRoleEntity(roleDao.validateRole(userReq.getRoleId())); userEntity.setCodiceFiscale(userReq.getCodiceFiscale()); + userEntity.setDateOfBirth(userReq.getDateOfBirth()); return userEntity; } @@ -130,6 +131,8 @@ public class UserDao { RoleResponseBean roleResponseBean = roleDao.convertRoleEntityToRoleResponse(userEntity.getRoleEntity()); userResponseBean.setRole(roleResponseBean); userResponseBean.setLastLogin(userEntity.getLastLogin()); + userResponseBean.setCodiceFiscale(userEntity.getCodiceFiscale()); + userResponseBean.setDateOfBirth(userEntity.getDateOfBirth()); return userResponseBean; } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java index 0a0c9016..37b0ab57 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java @@ -61,4 +61,7 @@ public class UserEntity extends BaseEntity { @Column(name = "CODICE_FISCALE") private String codiceFiscale; + + @Column(name = "DATE_OF_BIRTH") + private LocalDateTime dateOfBirth; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java index e81bdaf3..508baabe 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java @@ -1,5 +1,7 @@ package net.gepafin.tendermanagement.model.request; +import java.time.LocalDateTime; + import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -33,5 +35,7 @@ public class UserReq { private String country; private String codiceFiscale; + + private LocalDateTime dateOfBirth; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/LoginResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/LoginResponse.java index 64af6b1a..6317724e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/LoginResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/LoginResponse.java @@ -35,6 +35,10 @@ public class LoginResponse { private String status; private LocalDateTime lastLogin; + + private String codiceFiscale; + + private LocalDateTime dateOfBirth; private LocalDateTime createdDate; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java index 5c1a8ef2..565e2561 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java @@ -32,5 +32,9 @@ public class UserResponseBean extends BaseBean { private UserStatusEnum status; private LocalDateTime lastLogin; + + private String codiceFiscale; + + private LocalDateTime dateOfBirth; } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java index 1b61baa7..457a1e5d 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -104,6 +104,8 @@ public class AuthenticationService { loginResponse.setStatus(user.getStatus()); loginResponse.setCity(user.getCity()); loginResponse.setLastLogin(user.getLastLogin()); + loginResponse.setCodiceFiscale(user.getCodiceFiscale()); + loginResponse.setDateOfBirth(user.getDateOfBirth()); loginResponse.setCreatedDate(user.getCreatedDate()); loginResponse.setUpdatedDate(user.getUpdatedDate()); return loginResponse; diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 212db4d3..cfde8228 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -726,6 +726,7 @@ +