diff --git a/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java b/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java index 0e50840..08bcd4f 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java @@ -28,7 +28,11 @@ public class Employee { private String password; @NonNull - private String name; + private String firstName; + @NonNull + private String lastName; + @NonNull + private String patronymic; @NonNull private String photo; @NonNull diff --git a/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java b/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java index 15d1554..265da0b 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java @@ -1,6 +1,7 @@ package com.example.onomatopoeiaback.domain.employee; import lombok.Getter; +import lombok.NonNull; import lombok.Setter; @Getter @@ -8,7 +9,9 @@ import lombok.Setter; public class EmployeeDTO { private String login; private String password; - private String name; + private String firstName; + private String lastName; + private String patronymic; private String photo; private PositionType position; } diff --git a/src/main/java/com/example/onomatopoeiaback/service/EmployeeService.java b/src/main/java/com/example/onomatopoeiaback/service/EmployeeService.java index ede2eb6..e05c5a5 100644 --- a/src/main/java/com/example/onomatopoeiaback/service/EmployeeService.java +++ b/src/main/java/com/example/onomatopoeiaback/service/EmployeeService.java @@ -23,7 +23,9 @@ public class EmployeeService { Employee employee = new Employee(); employee.setLogin(employeeDTO.getLogin()); employee.setPassword(passwordEncoder.encode(employeeDTO.getPassword())); - employee.setName(employeeDTO.getName()); + employee.setFirstName(employeeDTO.getFirstName()); + employee.setLastName(employeeDTO.getLastName()); + employee.setPatronymic(employeeDTO.getPatronymic()); employee.setPhoto(employeeDTO.getPhoto()); employee.setPosition(employeeDTO.getPosition());