Merge pull request #84 from Clubber2024/refactor/#83-refactor-존재하지-않는…

…-동아리-예외-적용 refactor : 존재 하지 않는 동아리 예외 적용
Clubber2024 · May 19, 2024 · 1fea63f · 1fea63f
2 parents 0719832 + fb1cad5
commit 1fea63f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/clubber/ClubberServer/domain/favorite/service/FavoriteService.java b/src/main/java/com/clubber/ClubberServer/domain/favorite/service/FavoriteService.java
@@ -2,6 +2,7 @@
 
 
 import com.clubber.ClubberServer.domain.club.domain.Club;
+import com.clubber.ClubberServer.domain.club.exception.ClubNotFoundException;
 import com.clubber.ClubberServer.domain.club.repository.ClubRepository;
 import com.clubber.ClubberServer.domain.favorite.domain.Favorite;
 import com.clubber.ClubberServer.domain.favorite.dto.FavoriteResponse;
@@ -31,7 +32,8 @@ public FavoriteResponse createFavorite(Long clubId){
         Long currentUserId = SecurityUtils.getCurrentUserId();
         User user = userRepository.findById(currentUserId)
                 .orElseThrow(() -> UserNotFoundException.EXCEPTION);
-        Club club = clubRepository.findById(clubId).get();
+        Club club = clubRepository.findById(clubId)
+                .orElseThrow(() -> ClubNotFoundException.EXCEPTION);
 
         favoriteRepository.findByUserAndClub(user,club)
                         .ifPresent(favorite -> { throw ClubAlreadyRegisterdFavoriteException.EXCEPTION; });

diff --git a/src/main/java/com/clubber/ClubberServer/domain/review/service/ReviewService.java b/src/main/java/com/clubber/ClubberServer/domain/review/service/ReviewService.java
@@ -1,6 +1,7 @@
 package com.clubber.ClubberServer.domain.review.service;
 
 import com.clubber.ClubberServer.domain.club.domain.Club;
+import com.clubber.ClubberServer.domain.club.exception.ClubNotFoundException;
 import com.clubber.ClubberServer.domain.club.repository.ClubRepository;
 import com.clubber.ClubberServer.domain.review.domain.Keyword;
 import com.clubber.ClubberServer.domain.review.domain.Review;
@@ -41,7 +42,8 @@ public ReviewCreateResponse createReview(Long clubId, ReviewRequest reviewReques
         User user = userRepository.findById(currentUserId)
                 .orElseThrow(() -> UserNotFoundException.EXCEPTION);
 
-        Club club = clubRepository.findById(clubId).get();
+        Club club = clubRepository.findById(clubId)
+                .orElseThrow(() -> ClubNotFoundException.EXCEPTION);
         Review review = Review.of(user, club);
 
         return createReviewKeyword(reviewRequest, reviewRepository.save(review));
@@ -59,14 +61,16 @@ private ReviewCreateResponse createReviewKeyword(ReviewRequest reviewRequest, Re
 
     @Transactional(readOnly = true)
     public ClubReviewResponse getClubReviews(Long clubId){
-        Club club = clubRepository.findById(clubId).get();
+        Club club = clubRepository.findById(clubId)
+                .orElseThrow(() -> ClubNotFoundException.EXCEPTION);
         List<ReviewKeyword> reviewKeywords = reviewKeywordRepository.queryReviewKeywordByClubId(club.getId());
         return ClubReviewResponse.of(club, reviewKeywords);
     }
 
     @Transactional(readOnly = true)
     public ClubReviewKeywordStatsResponse getClubReviewKeywordStats(Long clubId){
-        Club club = clubRepository.findById(clubId).get();
+        Club club = clubRepository.findById(clubId)
+                .orElseThrow(() -> ClubNotFoundException.EXCEPTION);
         List<KeywordStats> keywordStats = reviewKeywordRepository.queryReviewKeywordStatsByClubId(
                 club.getId());