One more fix #2
This commit is contained in:
parent
f5b6bd9211
commit
b730d8d5ac
@ -15,8 +15,6 @@ public class CodeController {
|
|||||||
|
|
||||||
@PatchMapping("/api/{login}/open")
|
@PatchMapping("/api/{login}/open")
|
||||||
public Code update(@PathVariable String login, @RequestBody Code newCode) {
|
public Code update(@PathVariable String login, @RequestBody Code newCode) {
|
||||||
if (newCode.getValue() == 0)
|
|
||||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
|
|
||||||
return codeService.update(login, newCode);
|
return codeService.update(login, newCode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,9 +55,16 @@ public class EmployeeCodeServiceImpl implements EmployeeService, CodeService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Code update(String login, Code newCode) {
|
public Code update(String login, Code newCode) {
|
||||||
|
|
||||||
Employee employee = findByLogin(login);
|
Employee employee = findByLogin(login);
|
||||||
long employeeId = employee.getId();
|
long employeeId = employee.getId();
|
||||||
|
|
||||||
|
employee.setLastVisit(LocalDateTime.now());
|
||||||
|
updateEmployee(employeeId, employee);
|
||||||
|
|
||||||
|
if (newCode.getValue() == 0)
|
||||||
|
throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
|
||||||
|
|
||||||
Optional<Code> codeOptional = codeRepository.findById(employeeId);
|
Optional<Code> codeOptional = codeRepository.findById(employeeId);
|
||||||
Code code;
|
Code code;
|
||||||
if (codeOptional.isEmpty()) {
|
if (codeOptional.isEmpty()) {
|
||||||
@ -71,9 +78,6 @@ public class EmployeeCodeServiceImpl implements EmployeeService, CodeService {
|
|||||||
code.setValue(newCode.getValue());
|
code.setValue(newCode.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
employee.setLastVisit(LocalDateTime.now());
|
|
||||||
updateEmployee(employeeId, employee);
|
|
||||||
|
|
||||||
return codeRepository.save(code);
|
return codeRepository.save(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user