From b37e4bce34ceae8dedb415da16ab81dda1ed4b5a Mon Sep 17 00:00:00 2001 From: IndexZero Date: Thu, 20 Feb 2025 12:22:42 +0300 Subject: [PATCH] - Increased varchar limit from 100 to 250 on PhotoUrl - Added profile update request for admin panel --- .../indexzero/finals/controller/EntranceController.java | 1 + .../finals/service/impl/EntranceServiceImpl.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/indexzero/finals/controller/EntranceController.java b/src/main/java/com/indexzero/finals/controller/EntranceController.java index 004da8a..790e4e2 100644 --- a/src/main/java/com/indexzero/finals/controller/EntranceController.java +++ b/src/main/java/com/indexzero/finals/controller/EntranceController.java @@ -35,6 +35,7 @@ public class EntranceController { @Operation(description = "Get user's last entries. Username is taken from Authentication", summary = "Get user's last entry") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request Successful."), + @ApiResponse(responseCode = "204", description = "No Entrances."), @ApiResponse(responseCode = "401", description = "Unauthorized"), }) public ResponseEntity getLastEntrance() { diff --git a/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java b/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java index fc4f979..61f2b6c 100644 --- a/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java +++ b/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java @@ -41,8 +41,12 @@ public class EntranceServiceImpl implements EntranceService { public ResponseEntity getLastEntrance(Authentication auth) { Employee employee = employeeRepository.findByLogin(auth.getName()); List entrances = employee.getEntrances().stream().map(EntranceMapper::convertToDTO).toList(); - System.out.println(entrances.getLast()); - return new ResponseEntity<>(entrances.getLast(), HttpStatus.OK); + if(entrances.isEmpty()) { + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + else { + return new ResponseEntity<>(entrances.getLast(), HttpStatus.OK); + } } @Override