Merge pull request #64 from CommitField/feat/#59

Feat: 시즌 별 연속 커밋 횟수, 최대 연속 커밋 횟수, 총 커밋 수 불러오기

Author: whale22

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

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.commit.sinceCommit.controller;
 
+import cmf.commitField.domain.commit.sinceCommit.dto.CommitAnalysisResponseDto;
 import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
 import cmf.commitField.domain.commit.sinceCommit.service.SinceCommitService;
 import lombok.RequiredArgsConstructor;
@@ -24,72 +25,79 @@ public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
             @RequestParam String repo,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime since,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime until
-            ) {
+    ) {
         List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
-
         return ResponseEntity.ok(sinceCommits);
     }
 
-    // 시즌 별 커밋 수 불러오기
+    // 연속 커밋 일수와 같은 추가 분석 정보를 포함하여 반환
+    @GetMapping("/api/github/commits-analysis")
+    public ResponseEntity<CommitAnalysisResponseDto> getCommitsAnalysis(
+            @RequestParam String owner,
+            @RequestParam String repo,
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime since,
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime until
+    ) {
+        CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
+        return ResponseEntity.ok(analysis);
+    }
+
+    // 시즌 별 커밋 정보 불러오기(테스트용으로 2024년 설정)
 
-    // 봄 시즌
+    // 봄 시즌(3/1 - 5/31)
     @GetMapping("/api/github/commits-spring")
