Skip to content

Commit

Permalink
fix: employee 등록 에러
Browse files Browse the repository at this point in the history
  • Loading branch information
@djdongjae
djdongjae committed Jun 18, 2024
1 parent 7620ae2 commit b31049c
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 20 deletions.
15 changes: 3 additions & 12 deletions src/main/java/net/skhu/tastyinventory_be/controller/employee/EmployeeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.List;
import java.util.Optional;


@RequiredArgsConstructor
@RestController
@RequestMapping("employee")
Expand All @@ -31,10 +30,8 @@ public ResponseEntity<BaseResponse<List<EmployeeResponseDto>>> 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());
Expand All @@ -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));
Expand All @@ -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<Employee> employeeOptional = employeeService.findById(id);
if (employeeOptional.isPresent()) {
Employee employee = employeeOptional.get();
Expand Down Expand Up @@ -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<Employee> employeeOptional = employeeService.findById(id);
if (employeeOptional.isPresent()) {
employeeService.deleteById(id);
Expand All @@ -122,4 +114,3 @@ public ResponseEntity<?> deleteEmployee(@PathVariable(name ="id") Long id) {
}
}
}

29 changes: 27 additions & 2 deletions src/main/java/net/skhu/tastyinventory_be/controller/employee/dto/EmployeeResponseDto.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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();
}

}
9 changes: 8 additions & 1 deletion src/main/java/net/skhu/tastyinventory_be/controller/user/AuthenticationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/net/skhu/tastyinventory_be/oauth2/userinfo/OAuth2UserInfoFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ public static OAuth2UserInfo getOAuth2UserInfo(String registrationId, Map<String
} else if (registrationId.equalsIgnoreCase("naver")) {
return new NaverOAuth2UserInfo(attributes);
} else {
throw new OAuth2NotSupportException(ErrorCode.OAUTH2_NOT_SUPPORT_EXCEPTION, ErrorCode.OAUTH2_NOT_SUPPORT_EXCEPTION.getMessage());
throw new OAuth2NotSupportException(
ErrorCode.OAUTH2_NOT_SUPPORT_EXCEPTION,
ErrorCode.OAUTH2_NOT_SUPPORT_EXCEPTION.getMessage()
);
}
}
}
24 changes: 20 additions & 4 deletions src/main/java/net/skhu/tastyinventory_be/service/EmployeeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
Expand All @@ -15,14 +16,15 @@
@Service
public class EmployeeService {
private final EmployeeRepository employeeRepository;
private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

@Transactional
public void save(Employee employee) {
employeeRepository.save(employee);
}

@Transactional
public List<EmployeeResponseDto> getEmployee(){
public List<EmployeeResponseDto> getEmployee() {
List<Employee> employees = employeeRepository.findAll();
List<EmployeeResponseDto> employeeResponseDtos = new ArrayList<>();
for (Employee employee : employees) {
Expand All @@ -31,6 +33,13 @@ public List<EmployeeResponseDto> 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;
Expand All @@ -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;
Expand All @@ -57,8 +72,9 @@ public EmployeeResponseDto getEmployeeDetails(Long id) {
public void deleteById(Long id) {
employeeRepository.deleteById(id);
}
@Transactional

@Transactional(readOnly = true)
public Optional<Employee> findById(Long id) {
return employeeRepository.findById(id);
}
}
}

0 comments on commit b31049c

Please sign in to comment.