refactor(challenge): 챌린지 서비스의 유저 엔터티 관련 구조 리팩토링

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");

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);
 

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) {

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);
     }