Merge pull request #92 from CommitField/feat/#65

fix: 레드판다 의존성 삭제, 메서드 수정

Author: whale22

.gitignore

@@ -77,6 +77,7 @@ docker-compose.yaml
 db/
 .docker
 data/
+.dummy
 
 ### secret 프로필
 application-secret.yml

build.gradle.kts

@@ -76,18 +76,6 @@ dependencies {
 	// Spring Security OAuth2
 	implementation ("org.springframework.security:spring-security-oauth2-client:6.4.2") // Or the version you're using
 	implementation ("org.springframework.security:spring-security-oauth2-core:6.4.2") // Or the version you're using
-
-	// Spring Kafka
-	implementation("org.springframework.kafka:spring-kafka")
-
-	// Kafka 클라이언트 (Redpanda와 호환)
-	implementation("org.apache.kafka:kafka-clients:3.6.0")
-
-	// JSON 직렬화/역직렬화 (Kafka 메시지 처리)
-	implementation("com.fasterxml.jackson.core:jackson-databind")
-
-	// 테스트용 Kafka 임베디드 서버 (선택 사항)
-	testImplementation("org.springframework.kafka:spring-kafka-test")
 }
 
 tasks.withType<Test> {

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

@@ -2,7 +2,6 @@
 
 import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
-import cmf.commitField.domain.redpanda.RedpandaProducer;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +22,6 @@
 public class CommitScheduler {
     private final TotalCommitService totalCommitService;
     private final CommitCacheService commitCacheService;
-    private final RedpandaProducer redpandaProducer;
     private final UserRepository userRepository;
     private final StringRedisTemplate redisTemplate;
     private final AtomicInteger counter = new AtomicInteger(0);
@@ -68,7 +66,7 @@ private void processUserCommit(User user) {
         }
 
         // 현재 커밋 개수 조회
-        long currentCommitCount = totalCommitService.getSeasonCommits(
+        long currentCommitCount = totalCommitService.getUpdateCommits(
                 user.getUsername(),
                 lastCommitted,  // 🚀 Redis에 저장된 lastCommitted 기준으로 조회
                 LocalDateTime.now()
@@ -94,9 +92,6 @@ private void updateCommitData(User user, long currentCommitCount, long newCommit
         // 2️⃣ Redis에 최신 커밋 개수 저장 (3시간 동안 유지)
         commitCacheService.updateCachedCommitCount(user.getUsername(), currentCommitCount);
 
-        // 3️⃣ 메시지 큐 전송
-        redpandaProducer.sendCommitUpdate(user.getUsername(), newCommitCount);
-
         log.info("✅ 커밋 반영 완료 - User: {}, New Commits: {}", user.getUsername(), newCommitCount);
     }
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/controller/SinceCommitController.java

@@ -2,13 +2,11 @@
 
 import cmf.commitField.domain.commit.sinceCommit.dto.CommitAnalysisResponseDto;
 import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
-import cmf.commitField.domain.commit.sinceCommit.service.GithubService;
 import cmf.commitField.domain.commit.sinceCommit.service.SinceCommitService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,7 +18,6 @@
 @RequiredArgsConstructor
 public class SinceCommitController {
     private final SinceCommitService sinceCommitService;
-    private final GithubService githubService;
 
     @GetMapping("/api/github/commits-since")
     public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
@@ -104,11 +101,4 @@ public ResponseEntity<CommitAnalysisResponseDto> getWinterSeasonCommits(
         return ResponseEntity.ok(analysis);
     }
 
-    // api 테스트 메소드 추가
-    @GetMapping("/api/commit-count/{username}")
-    public ResponseEntity<Integer> getCommitCount(@PathVariable String username) {
-        System.out.println("⚡ API 엔드포인트 호출: " + username);
-        int commitCount = githubService.getUserCommitCount(username);
-        return ResponseEntity.ok(commitCount);
-    }
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java

@@ -14,7 +14,7 @@ public class CommitCacheService {
     private final StringRedisTemplate redisTemplate;
 
     public Integer getCachedCommitCount(String username) {
-        String key = "commit_active:" + username; // Redis 키 생성 (ex: commit:hongildong)
+        String key = "commit_active:" + username; // Redis 키 생성
         String value = redisTemplate.opsForValue().get(key); // Redis에서 값 가져오기
 
         if (value != null) {

src/main/java/cmf/commitField/domain/commit/sinceCommit/service/GithubService.java

@@ -213,4 +213,43 @@ private StreakResult calculateStreaks(List<LocalDate> commitDates) {
 
         return new StreakResult(currentStreak, maxStreak);
     }
+
+    // 시간별 커밋 분석
+    public TotalCommitResponseDto getUpdateCommits(String username, LocalDateTime since, LocalDateTime until) {
+        String query = String.format("""
+        query {
+            user(login: "%s") {
+                contributionsCollection(from: "%s", to: "%s") {
+                    commitContributionsByRepository {
+                        contributions(first: 100) {
+                            nodes {
+                                occurredAt  # ✅ 시간 정보 포함
+                            }
+                        }
+                    }
+                }
+            }
+        }""", username, since.format(DateTimeFormatter.ISO_DATE_TIME), until.format(DateTimeFormatter.ISO_DATE_TIME));
+
+        Map<String, String> requestBody = Map.of("query", query);
+
+        TotalCommitGraphQLResponse response = webClient.post()
+                .header("Authorization", "bearer " + PAT)
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(TotalCommitGraphQLResponse.class)
+                .block();
+
+        if (response == null || response.getData() == null || response.getData().getUser() == null) {
+            throw new RuntimeException("Failed to fetch GitHub data");
+        }
+
+        TotalCommitGraphQLResponse.ContributionsCollection contributions =
+                response.getData().getUser().getContributionsCollection();
+
+        return new TotalCommitResponseDto(
+                contributions.getTotalCommitContributions(),
+                contributions.getRestrictedContributionsCount()
+        );
+    }
 }