From aa3927a43916875178a2c1916698ffb83c0d451f Mon Sep 17 00:00:00 2001
From: Niktia <seekergame123@gmail.com>
Date: Wed, 19 Feb 2025 16:11:35 +0300
Subject: [PATCH] Mapper updates

---
 .../com/example/nto/utils/EmployeeMapper.java | 20 ++-----------------
 .../com/example/nto/utils/EnterMapper.java    |  3 ++-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/example/nto/utils/EmployeeMapper.java b/src/main/java/com/example/nto/utils/EmployeeMapper.java
index d31f310..9f296fa 100644
--- a/src/main/java/com/example/nto/utils/EmployeeMapper.java
+++ b/src/main/java/com/example/nto/utils/EmployeeMapper.java
@@ -2,7 +2,6 @@ package com.example.nto.utils;
 
 
 import com.example.nto.dto.EmployeeDto;
-import com.example.nto.dto.RegisterDto;
 import com.example.nto.entity.Employee;
 import lombok.experimental.UtilityClass;
 
@@ -18,7 +17,7 @@ public class EmployeeMapper {
         employeeDto.setPosition(employee.getPosition());
         employeeDto.setLastVisit(employee.getLastVisit());
         employeeDto.setAuthorities(employee.getAuthorities().iterator().next().getAuthority());
-
+        employeeDto.setAccess(employee.isAccess());
         return employeeDto;
 
     }
@@ -31,23 +30,8 @@ public class EmployeeMapper {
         employee.setAvatarUrl(employeeDto.getAvatarUrl());
         employee.setPosition(employeeDto.getPosition());
         employee.setLastVisit(employeeDto.getLastVisit());
-
+        employee.setAccess(employeeDto.isAccess());
         return employee;
 
     }
-
-    public Employee convertFromRegisterDTO(RegisterDto registerDto) {
-        Employee employee = new Employee();
-        employee.setName(registerDto.getName());
-        employee.setLogin(registerDto.getLogin());
-        return employee;
-    }
-
-
-    public RegisterDto convertToRegisterDTO(Employee employee) {
-        RegisterDto registerDto = new RegisterDto();
-        registerDto.setName(employee.getName());
-        registerDto.setLogin(employee.getLogin());
-        return registerDto;
-    }
 }
diff --git a/src/main/java/com/example/nto/utils/EnterMapper.java b/src/main/java/com/example/nto/utils/EnterMapper.java
index eb8568c..34714bd 100644
--- a/src/main/java/com/example/nto/utils/EnterMapper.java
+++ b/src/main/java/com/example/nto/utils/EnterMapper.java
@@ -12,7 +12,8 @@ public class EnterMapper {
         EnterDto enterDto = new EnterDto();
         enterDto.setName(enter.getCode().getName());
         enterDto.setLogin(enter.getEmployee().getLogin());
-        enterDto.setEntered_at(enter.getEntered_at());
+        enterDto.setEnteredAt(enter.getEntered_at());
+        enterDto.setEnterType(enter.getEnterType());
         return enterDto;
     }
 }