diff --git a/src/main/java/net/skhu/tastyinventory_be/controller/employee/EmployeeController.java b/src/main/java/net/skhu/tastyinventory_be/controller/employee/EmployeeController.java index b25baa8..827cfcd 100644 --- a/src/main/java/net/skhu/tastyinventory_be/controller/employee/EmployeeController.java +++ b/src/main/java/net/skhu/tastyinventory_be/controller/employee/EmployeeController.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Optional; - @RequiredArgsConstructor @RestController @RequestMapping("employee") @@ -31,10 +30,8 @@ public ResponseEntity>> findAll() { return ResponseEntity.ok(BaseResponse.success(SuccessCode.GET_SUCCESS, employeeService.getEmployee())); } - @PostMapping public ResponseEntity createEmployee(@Valid @RequestBody EmployeeEdit employeeEdit) { - Employee employee = new Employee(); employee.setName(employeeEdit.getName()); employee.setRrn(employeeEdit.getRrn()); @@ -53,7 +50,7 @@ public ResponseEntity createEmployee(@Valid @RequestBody EmployeeEdit employe } @GetMapping("{id}") - public ResponseEntity getEmployeeDetails(@PathVariable(name ="id") Long id) { + public ResponseEntity getEmployeeDetails(@PathVariable(name = "id") Long id) { EmployeeResponseDto employee = employeeService.getEmployeeDetails(id); if (employee != null) { return ResponseEntity.ok(BaseResponse.success(SuccessCode.GET_SUCCESS, employee)); @@ -63,8 +60,7 @@ public ResponseEntity getEmployeeDetails(@PathVariable(name ="id") Long id) { } @PatchMapping("{id}") - public ResponseEntity editEmployeeDetails(@PathVariable(name ="id") Long id, @Valid @RequestBody EmployeeEdit employeeEdit) { - + public ResponseEntity editEmployeeDetails(@PathVariable(name = "id") Long id, @Valid @RequestBody EmployeeEdit employeeEdit) { Optional employeeOptional = employeeService.findById(id); if (employeeOptional.isPresent()) { Employee employee = employeeOptional.get(); @@ -100,19 +96,15 @@ public ResponseEntity editEmployeeDetails(@PathVariable(name ="id") Long id, employee.setNote(employeeEdit.getNote()); } - employeeService.save(employee); - return ResponseEntity.ok(BaseResponse.success(SuccessCode.EMPLOYEE_PATCH_SUCCESS)); } else { return ResponseEntity.status(HttpStatus.NOT_FOUND).body(BaseResponse.error(ErrorCode.NOT_FOUND_EMPLOYEE_EXCEPTION)); } } - - @DeleteMapping("{id}") - public ResponseEntity deleteEmployee(@PathVariable(name ="id") Long id) { + public ResponseEntity deleteEmployee(@PathVariable(name = "id") Long id) { Optional employeeOptional = employeeService.findById(id); if (employeeOptional.isPresent()) { employeeService.deleteById(id); @@ -122,4 +114,3 @@ public ResponseEntity deleteEmployee(@PathVariable(name ="id") Long id) { } } } - diff --git a/src/main/java/net/skhu/tastyinventory_be/controller/employee/dto/EmployeeResponseDto.java b/src/main/java/net/skhu/tastyinventory_be/controller/employee/dto/EmployeeResponseDto.java index 2946bd6..632a810 100644 --- a/src/main/java/net/skhu/tastyinventory_be/controller/employee/dto/EmployeeResponseDto.java +++ b/src/main/java/net/skhu/tastyinventory_be/controller/employee/dto/EmployeeResponseDto.java @@ -1,8 +1,13 @@ package net.skhu.tastyinventory_be.controller.employee.dto; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import lombok.*; import net.skhu.tastyinventory_be.domain.employee.Employee; +import org.springframework.format.annotation.DateTimeFormat; +import java.text.SimpleDateFormat; +import java.util.Date; @Builder @Data @@ -11,20 +16,40 @@ public class EmployeeResponseDto { int id; - String name; + String rrn; + String phoneNumber; + String email; + + String address; + String position; + String hireDate; + + String employmentStatus; + + String bankAccount; + + String note; + public static EmployeeResponseDto of(Employee employee) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return EmployeeResponseDto.builder() .id(employee.getId()) .name(employee.getName()) + .rrn(employee.getRrn()) .phoneNumber(employee.getPhoneNumber()) + .email(employee.getEmail()) + .address(employee.getAddress()) .position(employee.getPosition()) + .hireDate(employee.getHireDate() != null ? sdf.format(employee.getHireDate()) : null) + .employmentStatus(employee.getEmploymentStatus()) + .bankAccount(employee.getBankAccount()) + .note(employee.getNote()) .build(); } - } diff --git a/src/main/java/net/skhu/tastyinventory_be/controller/user/AuthenticationController.java b/src/main/java/net/skhu/tastyinventory_be/controller/user/AuthenticationController.java index 58c6901..183fb18 100644 --- a/src/main/java/net/skhu/tastyinventory_be/controller/user/AuthenticationController.java +++ b/src/main/java/net/skhu/tastyinventory_be/controller/user/AuthenticationController.java @@ -171,7 +171,14 @@ private void generateCSRFTokenCookie(HttpServletResponse response, String csrfTo private void generateTokenCookie(UserDetails userDetails, HttpServletRequest request, HttpServletResponse response) { final int cookieMaxAge = jwtProvider.getTokenExpirationDate().intValue(); - CookieUtils.addCookie(response, "access_token", jwtProvider.generateToken(userDetails.getUsername()), true, true, cookieMaxAge); + CookieUtils.addCookie( + response, + "access_token", + jwtProvider.generateToken(userDetails.getUsername()), + true, + true, + cookieMaxAge + ); } private void redirectWithErrorMessage(String uri, String message, HttpServletResponse response) throws IOException { diff --git a/src/main/java/net/skhu/tastyinventory_be/oauth2/userinfo/OAuth2UserInfoFactory.java b/src/main/java/net/skhu/tastyinventory_be/oauth2/userinfo/OAuth2UserInfoFactory.java index 9beafdd..91795dd 100644 --- a/src/main/java/net/skhu/tastyinventory_be/oauth2/userinfo/OAuth2UserInfoFactory.java +++ b/src/main/java/net/skhu/tastyinventory_be/oauth2/userinfo/OAuth2UserInfoFactory.java @@ -14,7 +14,10 @@ public static OAuth2UserInfo getOAuth2UserInfo(String registrationId, Map getEmployee(){ + public List getEmployee() { List employees = employeeRepository.findAll(); List employeeResponseDtos = new ArrayList<>(); for (Employee employee : employees) { @@ -31,6 +33,13 @@ public List getEmployee(){ employeeResponseDto.setName(employee.getName()); employeeResponseDto.setPhoneNumber(employee.getPhoneNumber()); employeeResponseDto.setPosition(employee.getPosition()); + employeeResponseDto.setRrn(employee.getRrn()); + employeeResponseDto.setEmail(employee.getEmail()); + employeeResponseDto.setAddress(employee.getAddress()); + employeeResponseDto.setHireDate(employee.getHireDate() != null ? sdf.format(employee.getHireDate()) : null); + employeeResponseDto.setEmploymentStatus(employee.getEmploymentStatus()); + employeeResponseDto.setBankAccount(employee.getBankAccount()); + employeeResponseDto.setNote(employee.getNote()); employeeResponseDtos.add(employeeResponseDto); } return employeeResponseDtos; @@ -46,7 +55,13 @@ public EmployeeResponseDto getEmployeeDetails(Long id) { employeeResponseDto.setName(employee.getName()); employeeResponseDto.setPhoneNumber(employee.getPhoneNumber()); employeeResponseDto.setPosition(employee.getPosition()); - + employeeResponseDto.setRrn(employee.getRrn()); + employeeResponseDto.setEmail(employee.getEmail()); + employeeResponseDto.setAddress(employee.getAddress()); + employeeResponseDto.setHireDate(employee.getHireDate() != null ? sdf.format(employee.getHireDate()) : null); + employeeResponseDto.setEmploymentStatus(employee.getEmploymentStatus()); + employeeResponseDto.setBankAccount(employee.getBankAccount()); + employeeResponseDto.setNote(employee.getNote()); return employeeResponseDto; } else { return null; @@ -57,8 +72,9 @@ public EmployeeResponseDto getEmployeeDetails(Long id) { public void deleteById(Long id) { employeeRepository.deleteById(id); } - @Transactional + + @Transactional(readOnly = true) public Optional findById(Long id) { return employeeRepository.findById(id); } -} \ No newline at end of file +}