Merge pull request #221 from 2dongyeop/dongyeop

fix : 롤링 파일 패턴 수정 및 특정 병과 조회 결과 없을시 예외 처리 변경
HBNU-Avocado · Nov 25, 2023 · 693965b · 693965b
2 parents ceebf61 + fc7e51a
commit 693965b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/src/main/java/io/wisoft/capstonedesign/domain/review/application/ReviewService.java b/src/main/java/io/wisoft/capstonedesign/domain/review/application/ReviewService.java
@@ -139,23 +139,17 @@ public Page<Review> findByUsingPaging(final Pageable pageable) {
  */
  public Page<Review> findByTargetHospital(final String targetHospital, final Pageable pageable) {
 
- final Page<Review> page = reviewRepository.findByTargetHospitalUsingPaging(targetHospital, pageable);
+ final Page<Review> result = reviewRepository.findByTargetHospitalUsingPaging(targetHospital, pageable);
 
- if (page.isEmpty()) {
- log.info("targetHospital[{}]'s review emtpy", targetHospital);
- throw new NotFoundException("해당 병원에 대한 리뷰는 존재하지 않습니다.");
- }
- return page;
+ log.info("result[{}]", result);
+ return result;
  }
 
  public Page<Review> findByDeptUsingPaging(final String deptNum, final Pageable pageable) {
 
- final Page<Review> page = reviewRepository.findByDeptUsingPaging(DeptMapper.numberToDept(deptNum), pageable);
+ final Page<Review> result = reviewRepository.findByDeptUsingPaging(DeptMapper.numberToDept(deptNum), pageable);
 
- if (page.isEmpty()) {
- log.info("deptNum[{}]'s review emtpy", deptNum);
- throw new NotFoundException("해당 병과에 대한 리뷰는 존재하지 않습니다.");
- }
- return page;
+ log.info("result[{}]", result);
+ return result;
  }
 }
diff --git a/src/main/java/io/wisoft/capstonedesign/domain/review/web/ReviewApiController.java b/src/main/java/io/wisoft/capstonedesign/domain/review/web/ReviewApiController.java
@@ -54,22 +54,19 @@ public Page<ReviewListDto> reviewsUsingPaging(
  @SwaggerApi(summary = "특정 병원의 리뷰 목록 페이징 조회", implementation = Page.class)
  @SwaggerApiFailWithoutAuth
  @GetMapping("/hospital")
- public Page<ReviewListDto> reviewsByTargetHospital(
- @RequestBody @Valid final ReviewsByTargetHospitalRequest request,
- final Pageable pageable) {
+ public Page<ReviewListDto> reviewsByTargetHospital(@RequestParam final String targetHospital, final Pageable pageable) {
 
- log.info("ReviewsByTargetHospitalRequest[{}]", request);
+ log.info("targetHospital[{}]", targetHospital);
 
- return reviewService.findByTargetHospital(request.targetHospital(), pageable)
+ return reviewService.findByTargetHospital(targetHospital, pageable)
  .map(ReviewListDto::new);
  }
 
 
  @SwaggerApi(summary = "리뷰 저장", implementation = CreateReviewResponse.class)
  @SwaggerApiFailWithAuth
  @PostMapping
- public CreateReviewResponse createReview(
- @RequestBody @Valid final CreateReviewRequest request) {
+ public CreateReviewResponse createReview(@RequestBody @Valid final CreateReviewRequest request) {
 
  log.info("CreateReviewRequest[{}]", request);
 

diff --git a/src/main/resources/application-log.yml b/src/main/resources/application-log.yml
@@ -18,4 +18,4 @@ logging:
  rollingpolicy:
  max-file-size: 10MB
  max-history: 30
- file-name-pattern: "/logs/avocado.%d{yyyy-MM-dd}.%i.log"
+ file-name-pattern: "${LOG_FILE}%d{yyyy-MM-dd}-%i.log"