From d0e798c44c0033c3ac15ae0a280e17e6f137254f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=86=B7=E1=84=8C=E1=85=AE=E1=84=86?= =?UTF-8?q?=E1=85=B5=E1=86=AB?= Date: Tue, 9 Jan 2024 09:40:15 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20-=20#9=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B0=8F=20exception=20=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/sopt/org/HMH/domain/app/service/AppService.java | 9 +++------ .../HMH/domain/challenge/service/ChallengeService.java | 2 -- .../dayChallenge/repository/DayChallengeRepository.java | 6 ++++++ .../org/HMH/domain/user/repository/UserRepository.java | 6 ++++++ .../sopt/org/HMH/domain/user/service/UserService.java | 5 +---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/sopt/org/HMH/domain/app/service/AppService.java b/src/main/java/sopt/org/HMH/domain/app/service/AppService.java index 39e7d535..256765dc 100644 --- a/src/main/java/sopt/org/HMH/domain/app/service/AppService.java +++ b/src/main/java/sopt/org/HMH/domain/app/service/AppService.java @@ -5,8 +5,6 @@ import sopt.org.HMH.domain.app.domain.App; import sopt.org.HMH.domain.app.dto.request.AppGoalTimeRequest; import sopt.org.HMH.domain.app.repository.AppRepository; -import sopt.org.HMH.domain.challenge.domain.exception.ChallengeError; -import sopt.org.HMH.domain.challenge.domain.exception.ChallengeException; import sopt.org.HMH.domain.dayChallenge.domain.DayChallenge; import sopt.org.HMH.domain.dayChallenge.repository.DayChallengeRepository; @@ -20,12 +18,11 @@ public class AppService { private final AppRepository appRepository; private final DayChallengeRepository dayChallengeRepository; - public List addApp(Long dayChallengeId, List responses) { - DayChallenge dayChallenge = dayChallengeRepository.findById(dayChallengeId) - .orElseThrow(() -> new ChallengeException(ChallengeError.CHALLENGE_NOT_FOUND)); + public List addApp(Long dayChallengeId, List requests) { + DayChallenge dayChallenge = dayChallengeRepository.findByIdOrThrowException(dayChallengeId); List apps = new ArrayList<>(); - for (AppGoalTimeRequest response: responses) { + for (AppGoalTimeRequest response: requests) { appRepository.save(new App(dayChallenge, response.appCode(), response.goalTime())); } diff --git a/src/main/java/sopt/org/HMH/domain/challenge/service/ChallengeService.java b/src/main/java/sopt/org/HMH/domain/challenge/service/ChallengeService.java index a2eedf6d..99116684 100644 --- a/src/main/java/sopt/org/HMH/domain/challenge/service/ChallengeService.java +++ b/src/main/java/sopt/org/HMH/domain/challenge/service/ChallengeService.java @@ -12,8 +12,6 @@ import sopt.org.HMH.domain.user.User; import sopt.org.HMH.domain.user.service.UserService; -import java.util.List; - @Service @RequiredArgsConstructor public class ChallengeService { diff --git a/src/main/java/sopt/org/HMH/domain/dayChallenge/repository/DayChallengeRepository.java b/src/main/java/sopt/org/HMH/domain/dayChallenge/repository/DayChallengeRepository.java index 47e8c2df..3255bbfc 100644 --- a/src/main/java/sopt/org/HMH/domain/dayChallenge/repository/DayChallengeRepository.java +++ b/src/main/java/sopt/org/HMH/domain/dayChallenge/repository/DayChallengeRepository.java @@ -1,7 +1,13 @@ package sopt.org.HMH.domain.dayChallenge.repository; +import jakarta.persistence.EntityNotFoundException; import org.springframework.data.jpa.repository.JpaRepository; import sopt.org.HMH.domain.dayChallenge.domain.DayChallenge; +import sopt.org.HMH.domain.user.exception.UserError; public interface DayChallengeRepository extends JpaRepository { + + default DayChallenge findByIdOrThrowException(Long dayChallengeId) { + return findById(dayChallengeId).orElseThrow(() -> new EntityNotFoundException(UserError.USER_NOT_FOUND.getErrorMessage())); + } } diff --git a/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java b/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java index a9430e86..9b4d50e0 100644 --- a/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java +++ b/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java @@ -1,7 +1,13 @@ package sopt.org.HMH.domain.user.repository; +import jakarta.persistence.EntityNotFoundException; import org.springframework.data.jpa.repository.JpaRepository; import sopt.org.HMH.domain.user.User; +import sopt.org.HMH.domain.user.exception.UserError; public interface UserRepository extends JpaRepository { + + default User findByIdOrThrowException(Long userId) { + return findById(userId).orElseThrow(() -> new EntityNotFoundException(UserError.USER_NOT_FOUND.getErrorMessage())); + } } diff --git a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java index bffdb291..5bd0d905 100644 --- a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java +++ b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java @@ -1,10 +1,8 @@ package sopt.org.HMH.domain.user.service; -import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import sopt.org.HMH.domain.user.User; -import sopt.org.HMH.domain.user.exception.UserError; import sopt.org.HMH.domain.user.repository.UserRepository; @Service @@ -14,7 +12,6 @@ public class UserService { private final UserRepository userRepository; public User getUserId(Long userId) { - return userRepository.findById(userId) - .orElseThrow(() -> new EntityNotFoundException(UserError.USER_NOT_FOUND.getErrorMessage())); + return userRepository.findByIdOrThrowException(userId); } }