fix: 충돌 해결

Author: whale22

src/main/java/cmf/commitField/domain/commit/scheduler/CommitScheduler.java

@@ -72,7 +72,7 @@ private void processUserCommit(String username) {
             username,
             lastCommittedTime,  // 🚀 Redis에 저장된 lastCommitted 기준으로 조회
             LocalDateTime.now()
-        ).getTotalCommitContributions();
+        ).getCommits();
         System.out.println("커밋 개수 불러들이기 완료, 현재까지 업데이트 된 커밋 수 : "+updateTotalCommit);
 
         if(currentCommit.equals("0") && updateTotalCommit > 0){

src/main/java/cmf/commitField/domain/commit/totalCommit/dto/CommitUpdateDTO.java

@@ -0,0 +1,12 @@
+package cmf.commitField.domain.commit.totalCommit.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class CommitUpdateDTO {
+    long commits;
+}

src/main/java/cmf/commitField/domain/commit/totalCommit/service/TotalCommitService.java

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.commit.totalCommit.service;
 
+import cmf.commitField.domain.commit.totalCommit.dto.CommitUpdateDTO;
 import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitGraphQLResponse;
 import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
 import lombok.RequiredArgsConstructor;
@@ -215,7 +216,7 @@ private StreakResult calculateStreaks(List<LocalDate> commitDates) {
     }
 
     // 시간별 커밋 분석
-    public TotalCommitResponseDto getUpdateCommits(String username, LocalDateTime since, LocalDateTime until) {
+    public CommitUpdateDTO getUpdateCommits(String username, LocalDateTime since, LocalDateTime until) {
         String query = String.format("""
         query {
             user(login: "%s") {
@@ -249,9 +250,8 @@ public TotalCommitResponseDto getUpdateCommits(String username, LocalDateTime si
         TotalCommitGraphQLResponse.ContributionsCollection contributions =
                 response.getData().getUser().getContributionsCollection();
 
-        return new TotalCommitResponseDto(
-                contributions.getTotalCommitContributions(),
-                contributions.getRestrictedContributionsCount()
+        return new CommitUpdateDTO(
+                contributions.getTotalCommitContributions()
         );
     }
 }

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

@@ -43,7 +43,7 @@ public UserInfoDto showUserInfo(String username) {
         commitUpdateService.updateUserTier(user.getUsername());
         petService.getExpPet(user.getUsername(), 0);
 
-        long commit = totalCommitService.getUpdateCommits(username, user.getLastCommitted(), LocalDateTime.now()).getTotalCommitContributions();
+        long commit = totalCommitService.getUpdateCommits(username, user.getLastCommitted(), LocalDateTime.now()).getCommits();
         System.out.println("커밋수 테스트 : "+commit);
 
         String key = "commit_active:" + user.getUsername();