From a579be61a408e36e7c5529c0cdfdc7ae5709ad2b Mon Sep 17 00:00:00 2001 From: wingyou Date: Fri, 14 Feb 2025 15:26:37 +0900 Subject: [PATCH] =?UTF-8?q?refactor(challenge):=20=EC=B1=8C=EB=A6=B0?= =?UTF-8?q?=EC=A7=80=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=9D=98=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EC=97=94=ED=84=B0=ED=8B=B0=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goolbitg/api/data/DataInitializer.java | 5 ---- .../api/repository/UserStatRepository.java | 12 --------- .../api/repository/UserSurveyRepository.java | 13 --------- .../goolbitg/api/service/AuthServiceImpl.java | 10 ------- .../api/service/BuyOrNotServiceImpl.java | 7 ++--- .../api/service/ChallengeServiceImpl.java | 27 +++++++------------ 6 files changed, 12 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/com/goolbitg/api/repository/UserStatRepository.java delete mode 100644 src/main/java/com/goolbitg/api/repository/UserSurveyRepository.java diff --git a/src/main/java/com/goolbitg/api/data/DataInitializer.java b/src/main/java/com/goolbitg/api/data/DataInitializer.java index 539a038..0ce781a 100644 --- a/src/main/java/com/goolbitg/api/data/DataInitializer.java +++ b/src/main/java/com/goolbitg/api/data/DataInitializer.java @@ -18,11 +18,6 @@ @RequiredArgsConstructor public class DataInitializer implements CommandLineRunner { - @Autowired - private final UserService userService; - @Autowired - private final ChallengeService challengeService; - @Override public void run(String... args) throws Exception { log.info("Load Initial Data"); diff --git a/src/main/java/com/goolbitg/api/repository/UserStatRepository.java b/src/main/java/com/goolbitg/api/repository/UserStatRepository.java deleted file mode 100644 index 4866202..0000000 --- a/src/main/java/com/goolbitg/api/repository/UserStatRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.goolbitg.api.repository; - -import org.springframework.data.jpa.repository.JpaRepository; - -import com.goolbitg.api.entity.UserStat; - -/** - * UserStatsRepository - */ -public interface UserStatRepository extends JpaRepository { - -} diff --git a/src/main/java/com/goolbitg/api/repository/UserSurveyRepository.java b/src/main/java/com/goolbitg/api/repository/UserSurveyRepository.java deleted file mode 100644 index 2cfe098..0000000 --- a/src/main/java/com/goolbitg/api/repository/UserSurveyRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.goolbitg.api.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.CrudRepository; - -import com.goolbitg.api.entity.UserSurvey; - -/** - * UserSurveyRepository - */ -public interface UserSurveyRepository extends JpaRepository { - -} diff --git a/src/main/java/com/goolbitg/api/service/AuthServiceImpl.java b/src/main/java/com/goolbitg/api/service/AuthServiceImpl.java index a20afa5..5341167 100644 --- a/src/main/java/com/goolbitg/api/service/AuthServiceImpl.java +++ b/src/main/java/com/goolbitg/api/service/AuthServiceImpl.java @@ -16,8 +16,6 @@ import com.goolbitg.api.entity.RegistrationToken; import com.goolbitg.api.entity.UnregisterHistory; import com.goolbitg.api.entity.User; -import com.goolbitg.api.entity.UserStat; -import com.goolbitg.api.entity.UserSurvey; import com.goolbitg.api.exception.AuthException; import com.goolbitg.api.exception.UserException; import com.goolbitg.api.model.AuthRequestDto; @@ -29,8 +27,6 @@ import com.goolbitg.api.repository.RegistrationTokenRepository; import com.goolbitg.api.repository.UnregisterHistoryRepository; import com.goolbitg.api.repository.UserRepository; -import com.goolbitg.api.repository.UserStatRepository; -import com.goolbitg.api.repository.UserSurveyRepository; import com.goolbitg.api.repository.UserTokenRepository; import com.goolbitg.api.security.AppleLoginManager; import com.goolbitg.api.security.JwtManager; @@ -48,10 +44,6 @@ public class AuthServiceImpl implements AuthService { @Autowired private UserRepository userRepository; @Autowired - private UserSurveyRepository userSurveyRepository; - @Autowired - private UserStatRepository userStatsRepository; - @Autowired private UserTokenRepository tokenRepository; @Autowired private UnregisterHistoryRepository unregisterHistoryRepository; @@ -178,8 +170,6 @@ public void unregister(String userId, UnregisterDto request, LocalDate date) { .build(); unregisterHistoryRepository.save(history); - userSurveyRepository.deleteById(userId); - userStatsRepository.deleteById(userId); userRepository.deleteById(userId); challengeRecordRepository.deleteByUserId(userId); diff --git a/src/main/java/com/goolbitg/api/service/BuyOrNotServiceImpl.java b/src/main/java/com/goolbitg/api/service/BuyOrNotServiceImpl.java index 5175a25..ad04130 100644 --- a/src/main/java/com/goolbitg/api/service/BuyOrNotServiceImpl.java +++ b/src/main/java/com/goolbitg/api/service/BuyOrNotServiceImpl.java @@ -22,19 +22,16 @@ import com.goolbitg.api.repository.BuyOrNotRepository; import com.goolbitg.api.repository.BuyOrNotVoteRepository; -import lombok.RequiredArgsConstructor; - /** * BuyOrNotServiceImpl */ @Service -@RequiredArgsConstructor public class BuyOrNotServiceImpl implements BuyOrNotService { @Autowired - private final BuyOrNotRepository buyOrNotRepository; + private BuyOrNotRepository buyOrNotRepository; @Autowired - private final BuyOrNotVoteRepository buyOrNotVoteRepository; + private BuyOrNotVoteRepository buyOrNotVoteRepository; @Override public BuyOrNotDto getBuyOrNot(Long postId) { diff --git a/src/main/java/com/goolbitg/api/service/ChallengeServiceImpl.java b/src/main/java/com/goolbitg/api/service/ChallengeServiceImpl.java index 92460b1..7a6f461 100644 --- a/src/main/java/com/goolbitg/api/service/ChallengeServiceImpl.java +++ b/src/main/java/com/goolbitg/api/service/ChallengeServiceImpl.java @@ -39,32 +39,26 @@ import com.goolbitg.api.repository.DailyRecordRepository; import com.goolbitg.api.repository.SpendingTypeRepository; import com.goolbitg.api.repository.UserRepository; -import com.goolbitg.api.repository.UserStatRepository; - -import lombok.RequiredArgsConstructor; /** * ChallengeServiceImpl */ @Service -@RequiredArgsConstructor @Transactional(readOnly = true) public class ChallengeServiceImpl implements ChallengeService { @Autowired - private final ChallengeRepository challengeRepository; - @Autowired - private final ChallengeRecordRepository challengeRecordRepository; + private ChallengeRepository challengeRepository; @Autowired - private final ChallengeStatRepository challengeStatRepository; + private ChallengeRecordRepository challengeRecordRepository; @Autowired - private final UserRepository userRepository; + private ChallengeStatRepository challengeStatRepository; @Autowired - private final UserStatRepository userStatRepository; + private UserRepository userRepository; @Autowired - private final DailyRecordRepository dailyRecordRepository; + private DailyRecordRepository dailyRecordRepository; @Autowired - private final SpendingTypeRepository spendingTypeRepository; + private SpendingTypeRepository spendingTypeRepository; @@ -146,8 +140,7 @@ public ChallengeRecordDto checkChallenge(String userId, Long challengeId, LocalD User user = userRepository.findById(userId) .orElseThrow(() -> UserException.userNotExist(userId)); - UserStat userStat = userStatRepository.findById(userId) - .orElseThrow(() -> UserException.userNotExist(userId)); + UserStat userStat = user.getStat(); DailyRecord dailyRecord = findOrCreateDailyRecord(userId, date, dailyRecordId); @@ -158,7 +151,6 @@ public ChallengeRecordDto checkChallenge(String userId, Long challengeId, LocalD challenge.achieve(); userRepository.save(user); - userStatRepository.save(userStat); dailyRecordRepository.save(dailyRecord); challengeRepository.save(challenge); challengeRecordRepository.save(record); @@ -189,8 +181,9 @@ public void enrollChallenge(String userId, Long challengeId, LocalDate date) { Challenge challenge = challengeRepository.findById(challengeId) .orElseThrow(() -> ChallengeException.challengeNotExist(challengeId)); - UserStat userStat = userStatRepository.findById(userId) + User user = userRepository.findById(userId) .orElseThrow(() -> UserException.userNotExist(userId)); + UserStat userStat = user.getStat(); DailyRecord dailyRecord = findOrCreateDailyRecord(userId, date, dailyRecordId); @@ -234,7 +227,7 @@ public void enrollChallenge(String userId, Long challengeId, LocalDate date) { challenge.enroll(); dailyRecordRepository.save(dailyRecord); - userStatRepository.save(userStat); + userRepository.save(user); challengeRepository.save(challenge); }