Skip to content

Commit

Permalink
Merge pull request #158 from WooRibound/fix/#143-test
Browse files Browse the repository at this point in the history
[update] #143 - 기업회원의 개인회원 이력서 조회 API에서 이력서 테이블 없으면 우바테이블에서 내역 들고오도록 수정
  • Loading branch information
haewoni authored Nov 29, 2024
2 parents fa61078 + a9d3563 commit 7d20190
Showing 1 changed file with 25 additions and 9 deletions.
34 changes: 25 additions & 9 deletions src/main/java/com/wooribound/domain/resume/ResumeServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,31 @@ public ResumeDTO updateResume(Authentication authentication, MultipartFile userI
@Override
@Transactional
public ResumeDetailDTO getWbUserResume(String userId) {
WbUser byIdWbUser = wbUserRepository.findById(userId)
.orElseThrow(() -> new NoWbUserException("해당 사용자 ID를 찾을 수 없습니다: " + userId));

Resume resume = resumeRepository.findByUserId(userId).orElseThrow();
List<WorkHistory> workHistoryList = workHistoryRepository.findByUserId(userId);

List<String> jobs = workHistoryList.stream()
.map(workHistory -> workHistory.getJob().getJobName()) // jobName만 추출
.collect(Collectors.toList());
WbUser byIdWbUser = wbUserRepository.findById(userId)
.orElseThrow(() -> new NoWbUserException("해당 사용자 ID를 찾을 수 없습니다: " + userId));

List<WorkHistory> workHistoryList = workHistoryRepository.findByUserId(userId);

List<String> jobs = workHistoryList.stream()
.map(workHistory -> workHistory.getJob().getJobName()) // jobName만 추출
.collect(Collectors.toList());

Resume resume = resumeRepository.findByUserId(userId)
.orElse(null);

if (resume == null) {
return ResumeDetailDTO.builder()
.userName(byIdWbUser.getName())
.jobPoint(byIdWbUser.getJobPoint())
.phone(byIdWbUser.getPhone())
.addrCity(byIdWbUser.getAddrCity())
.addrProvince(byIdWbUser.getAddrProvince())
.userIntro("")
.userImg("")
.resumeEmail("")
.jobList(jobs)
.build();
}

return ResumeDetailDTO.builder()
.userName(resume.getWbUser().getName())
Expand Down

0 comments on commit 7d20190

Please sign in to comment.