notminus_onlyc/notminusonlycplusplus-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: EmployeeController and EmployeeMapper

Browse Source
This commit is contained in:
Petr Rudichev 2025-02-20 10:47:18 +03:00
parent 83ecbae070
commit cbdc058672
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/example/nto/controller/EmployeeController.java
View File

@ -42,25 +42,25 @@ public class EmployeeController {
return ResponseEntity.ok(employeeService.getByTelephone(telephone));
}
@PutMapping("/{id}")
@PutMapping("/{employeeId}")
public ResponseEntity<EmployeeDTO> updateEmployee(@PathVariable long employeeId, @RequestBody EmployeeDTO employeeDTO) {
return ResponseEntity.ok(employeeService.update(employeeId, employeeDTO));
}
@DeleteMapping("/{id}")
@DeleteMapping("/{employeeId}")
public ResponseEntity<EmployeeDTO> deleteEmployeeById(@PathVariable long employeeId) {
employeeService.delete(employeeId);
return ResponseEntity.noContent().build();
}
@PatchMapping("/image/profile/{id}")
@PatchMapping("/image/profile/{employeeId}")
public ResponseEntity<Void> patchImageProfile(@PathVariable long employeeId, @RequestBody byte[] photo) {
String imageUrl = photoService.uploadProfilePhoto(employeeId, photo);
employeeService.patchProfileImage(employeeId, imageUrl);
return ResponseEntity.noContent().build();
}
@PatchMapping("/block/{id}/{blockStatus}")
@PatchMapping("/block/{employeeId}/{blockStatus}")
public ResponseEntity<Void> patchImageProfile(@PathVariable long employeeId, @PathVariable boolean blockStatus) {
employeeService.patchBlockEmployee(employeeId, blockStatus);
return ResponseEntity.noContent().build();

7
src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java
View File

@ -27,7 +27,7 @@ public class EmployeeMapper {
employeeDTO.setOfficeImageUrl(employee.getOffice().getLinkLogo());
employeeDTO.setPositionName(employee.getPosition().getName());
employeeDTO.setRole(employee.getRole().getRoleName());
employeeDTO.setRole(employee.getProfileImageUrl());
employeeDTO.setProfileImageUrl(employee.getProfileImageUrl());
employeeDTO.setBlocked(employee.isBlocked());
List<Visit> visitsLast30Days = Utils.filterDateLast30Days(employee.getVisits());
@ -47,7 +47,10 @@ public class EmployeeMapper {
currentOfficeName = visit.getStartTerminal().getOffice().getName();
}
visitsIdLast30Days.add(visit.getId());
periods.add(List.of(visit.getStartVisit(), visit.getEndVisit()));
if (visit.getStartVisit() != null && visit.getEndVisit() != null) {
periods.add(List.of(visit.getStartVisit(), visit.getEndVisit()));
}
}
employeeDTO.setVisitStatus(visitStatus);