Skip to content

Commit

Permalink
refactor - #9 이름 및 exception 처리 코드 위치 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
jumining committed Jan 9, 2024
1 parent cd81fbc commit d0e798c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
9 changes: 3 additions & 6 deletions src/main/java/sopt/org/HMH/domain/app/service/AppService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -20,12 +18,11 @@ public class AppService {
private final AppRepository appRepository;
private final DayChallengeRepository dayChallengeRepository;

public List<App> addApp(Long dayChallengeId, List<AppGoalTimeRequest> responses) {
DayChallenge dayChallenge = dayChallengeRepository.findById(dayChallengeId)
.orElseThrow(() -> new ChallengeException(ChallengeError.CHALLENGE_NOT_FOUND));
public List<App> addApp(Long dayChallengeId, List<AppGoalTimeRequest> requests) {
DayChallenge dayChallenge = dayChallengeRepository.findByIdOrThrowException(dayChallengeId);

List<App> apps = new ArrayList<>();
for (AppGoalTimeRequest response: responses) {
for (AppGoalTimeRequest response: requests) {
appRepository.save(new App(dayChallenge, response.appCode(), response.goalTime()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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<DayChallenge, Long> {

default DayChallenge findByIdOrThrowException(Long dayChallengeId) {
return findById(dayChallengeId).orElseThrow(() -> new EntityNotFoundException(UserError.USER_NOT_FOUND.getErrorMessage()));
}
}
Original file line number Diff line number Diff line change
@@ -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<User, Long> {

default User findByIdOrThrowException(Long userId) {
return findById(userId).orElseThrow(() -> new EntityNotFoundException(UserError.USER_NOT_FOUND.getErrorMessage()));
}
}
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);
}
}

0 comments on commit d0e798c

Please sign in to comment.