From cbdc058672630be913d406eb7f9b2aa8d7728422 Mon Sep 17 00:00:00 2001
From: Petr Rudichev <petrrudichev@gmail.com>
Date: Thu, 20 Feb 2025 10:47:18 +0300
Subject: [PATCH] fix: EmployeeController and EmployeeMapper

---
 .../com/example/nto/controller/EmployeeController.java    | 8 ++++----
 .../example/nto/dto/mappers/employee/EmployeeMapper.java  | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java
index 14535b4..a43b3ba 100644
--- a/src/main/java/com/example/nto/controller/EmployeeController.java
+++ b/src/main/java/com/example/nto/controller/EmployeeController.java
@@ -42,25 +42,25 @@ public class EmployeeController {
         return ResponseEntity.ok(employeeService.getByTelephone(telephone));
     }
 
-    @PutMapping("/{id}")
+    @PutMapping("/{employeeId}")
     public ResponseEntity<EmployeeDTO> updateEmployee(@PathVariable long employeeId, @RequestBody EmployeeDTO employeeDTO) {
         return ResponseEntity.ok(employeeService.update(employeeId, employeeDTO));
     }
 
-    @DeleteMapping("/{id}")
+    @DeleteMapping("/{employeeId}")
     public ResponseEntity<EmployeeDTO> deleteEmployeeById(@PathVariable long employeeId) {
         employeeService.delete(employeeId);
         return ResponseEntity.noContent().build();
     }
 
-    @PatchMapping("/image/profile/{id}")
+    @PatchMapping("/image/profile/{employeeId}")
     public ResponseEntity<Void> patchImageProfile(@PathVariable long employeeId, @RequestBody byte[] photo) {
         String imageUrl = photoService.uploadProfilePhoto(employeeId, photo);
         employeeService.patchProfileImage(employeeId, imageUrl);
         return ResponseEntity.noContent().build();
     }
 
-    @PatchMapping("/block/{id}/{blockStatus}")
+    @PatchMapping("/block/{employeeId}/{blockStatus}")
     public ResponseEntity<Void> patchImageProfile(@PathVariable long employeeId, @PathVariable boolean blockStatus) {
         employeeService.patchBlockEmployee(employeeId, blockStatus);
         return ResponseEntity.noContent().build();
diff --git a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java
index 8504852..62781e2 100644
--- a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java
+++ b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java
@@ -27,7 +27,7 @@ public class EmployeeMapper {
         employeeDTO.setOfficeImageUrl(employee.getOffice().getLinkLogo());
         employeeDTO.setPositionName(employee.getPosition().getName());
         employeeDTO.setRole(employee.getRole().getRoleName());
-        employeeDTO.setRole(employee.getProfileImageUrl());
+        employeeDTO.setProfileImageUrl(employee.getProfileImageUrl());
         employeeDTO.setBlocked(employee.isBlocked());
 
         List<Visit> visitsLast30Days = Utils.filterDateLast30Days(employee.getVisits());
@@ -47,7 +47,10 @@ public class EmployeeMapper {
                 currentOfficeName = visit.getStartTerminal().getOffice().getName();
             }
             visitsIdLast30Days.add(visit.getId());
-            periods.add(List.of(visit.getStartVisit(), visit.getEndVisit()));
+
+            if (visit.getStartVisit() != null && visit.getEndVisit() != null) {
+                periods.add(List.of(visit.getStartVisit(), visit.getEndVisit()));
+            }
         }
 
         employeeDTO.setVisitStatus(visitStatus);