From e071807ecfa0d3a96bb6c76a22b156451e2246ce Mon Sep 17 00:00:00 2001 From: Daniil Makeev Date: Wed, 19 Feb 2025 12:31:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=A4=D0=90=D0=9C=D0=98=D0=9B=D0=98=D0=AE=20?= =?UTF-8?q?=D0=98=D0=9C=D0=AF=20=D0=B8=20=D0=9E=D0=A2=D0=A7=D0=95=D0=A1?= =?UTF-8?q?=D0=A2=D0=92=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/onomatopoeiaback/domain/employee/Employee.java | 6 +++++- .../onomatopoeiaback/domain/employee/EmployeeDTO.java | 5 ++++- .../example/onomatopoeiaback/service/EmployeeService.java | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) 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());