From 92450eae24a6f300b91da5d68c282a13d44f720c Mon Sep 17 00:00:00 2001 From: indx0 Date: Tue, 25 Nov 2025 11:02:18 +0300 Subject: [PATCH] DTO name change --- .../example/nto/controller/EmployeeController.java | 5 ++--- .../dto/{EmployeeDTO.java => EmployeeInfoDTO.java} | 2 +- .../com/example/nto/service/EmployeeService.java | 4 ++-- .../nto/service/impl/EmployeeServiceImpl.java | 4 ++-- .../java/com/example/nto/util/EmployeeMapper.java | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) rename src/main/java/com/example/nto/dto/{EmployeeDTO.java => EmployeeInfoDTO.java} (88%) diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index f10a76d..61c7c1c 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -1,7 +1,6 @@ package com.example.nto.controller; -import com.example.nto.dto.EmployeeDTO;; -import com.example.nto.exception.CodeNotFoundException; +import com.example.nto.dto.EmployeeInfoDTO;; import com.example.nto.service.EmployeeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -31,7 +30,7 @@ public class EmployeeController { } @GetMapping("/{code}/info") - public ResponseEntity info(@PathVariable String code) { + public ResponseEntity info(@PathVariable String code) { return ResponseEntity.ok(employeeService.getInfo(code)); } } diff --git a/src/main/java/com/example/nto/dto/EmployeeDTO.java b/src/main/java/com/example/nto/dto/EmployeeInfoDTO.java similarity index 88% rename from src/main/java/com/example/nto/dto/EmployeeDTO.java rename to src/main/java/com/example/nto/dto/EmployeeInfoDTO.java index dd33647..97c3daa 100644 --- a/src/main/java/com/example/nto/dto/EmployeeDTO.java +++ b/src/main/java/com/example/nto/dto/EmployeeInfoDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDate; import java.util.Map; @Data -public class EmployeeDTO { +public class EmployeeInfoDTO { private String name; private String photoUrl; private Map booking; diff --git a/src/main/java/com/example/nto/service/EmployeeService.java b/src/main/java/com/example/nto/service/EmployeeService.java index 6ca99f2..77026ea 100644 --- a/src/main/java/com/example/nto/service/EmployeeService.java +++ b/src/main/java/com/example/nto/service/EmployeeService.java @@ -1,6 +1,6 @@ package com.example.nto.service; -import com.example.nto.dto.EmployeeDTO; +import com.example.nto.dto.EmployeeInfoDTO; /** * TODO: ДОРАБОТАТЬ в рамках задания @@ -10,5 +10,5 @@ import com.example.nto.dto.EmployeeDTO; */ public interface EmployeeService { boolean codeExists(String code); - EmployeeDTO getInfo(String code); + EmployeeInfoDTO getInfo(String code); } diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index 6069bae..b8371fb 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -1,6 +1,6 @@ package com.example.nto.service.impl; -import com.example.nto.dto.EmployeeDTO; +import com.example.nto.dto.EmployeeInfoDTO; import com.example.nto.entity.Employee; import com.example.nto.exception.CodeNotFoundException; import com.example.nto.repository.EmployeeRepository; @@ -30,7 +30,7 @@ public class EmployeeServiceImpl implements EmployeeService { } @Override - public EmployeeDTO getInfo(String code) { + public EmployeeInfoDTO getInfo(String code) { this.codeExists(code); Employee employee = employeeRepository.findByCode(code); return EmployeeMapper.convertToDTO(employee); diff --git a/src/main/java/com/example/nto/util/EmployeeMapper.java b/src/main/java/com/example/nto/util/EmployeeMapper.java index 80b5419..0959435 100644 --- a/src/main/java/com/example/nto/util/EmployeeMapper.java +++ b/src/main/java/com/example/nto/util/EmployeeMapper.java @@ -1,6 +1,6 @@ package com.example.nto.util; -import com.example.nto.dto.EmployeeDTO; +import com.example.nto.dto.EmployeeInfoDTO; import com.example.nto.entity.Booking; import com.example.nto.entity.Employee; import com.example.nto.entity.Place; @@ -12,10 +12,10 @@ import java.util.stream.Collectors; @UtilityClass public class EmployeeMapper { - public static EmployeeDTO convertToDTO(Employee employee) { - EmployeeDTO employeeDto = new EmployeeDTO(); - employeeDto.setName(employee.getName()); - employeeDto.setPhotoUrl(employee.getPhotoUrl()); + public static EmployeeInfoDTO convertToDTO(Employee employee) { + EmployeeInfoDTO employeeInfoDto = new EmployeeInfoDTO(); + employeeInfoDto.setName(employee.getName()); + employeeInfoDto.setPhotoUrl(employee.getPhotoUrl()); Map bookingMap = employee.getBooking() .stream() @@ -27,8 +27,8 @@ public class EmployeeMapper { .build() )); - employeeDto.setBooking(bookingMap); - return employeeDto; + employeeInfoDto.setBooking(bookingMap); + return employeeInfoDto; } }