From 10f6c7753d91ed472868d3f3c162ecee5aa4524d Mon Sep 17 00:00:00 2001
From: Petr Rudichev <petrrudichev@gmail.com>
Date: Wed, 19 Feb 2025 19:00:14 +0300
Subject: [PATCH] feat: update Employee entity

---
 src/main/java/com/example/nto/domain/entity/Employee.java   | 3 ++-
 .../nto/dto/mappers/employee/EmployeeCreateMapper.java      | 6 ++++--
 .../nto/dto/mappers/employee/EmployeeItemMapper.java        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/nto/domain/entity/Employee.java b/src/main/java/com/example/nto/domain/entity/Employee.java
index 33b0482..3b9c8ad 100644
--- a/src/main/java/com/example/nto/domain/entity/Employee.java
+++ b/src/main/java/com/example/nto/domain/entity/Employee.java
@@ -14,6 +14,7 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -86,7 +87,7 @@ public class Employee implements UserDetails {
     private LocalDateTime createdAt;
 
     @OneToMany(mappedBy = "employee")
-    private List<Visit> visits;
+    private List<Visit> visits = new ArrayList<>();
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
diff --git a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeCreateMapper.java b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeCreateMapper.java
index fb751e5..43167b5 100644
--- a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeCreateMapper.java
+++ b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeCreateMapper.java
@@ -1,6 +1,6 @@
 package com.example.nto.dto.mappers.employee;
 
- import com.example.nto.domain.entity.Employee;
+import com.example.nto.domain.entity.Employee;
 import com.example.nto.domain.entity.Office;
 import com.example.nto.domain.entity.Position;
 import com.example.nto.domain.entity.Role;
@@ -8,6 +8,8 @@ import com.example.nto.dto.entity.employee.EmployeeCreateDTO;
 import com.example.nto.utils.Utils;
 import lombok.experimental.UtilityClass;
 
+import java.time.LocalDateTime;
+
 @UtilityClass
 public class EmployeeCreateMapper {
     public static Employee convertFromDTO(
@@ -27,7 +29,7 @@ public class EmployeeCreateMapper {
         employee.setRole(role);
         employee.setProfileImageUrl(Utils.getRandomUrlProfileImage());
         employee.setBlocked(false);
-
+        employee.setCreatedAt(LocalDateTime.now());
         return employee;
     }
 }
diff --git a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeItemMapper.java b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeItemMapper.java
index 68cf90d..1a46836 100644
--- a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeItemMapper.java
+++ b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeItemMapper.java
@@ -24,7 +24,7 @@ public class EmployeeItemMapper {
         // todo: Протестировать работу!
 
         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;
     }