fix: userinfo 출력 시 commit수 변경되지 않도록 수정

Author: whale22

src/main/java/cmf/commitField/domain/user/dto/UserInfoDto.java

@@ -15,6 +15,7 @@ public class UserInfoDto {
     private LocalDateTime createdAt;
     private LocalDateTime lastCommitted;
     private long commitCount;
+    private long seasonCommitCount;
 
     private int petType;
     private long petExp;

src/main/java/cmf/commitField/domain/user/service/UserService.java

@@ -38,13 +38,17 @@ public UserInfoDto showUserInfo(String username) {
         User user = userRepository.findByUsername(username).get();
         Pet pet = petRepository.findByUserEmail(user.getEmail()).get(0); // TODO: 확장시 코드 수정 필요
 
-        long totalCommit = totalCommitService.getTotalCommitCount(username).getTotalCommitContributions();
-        // 유저 정보 조회 후 변경사항은 업데이트
-        // TODO: 스케쥴러 수정 후 펫 부분 수정 필요
-        user.setCommitCount(totalCommit);
-//        commitUpdateService.updateUserTier(user.getUsername());
-//        petService.getExpPet(user.getUsername(), 0);
+        // TODO: info 조회 시 user commit 수 즉시 반영은 로직 변경이 필요
+//        long totalCommit = totalCommitService.getTotalCommitCount(username).getTotalCommitContributions();
+//        long seasonCommit = totalCommitService.getSeasonCommits(username,
+//                LocalDateTime.of(2025,03,01,00,00),
+//                LocalDateTime.of(2025,05,31,23,59)
+//        ).getTotalCommitContributions();
+//
+//        user.setCommitCount(totalCommit);
+        // TODO블럭 종료
 
+        // 유저 정보 조회 후 active 상태가 아니면 Redis에 추가, 커밋 추적 시작
         String key = "commit_active:" + user.getUsername();
         if(redisTemplate.opsForValue().get(key)==null){
             redisTemplate.opsForValue().set(key, String.valueOf(user.getCommitCount()), 3, TimeUnit.HOURS);
@@ -56,7 +60,8 @@ public UserInfoDto showUserInfo(String username) {
                 .email(user.getEmail())
                 .avatarUrl(user.getAvatarUrl())
                 .tier(user.getTier().toString())
-                .commitCount(totalCommit)
+                .commitCount(user.getCommitCount())
+                .seasonCommitCount(user.getSeasonCommitCount())
                 .createdAt(user.getCreatedAt())
                 .lastCommitted(user.getLastCommitted())
                 .petType(pet.getType())