Skip to content

Commit

Permalink
Merge pull request #139 from kakao-tech-campus-2nd-step3/Develop
Browse files Browse the repository at this point in the history
[Master] 컨트롤러 리턴값을 빌더 방식으로 리팩토링
  • Loading branch information
minsu-cnu authored Nov 11, 2024
2 parents 4df29a8 + 490b1b0 commit a0216a3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand Down Expand Up @@ -63,14 +62,14 @@ public ResponseEntity<UserTypeResponse> login(@RequestBody CodeRequest codeReque
UserTypeResponse userTypeResponse = new UserTypeResponse(loginResponse.type(),
loginResponse.profileImage(), loginResponse.name());

return new ResponseEntity<>(userTypeResponse, headers, HttpStatus.OK);
return ResponseEntity.ok().headers(headers).body(userTypeResponse);
}

@ApiResponse(responseCode = "204", description = "유저 타입 등록 성공")
@PostMapping("/register")
public ResponseEntity<Void> registerUserType(@Valid @RequestBody UserTypeRequest userTypeRequest,
@LoginUser User user) {
authService.registerUserType(userTypeRequest, user);
return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
return ResponseEntity.noContent().build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Long saveRecruitment(RecruitmentRequest recruitmentRequest)
koreanDetailedDescription);
RecruitmentContent recruitmentContent = recruitmentContentRepository.save(
new RecruitmentContent(koreanDetailedDescription, vietnameseDetailedDescription));
return recruitmentRepository.save(
return recruitmentRepository.save(
recruitmentMapper.toRecruitment(koreanTitle, vietnameseTitle, recruitmentRequest,
recruitmentContent, companyRepository.findById(recruitmentRequest.companyId())
.orElseThrow(() -> new NoSuchElementException("해당하는 회사가 존재하지 않습니다.")), true,
Expand All @@ -64,18 +64,18 @@ public RecruitmentAllResponse getAllRecruitment(Pageable pageable) {
Page<Recruitment> recruitments = recruitmentRepository.findAllByHiringTrue(pageable);
List<RecruitmentSummationResponse> recruitmentSummationResponseList =
recruitments.stream()
.map(recruitment -> new RecruitmentSummationResponse(
recruitment.getRecruitmentId(),
recruitment.getCompany().getLogoImage(),
recruitment.getKoreanTitle(),
recruitment.getVietnameseTitle(),
recruitment.getCompanyName(),
recruitment.getSalary(),
recruitment.getArea()
))
.collect(Collectors.toList());
.map(recruitment -> new RecruitmentSummationResponse(
recruitment.getRecruitmentId(),
recruitment.getCompany().getLogoImage(),
recruitment.getKoreanTitle(),
recruitment.getVietnameseTitle(),
recruitment.getCompanyName(),
recruitment.getSalary(),
recruitment.getArea()
))
.collect(Collectors.toList());
int totalPage = recruitments.getTotalPages();
return new RecruitmentAllResponse(recruitmentSummationResponseList,new PageDto(totalPage));
return new RecruitmentAllResponse(recruitmentSummationResponseList, new PageDto(totalPage));
}

public RecruitmentAllResponse getAllRecruitmentAndSortBySalary(Pageable pageable) {
Expand All @@ -94,7 +94,7 @@ public RecruitmentAllResponse getAllRecruitmentAndSortBySalary(Pageable pageable
))
.collect(Collectors.toList());
int totalPage = recruitments.getTotalPages();
return new RecruitmentAllResponse(recruitmentSummationResponseList,new PageDto(totalPage));
return new RecruitmentAllResponse(recruitmentSummationResponseList, new PageDto(totalPage));
}

public RecruitmentAllResponse getAllRecruitmentAndSortByDate(Pageable pageable) {
Expand All @@ -113,7 +113,7 @@ public RecruitmentAllResponse getAllRecruitmentAndSortByDate(Pageable pageable)
))
.collect(Collectors.toList());
int totalPage = recruitments.getTotalPages();
return new RecruitmentAllResponse(recruitmentSummationResponseList,new PageDto(totalPage));
return new RecruitmentAllResponse(recruitmentSummationResponseList, new PageDto(totalPage));
}

public RecruitmentResponse getRecruitmentResponseByRecruitmentId(Long userId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import jakarta.transaction.Transactional;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -17,7 +16,6 @@
import team18.team18_be.auth.repository.AuthRepository;
import team18.team18_be.recruitment.dto.request.RecruitmentRequest;
import team18.team18_be.recruitment.dto.response.RecruitmentAllResponse;
import team18.team18_be.recruitment.dto.response.RecruitmentSummationResponse;
import team18.team18_be.recruitment.entity.Recruitment;
import team18.team18_be.recruitment.repository.RecruitmentRepository;
import team18.team18_be.recruitment.service.RecruitmentService;
Expand All @@ -36,7 +34,6 @@ public class RecruitmentServiceTest {
public static Long thirdRecruitmentId;



@Autowired
RecruitmentRepository recruitmentRepository;
@Autowired
Expand Down Expand Up @@ -83,7 +80,7 @@ public void saveRecruitmentTest() {
@Test
@Transactional
@DisplayName("구인글 전체조회")
public void findAllRecruitmentTest(){
public void findAllRecruitmentTest() {
Pageable pageable = PageRequest.of(0, 5);

RecruitmentAllResponse recruitmentAllResponse = recruitmentService.getAllRecruitment(
Expand All @@ -100,9 +97,12 @@ public void findAllRecruitmentBySalaryTest() throws JsonProcessingException {
RecruitmentAllResponse recruitmentAllResponse = recruitmentService.getAllRecruitmentAndSortBySalary(
pageable);

assertThat(recruitmentAllResponse.content().get(0).recruitmentId()).isEqualTo(thirdRecruitmentId);
assertThat(recruitmentAllResponse.content().get(1).recruitmentId()).isEqualTo(secondRecruitmentId);
assertThat(recruitmentAllResponse.content().get(2).recruitmentId()).isEqualTo(firstRecruitmentId);
assertThat(recruitmentAllResponse.content().get(0).recruitmentId()).isEqualTo(
thirdRecruitmentId);
assertThat(recruitmentAllResponse.content().get(1).recruitmentId()).isEqualTo(
secondRecruitmentId);
assertThat(recruitmentAllResponse.content().get(2).recruitmentId()).isEqualTo(
firstRecruitmentId);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void findResumeByEmployeeIdTest() {
@Test
@Transactional
@DisplayName("이력서 id로 이력서 찾고, 지원서 내용 추가")
public void findResumeByIdTest(){
public void findResumeByIdTest() {
ResumeAndApplyResponse resumeAndApplyResponse = resumeService.findResumeById(resumeId, applyId);
assertThat(resumeAndApplyResponse.applicantName()).isEqualTo("김민지");
assertThat(resumeAndApplyResponse.motivation()).isEqualTo("한국어 실력을 늘리고자 지원했습니다.");
Expand Down

0 comments on commit a0216a3

Please sign in to comment.