-    public ResponseEntity<List<SinceCommitResponseDto>> getSpringSeasonCommits(
+    public ResponseEntity<CommitAnalysisResponseDto> getSpringSeasonCommits(
             @RequestParam String owner,
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
         LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
 
-        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
-
-        return ResponseEntity.ok(sinceCommits);
+        CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
+        return ResponseEntity.ok(analysis);
     }
 
-    // 여름 시즌
+    // 여름 시즌(6/1 - 8/31)
     @GetMapping("/api/github/commits-summer")
-    public ResponseEntity<List<SinceCommitResponseDto>> getSummerSeasonCommits(
+    public ResponseEntity<CommitAnalysisResponseDto> getSummerSeasonCommits(
             @RequestParam String owner,
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
-        LocalDateTime since = LocalDateTime.of(currentYear, 6, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(currentYear, 8, 31, 23, 59, 59);
-
-        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+        LocalDateTime since = LocalDateTime.of(2024, 6, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 8, 31, 23, 59, 59);
 
-        return ResponseEntity.ok(sinceCommits);
+        CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
+        return ResponseEntity.ok(analysis);
     }
 
-    // 가을 시즌
+    // 가을 시즌(9/1 - 11/30)
     @GetMapping("/api/github/commits-fall")
-    public ResponseEntity<List<SinceCommitResponseDto>> getFallSeasonCommits(
+    public ResponseEntity<CommitAnalysisResponseDto> getFallSeasonCommits(
             @RequestParam String owner,
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
-        LocalDateTime since = LocalDateTime.of(currentYear, 9, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(currentYear, 11, 30, 23, 59, 59);
-
-        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+        LocalDateTime since = LocalDateTime.of(2024, 9, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 11, 30, 23, 59, 59);
 
-        return ResponseEntity.ok(sinceCommits);
+        CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
+        return ResponseEntity.ok(analysis);
     }
 
-    // 겨울 시즌
+    // 겨울 시즌(이전 년도 12/1 - 다음 년도 2/30)
     @GetMapping("/api/github/commits-winter")
-    public ResponseEntity<List<SinceCommitResponseDto>> getWinterSeasonCommits(
+    public ResponseEntity<CommitAnalysisResponseDto> getWinterSeasonCommits(
             @RequestParam String owner,
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
-        LocalDateTime since = LocalDateTime.of(currentYear, 12, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(currentYear + 1, 2, 1, 23, 59, 59)
-                .with(TemporalAdjusters.lastDayOfMonth()); // 윤년 고려
+        LocalDateTime since = LocalDateTime.of(2023, 12, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024 + 1, 2, 1, 23, 59, 59)
+                .with(TemporalAdjusters.lastDayOfMonth());
 
-        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
-
-        return ResponseEntity.ok(sinceCommits);
+        CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
+        return ResponseEntity.ok(analysis);
     }
 }

src/main/java/cmf/commitField/domain/commit/sinceCommit/dto/CommitAnalysisResponseDto.java

@@ -0,0 +1,23 @@
+package cmf.commitField.domain.commit.sinceCommit.dto;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class CommitAnalysisResponseDto {
+    private final List<SinceCommitResponseDto> commits;
+    private final int totalCommits;
+    private final int currentStreakDays;
+    private final int maxStreakDays;
+
+    public CommitAnalysisResponseDto(List<SinceCommitResponseDto> commits, int currentStreakDays, int maxStreakDays) {
+        this.commits = commits;
+        this.totalCommits = commits.size();
+        this.currentStreakDays = currentStreakDays;
+        this.maxStreakDays = maxStreakDays;
+    }
+}

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

@@ -1,6 +1,10 @@
 package cmf.commitField.domain.commit.sinceCommit.service;
 
+import cmf.commitField.domain.commit.sinceCommit.dto.CommitAnalysisResponseDto;
 import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
@@ -9,9 +13,12 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -37,13 +44,95 @@ public List<SinceCommitResponseDto> getSinceCommits(String owner, String repo, L
                             .build(owner, repo))
                     .header("Authorization", "bearer " + PAT)
                     .retrieve()
-                    .bodyToMono(new ParameterizedTypeReference<List<SinceCommitResponseDto>>() {})
+                    .bodyToMono(new ParameterizedTypeReference<List<SinceCommitResponseDto>>() {
+                    })
                     .block();
         } catch (Exception e) {
             log.error("GitHub API 호출 중 오류 발생: {}", e.getMessage());
             throw new RuntimeException("GitHub API 호출 중 오류가 발생했습니다.", e);
         }
     }
+
+    // 연속 커밋 수 계산
+
+    // 새로운 분석 메서드 추가
+    public CommitAnalysisResponseDto getCommitAnalysis(String owner, String repo, LocalDateTime since, LocalDateTime until) {
+        List<SinceCommitResponseDto> commits = getSinceCommits(owner, repo, since, until);
+        StreakResult streakResult = calculateStreaks(commits);
+        return new CommitAnalysisResponseDto(commits, streakResult.currentStreak, streakResult.maxStreak);
+    }
+
+    @RequiredArgsConstructor
+    private static class StreakResult {
+        final int currentStreak;
+        final int maxStreak;
+    }
+
+    private StreakResult calculateStreaks(List<SinceCommitResponseDto> commits) {
+        if (commits == null || commits.isEmpty()) {
+            return new StreakResult(0, 0);
+        }
+
+        // 커밋 날짜를 LocalDate로 변환하고 Set으로 중복 제거
+        Set<LocalDate> commitDates = commits.stream()
+                .map(commit -> LocalDateTime.parse(
+                                commit.getCommit().getAuthor().getDate(),
+                                DateTimeFormatter.ISO_DATE_TIME)
+                        .toLocalDate())
+                .collect(Collectors.toCollection(TreeSet::new));
+
+        // 오늘 날짜 가져오기 (UTC 기준)
+        LocalDate today = LocalDate.now(ZoneOffset.UTC);
+
+        // 현재 streak 계산
+        int currentStreak = calculateCurrentStreak(commitDates, today);
+
+        // 최대 streak 계산
+        int maxStreak = calculateMaxStreak(commitDates);
+
+        return new StreakResult(currentStreak, maxStreak);
+    }
+
+    private int calculateCurrentStreak(Set<LocalDate> commitDates, LocalDate today) {
+        // 어제 커밋이 없으면 오늘 커밋만 확인
+        if (!commitDates.contains(today.minusDays(1))) {
+            return commitDates.contains(today) ? 1 : 0;
+        }
+
+        int streakCount = 0;
+        LocalDate checkDate = today;
+
+        // 오늘부터 역순으로 연속된 커밋이 있는지 확인
+        while (commitDates.contains(checkDate)) {
+            streakCount++;
+            checkDate = checkDate.minusDays(1);
+        }
+
+        return streakCount;
+    }
+
+    private int calculateMaxStreak(Set<LocalDate> commitDates) {
+        if (commitDates.isEmpty()) {
+            return 0;
+        }
+
+        List<LocalDate> sortedDates = new ArrayList<>(commitDates);
+        Collections.sort(sortedDates);
+
+        int maxStreak = 1;
+        int currentStreak = 1;
+
+        for (int i = 1; i < sortedDates.size(); i++) {
+            if (sortedDates.get(i).minusDays(1).equals(sortedDates.get(i - 1))) {
+                currentStreak++;
+                maxStreak = Math.max(maxStreak, currentStreak);
+            } else {
+                currentStreak = 1;
+            }
+        }
+
+        return maxStreak;
+    }
 }
     /*
         ParameterizedTypeReference를 사용하는 주요 이유