feat: update Employee entity
This commit is contained in:
parent
5a7d2b1f9c
commit
10f6c7753d
@ -14,6 +14,7 @@ import javax.validation.constraints.Email;
|
|||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -86,7 +87,7 @@ public class Employee implements UserDetails {
|
|||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "employee")
|
@OneToMany(mappedBy = "employee")
|
||||||
private List<Visit> visits;
|
private List<Visit> visits = new ArrayList<>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Collection<? extends GrantedAuthority> getAuthorities() {
|
public Collection<? extends GrantedAuthority> getAuthorities() {
|
||||||
|
@ -8,6 +8,8 @@ import com.example.nto.dto.entity.employee.EmployeeCreateDTO;
|
|||||||
import com.example.nto.utils.Utils;
|
import com.example.nto.utils.Utils;
|
||||||
import lombok.experimental.UtilityClass;
|
import lombok.experimental.UtilityClass;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@UtilityClass
|
@UtilityClass
|
||||||
public class EmployeeCreateMapper {
|
public class EmployeeCreateMapper {
|
||||||
public static Employee convertFromDTO(
|
public static Employee convertFromDTO(
|
||||||
@ -27,7 +29,7 @@ public class EmployeeCreateMapper {
|
|||||||
employee.setRole(role);
|
employee.setRole(role);
|
||||||
employee.setProfileImageUrl(Utils.getRandomUrlProfileImage());
|
employee.setProfileImageUrl(Utils.getRandomUrlProfileImage());
|
||||||
employee.setBlocked(false);
|
employee.setBlocked(false);
|
||||||
|
employee.setCreatedAt(LocalDateTime.now());
|
||||||
return employee;
|
return employee;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ public class EmployeeItemMapper {
|
|||||||
// todo: Протестировать работу!
|
// todo: Протестировать работу!
|
||||||
|
|
||||||
List<Visit> visitsLast30Days = Utils.filterDateLast30Days(employee.getVisits());
|
List<Visit> visitsLast30Days = Utils.filterDateLast30Days(employee.getVisits());
|
||||||
employeeItemDTO.setVisitStatus(visitsLast30Days.stream().anyMatch(visit -> !visit.isFinished()));
|
employeeItemDTO.setVisitStatus(employee.getVisits().stream().anyMatch(visit -> !visit.isFinished()));
|
||||||
|
|
||||||
return employeeItemDTO;
|
return employeeItemDTO;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user