Mapper updates

This commit is contained in:
Niktia 2025-02-19 16:11:35 +03:00
parent 5914bda1f2
commit aa3927a439
2 changed files with 4 additions and 19 deletions

View File

@ -2,7 +2,6 @@ package com.example.nto.utils;
import com.example.nto.dto.EmployeeDto; import com.example.nto.dto.EmployeeDto;
import com.example.nto.dto.RegisterDto;
import com.example.nto.entity.Employee; import com.example.nto.entity.Employee;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
@ -18,7 +17,7 @@ public class EmployeeMapper {
employeeDto.setPosition(employee.getPosition()); employeeDto.setPosition(employee.getPosition());
employeeDto.setLastVisit(employee.getLastVisit()); employeeDto.setLastVisit(employee.getLastVisit());
employeeDto.setAuthorities(employee.getAuthorities().iterator().next().getAuthority()); employeeDto.setAuthorities(employee.getAuthorities().iterator().next().getAuthority());
employeeDto.setAccess(employee.isAccess());
return employeeDto; return employeeDto;
} }
@ -31,23 +30,8 @@ public class EmployeeMapper {
employee.setAvatarUrl(employeeDto.getAvatarUrl()); employee.setAvatarUrl(employeeDto.getAvatarUrl());
employee.setPosition(employeeDto.getPosition()); employee.setPosition(employeeDto.getPosition());
employee.setLastVisit(employeeDto.getLastVisit()); employee.setLastVisit(employeeDto.getLastVisit());
employee.setAccess(employeeDto.isAccess());
return employee; 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;
}
} }

View File

@ -12,7 +12,8 @@ public class EnterMapper {
EnterDto enterDto = new EnterDto(); EnterDto enterDto = new EnterDto();
enterDto.setName(enter.getCode().getName()); enterDto.setName(enter.getCode().getName());
enterDto.setLogin(enter.getEmployee().getLogin()); enterDto.setLogin(enter.getEmployee().getLogin());
enterDto.setEntered_at(enter.getEntered_at()); enterDto.setEnteredAt(enter.getEntered_at());
enterDto.setEnterType(enter.getEnterType());
return enterDto; return enterDto;
} }
} }