From b730d8d5ac9029bb2aef2c045ed75d1ed19a8d7a Mon Sep 17 00:00:00 2001 From: A1pha Date: Fri, 6 Dec 2024 12:08:19 +0300 Subject: [PATCH] One more fix #2 --- .../com/example/nto/controller/CodeController.java | 2 -- .../nto/service/impl/EmployeeCodeServiceImpl.java | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/nto/controller/CodeController.java b/src/main/java/com/example/nto/controller/CodeController.java index bfbbad6..81463b1 100644 --- a/src/main/java/com/example/nto/controller/CodeController.java +++ b/src/main/java/com/example/nto/controller/CodeController.java @@ -15,8 +15,6 @@ public class CodeController { @PatchMapping("/api/{login}/open") public Code update(@PathVariable String login, @RequestBody Code newCode) { - if (newCode.getValue() == 0) - throw new ResponseStatusException(HttpStatus.BAD_REQUEST); return codeService.update(login, newCode); } } diff --git a/src/main/java/com/example/nto/service/impl/EmployeeCodeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeCodeServiceImpl.java index ce4ed56..dc2f90a 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeCodeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeCodeServiceImpl.java @@ -55,9 +55,16 @@ public class EmployeeCodeServiceImpl implements EmployeeService, CodeService { @Override public Code update(String login, Code newCode) { + Employee employee = findByLogin(login); long employeeId = employee.getId(); + employee.setLastVisit(LocalDateTime.now()); + updateEmployee(employeeId, employee); + + if (newCode.getValue() == 0) + throw new ResponseStatusException(HttpStatus.BAD_REQUEST); + Optional codeOptional = codeRepository.findById(employeeId); Code code; if (codeOptional.isEmpty()) { @@ -71,9 +78,6 @@ public class EmployeeCodeServiceImpl implements EmployeeService, CodeService { code.setValue(newCode.getValue()); } - employee.setLastVisit(LocalDateTime.now()); - updateEmployee(employeeId, employee); - return codeRepository.save(code); }