diff --git a/src/main/java/com/example/nto/dto/EmployeeDto.java b/src/main/java/com/example/nto/dto/EmployeeDto.java new file mode 100644 index 0000000..b1965df --- /dev/null +++ b/src/main/java/com/example/nto/dto/EmployeeDto.java @@ -0,0 +1,27 @@ +package com.example.nto.dto; + +import lombok.*; +import java.sql.Timestamp; + + + +@Data +public class EmployeeDto { + + private Long id; + + private String login; + + private String name; + + private String password; + + private String position; + + private String avatarUrl; + + private Timestamp lastVisit; + + private String authorities; + +} \ No newline at end of file diff --git a/src/main/java/com/example/nto/dto/EnterDto.java b/src/main/java/com/example/nto/dto/EnterDto.java new file mode 100644 index 0000000..738ad1b --- /dev/null +++ b/src/main/java/com/example/nto/dto/EnterDto.java @@ -0,0 +1,13 @@ +package com.example.nto.dto; + +import lombok.Data; + +import java.sql.Timestamp; + + +@Data +public class EnterDto { + private String login; + private String name; + private Timestamp entered_at; +} diff --git a/src/main/java/com/example/nto/dto/RegisterDto.java b/src/main/java/com/example/nto/dto/RegisterDto.java new file mode 100644 index 0000000..073d13f --- /dev/null +++ b/src/main/java/com/example/nto/dto/RegisterDto.java @@ -0,0 +1,11 @@ +package com.example.nto.dto; + +import lombok.Data; + +@Data +public class RegisterDto { + private Long id; + private String login; + private String name; + private String password; +} diff --git a/src/main/java/com/example/nto/utils/EmployeeMapper.java b/src/main/java/com/example/nto/utils/EmployeeMapper.java new file mode 100644 index 0000000..d31f310 --- /dev/null +++ b/src/main/java/com/example/nto/utils/EmployeeMapper.java @@ -0,0 +1,53 @@ +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; + +@UtilityClass +public class EmployeeMapper { + + public EmployeeDto convertToDto(Employee employee) { + EmployeeDto employeeDto = new EmployeeDto(); + employeeDto.setId(employee.getId()); + employeeDto.setName(employee.getName()); + employeeDto.setLogin(employee.getLogin()); + employeeDto.setAvatarUrl(employee.getAvatarUrl()); + employeeDto.setPosition(employee.getPosition()); + employeeDto.setLastVisit(employee.getLastVisit()); + employeeDto.setAuthorities(employee.getAuthorities().iterator().next().getAuthority()); + + return employeeDto; + + } + + public Employee convertFromDto(EmployeeDto employeeDto) { + Employee employee = new Employee(); + employee.setId(employeeDto.getId()); + employee.setName(employeeDto.getName()); + employee.setLogin(employeeDto.getLogin()); + employee.setAvatarUrl(employeeDto.getAvatarUrl()); + employee.setPosition(employeeDto.getPosition()); + employee.setLastVisit(employeeDto.getLastVisit()); + + 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 new file mode 100644 index 0000000..eb8568c --- /dev/null +++ b/src/main/java/com/example/nto/utils/EnterMapper.java @@ -0,0 +1,18 @@ +package com.example.nto.utils; + + +import com.example.nto.dto.EnterDto; +import com.example.nto.entity.Enter; +import lombok.experimental.UtilityClass; + +@UtilityClass +public class EnterMapper { + + public EnterDto convertToDto(Enter enter) { + EnterDto enterDto = new EnterDto(); + enterDto.setName(enter.getCode().getName()); + enterDto.setLogin(enter.getEmployee().getLogin()); + enterDto.setEntered_at(enter.getEntered_at()); + return enterDto; + } +}