Merge branch 'dev' into feat/#20

Author: whale22

.gitignore

@@ -75,6 +75,8 @@ docker-compose.yaml
 
 ### db파일
 db/
+.docker
+data/
 
 ### secret 프로필
 application-secret.yml

build.gradle.kts

@@ -40,17 +40,13 @@ dependencies {
 	compileOnly("org.projectlombok:lombok")
 	annotationProcessor("org.projectlombok:lombok")
 
-	// DB
+	//DB
 	runtimeOnly("com.h2database:h2")
 	runtimeOnly("com.mysql:mysql-connector-j")
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 
-	// redis
+	//redis
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
-	implementation("org.springframework.session:spring-session-data-redis")
-
-	// actuator
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
 
 	// Security
 	implementation("org.springframework.boot:spring-boot-starter-security")
@@ -59,10 +55,7 @@ dependencies {
 
 	//Swagger
 	implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
-
-	//Web Socket
 	implementation("org.java-websocket:Java-WebSocket:1.5.2")
-	implementation ("org.springframework:spring-messaging")
 
 	// JWT
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")
@@ -81,6 +74,17 @@ dependencies {
 	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

@@ -0,0 +1,38 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
+import cmf.commitField.domain.commit.sinceCommit.service.GithubService;
+import cmf.commitField.domain.redpanda.RedpandaProducer;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CommitScheduler {
+    private final GithubService githubService;
+    private final CommitCacheService commitCacheService;
+    private final RedpandaProducer redpandaProducer;
+    private final UserRepository userRepository;
+
+    @Scheduled(fixedRate = 60000) // 1분마다 실행
+    public void updateUserCommits() {
+        List<User> activeUsers = userRepository.findAll(); // 💫 변경 필요, 차후 active 상태인 user만 찾게끔 변경해야 함.
+
+        for (User user : activeUsers) {
+            Integer cachedCount = commitCacheService.getCachedCommitCount(user.getUsername());
+            int newCommitCount = githubService.getUserCommitCount(user.getUsername());
+
+            if (cachedCount == null || cachedCount != newCommitCount) { // 변화가 있을 때만 처리
+                commitCacheService.updateCachedCommitCount(user.getUsername(), newCommitCount);
+                redpandaProducer.sendCommitUpdate(user.getUsername(), newCommitCount);
+            }
+        }
+    }
+}

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

@@ -2,11 +2,13 @@
 
 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;
 
@@ -18,6 +20,7 @@
 @RequiredArgsConstructor
 public class SinceCommitController {
     private final SinceCommitService sinceCommitService;
+    private final GithubService githubService;
 
     @GetMapping("/api/github/commits-since")
     public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
@@ -100,4 +103,12 @@ public ResponseEntity<CommitAnalysisResponseDto> getWinterSeasonCommits(
         CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
         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/dto/CommitData.java

@@ -0,0 +1,15 @@
+package cmf.commitField.domain.commit.sinceCommit.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class CommitData {
+    String user;
+    int commits;
+}

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

@@ -0,0 +1,26 @@
+package cmf.commitField.domain.commit.sinceCommit.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CommitCacheService {
+    private final StringRedisTemplate redisTemplate;
+
+    public Integer getCachedCommitCount(String username) {
+        String key = "commit:" + username;
+        String value = redisTemplate.opsForValue().get(key);
+        return value != null ? Integer.parseInt(value) : null;
+    }
+
+    public void updateCachedCommitCount(String username, int count) {
+        String key = "commit:" + username;
+        redisTemplate.opsForValue().set(key, String.valueOf(count), Duration.ofHours(1)); // 1시간 캐싱
+    }
+}

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

@@ -0,0 +1,70 @@
+package cmf.commitField.domain.commit.sinceCommit.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class GithubService {
+    private final RestTemplate restTemplate;
+    private final String GITHUB_API_URL = "https://api.github.com";
+
+    @Value("${github.token}")
+    private String GITHUB_TOKEN;
+
+    public int getUserCommitCount(String username) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", "Bearer " + GITHUB_TOKEN);
+        headers.set("Accept", "application/vnd.github.v3+json"); // 최신 GitHub API 버전 지정
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+        String url = String.format("%s/users/%s/events", GITHUB_API_URL, username);
+
+        // 📌 API 호출 횟수 확인용 로그 추가
+        System.out.println("GitHub API 호출: " + url);
+
+        try {
+            ResponseEntity<List<Map<String, Object>>> response =
+                    restTemplate.exchange(url, HttpMethod.GET, entity, new ParameterizedTypeReference<>() {});
+
+            // GitHub API Rate Limit 확인 (남은 요청 횟수 로깅)
+            HttpHeaders responseHeaders = response.getHeaders();
+            String remainingRequests = responseHeaders.getFirst("X-RateLimit-Remaining");
+            System.out.println("GitHub API 남은 요청 횟수: " + remainingRequests);
+
+            int commitCount = 0;
+            if (response.getBody() != null) {
+                for (Map<String, Object> event : response.getBody()) {
+                    if ("PushEvent".equals(event.get("type"))) {
+                        Map<String, Object> payload = (Map<String, Object>) event.get("payload");
+                        if (payload != null && payload.containsKey("commits")) {
+                            List<?> commits = (List<?>) payload.get("commits");
+                            commitCount += (commits != null) ? commits.size() : 0;
+                        }
+                    }
+                }
+            }
+            return commitCount;
+
+        } catch (HttpClientErrorException e) {
+            System.err.println("GitHub API 요청 실패: " + e.getStatusCode() + " - " + e.getResponseBodyAsString());
+            if (e.getStatusCode() == HttpStatus.UNAUTHORIZED) {
+                throw new RuntimeException("GitHub API 인증 실패: 올바른 토큰을 사용하세요.");
+            } else if (e.getStatusCode() == HttpStatus.FORBIDDEN) {
+                throw new RuntimeException("GitHub API 요청 제한 초과 (Rate Limit 초과). 잠시 후 다시 시도하세요.");
+            }
+            return 0; // 기본값 반환
+        } catch (Exception e) {
+            System.err.println("예기치 않은 오류 발생: " + e.getMessage());
+            return 0; // 기본값 반환
+        }
+    }
+}

src/main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java

@@ -7,6 +7,9 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
+
 @RestController
 @RequiredArgsConstructor
 public class TotalCommitController {
@@ -16,4 +19,41 @@ public class TotalCommitController {
     public TotalCommitResponseDto getTotalCommits(@PathVariable String username) {
         return totalCommitService.getTotalCommitCount(username);
     }
+
+    // 봄 시즌(3/1 - 5/31)
+    @GetMapping("/api/commits/{username}/spring")
+    public TotalCommitResponseDto getSpringSeasonCommits(@PathVariable String username) {
+        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
+        LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
+        return totalCommitService.getSeasonCommits(username, since, until);
+    }
+
+    // 여름 시즌(6/1 - 8/31)
+    @GetMapping("/api/commits/{username}/summer")
+    public TotalCommitResponseDto getSummerSeasonCommits(@PathVariable String username) {
+        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
+        LocalDateTime since = LocalDateTime.of(2024, 6, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 8, 31, 23, 59, 59);
+        return totalCommitService.getSeasonCommits(username, since, until);
+    }
+
+    // 가을 시즌(9/1 - 11/30)
+    @GetMapping("/api/commits/{username}/fall")
+    public TotalCommitResponseDto getFallSeasonCommits(@PathVariable String username) {
+        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
+        LocalDateTime since = LocalDateTime.of(2024, 9, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 11, 30, 23, 59, 59);
+        return totalCommitService.getSeasonCommits(username, since, until);
+    }
+
+    // 겨울 시즌(이전 년도 12/1 - 다음 년도 2/28)
+    @GetMapping("/api/commits/{username}/winter")
+    public TotalCommitResponseDto getWinterSeasonCommits(@PathVariable String username) {
+        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
+        LocalDateTime since = LocalDateTime.of(2024 - 1, 12, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 2, 1, 23, 59, 59)
+                .with(TemporalAdjusters.lastDayOfMonth());
+        return totalCommitService.getSeasonCommits(username, since, until);
+    }
 }

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

@@ -3,6 +3,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /*
 응답구조 토대로 구현
 {
@@ -37,7 +39,28 @@ public static class CommitUser {
     @Getter
     @NoArgsConstructor
     public static class ContributionsCollection {
-        private long totalCommitContributions;
-        private long restrictedContributionsCount;
+        private long totalCommitContributions;  // 공개 레포 커밋
+        private long restrictedContributionsCount;  // 비공개 레포 커밋
+        private ContributionCalendar contributionCalendar;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class ContributionCalendar {
+        private int totalContributions;
+        private List<Week> weeks;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class Week {
+        private List<ContributionDay> contributionDays;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class ContributionDay {
+        private int contributionCount;
+        private String date;
     }
 }

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

@@ -6,8 +6,21 @@
 
 @Getter
 @NoArgsConstructor
-@AllArgsConstructor
 public class TotalCommitResponseDto {
     private long totalCommitContributions;
     private long restrictedContributionsCount;
+    private int currentStreakDays;
+    private int maxStreakDays;
+
+    public TotalCommitResponseDto(long totalCommitContributions, long restrictedContributionsCount, int currentStreakDays, int maxStreakDays) {
+        this.totalCommitContributions = totalCommitContributions;
+        this.restrictedContributionsCount = restrictedContributionsCount;
+        this.currentStreakDays = currentStreakDays;
+        this.maxStreakDays = maxStreakDays;
+    }
+
+    public TotalCommitResponseDto(long totalCommitContributions, long restrictedContributionsCount) {
+        this.totalCommitContributions = totalCommitContributions;
+        this.restrictedContributionsCount = restrictedContributionsCount;
+    }
 }