Skip to content

Commit 8ddb9d3

Browse files
authored
Merge pull request #54 from CommitField/feat/#48
Feat: ์‚ฌ์šฉ์ž์™€ ๋ ˆํฌ์ง€ํ† ๋ฆฌ ์ •๋ณด๋ฅผ ๋ฐ›์•„ ์‹œ์ฆŒ ๋ณ„ ์ปค๋ฐ‹ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
2 parents 069c69c + ad6f53c commit 8ddb9d3

File tree

15 files changed

+205
-9
lines changed

15 files changed

+205
-9
lines changed

โ€Ž.DS_Store

6 KB
Binary file not shown.

โ€Žsrc/.DS_Store

6 KB
Binary file not shown.

โ€Žsrc/main/.DS_Store

6 KB
Binary file not shown.

โ€Žsrc/main/java/.DS_Store

6 KB
Binary file not shown.

โ€Žsrc/main/java/cmf/.DS_Store

6 KB
Binary file not shown.
6 KB
Binary file not shown.
Binary file not shown.
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package cmf.commitField.domain.commit.sinceCommit.controller;
2+
3+
import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
4+
import cmf.commitField.domain.commit.sinceCommit.service.SinceCommitService;
5+
import lombok.RequiredArgsConstructor;
6+
import org.springframework.format.annotation.DateTimeFormat;
7+
import org.springframework.http.ResponseEntity;
8+
import org.springframework.web.bind.annotation.GetMapping;
9+
import org.springframework.web.bind.annotation.RequestParam;
10+
import org.springframework.web.bind.annotation.RestController;
11+
12+
import java.time.LocalDateTime;
13+
import java.time.temporal.TemporalAdjusters;
14+
import java.util.List;
15+
16+
@RestController
17+
@RequiredArgsConstructor
18+
public class SinceCommitController {
19+
private final SinceCommitService sinceCommitService;
20+
21+
@GetMapping("/api/github/commits-since")
22+
public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
23+
@RequestParam String owner,
24+
@RequestParam String repo,
25+
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime since,
26+
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime until
27+
) {
28+
List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
29+
30+
return ResponseEntity.ok(sinceCommits);
31+
}
32+
33+
// ์‹œ์ฆŒ ๋ณ„ ์ปค๋ฐ‹ ์ˆ˜ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
34+
35+
// ๋ด„ ์‹œ์ฆŒ
36+
@GetMapping("/api/github/commits-spring")
37+
public ResponseEntity<List<SinceCommitResponseDto>> getSpringSeasonCommits(
38+
@RequestParam String owner,
39+
@RequestParam String repo
40+
) {
41+
int currentYear = LocalDateTime.now().getYear();
42+
LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
43+
LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
44+
45+
List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
46+
47+
return ResponseEntity.ok(sinceCommits);
48+
}
49+
50+
// ์—ฌ๋ฆ„ ์‹œ์ฆŒ
51+
@GetMapping("/api/github/commits-summer")
52+
public ResponseEntity<List<SinceCommitResponseDto>> getSummerSeasonCommits(
53+
@RequestParam String owner,
54+
@RequestParam String repo
55+
) {
56+
int currentYear = LocalDateTime.now().getYear();
57+
LocalDateTime since = LocalDateTime.of(currentYear, 6, 1, 0, 0);
58+
LocalDateTime until = LocalDateTime.of(currentYear, 8, 31, 23, 59, 59);
59+
60+
List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
61+
62+
return ResponseEntity.ok(sinceCommits);
63+
}
64+
65+
// ๊ฐ€์„ ์‹œ์ฆŒ
66+
@GetMapping("/api/github/commits-fall")
67+
public ResponseEntity<List<SinceCommitResponseDto>> getFallSeasonCommits(
68+
@RequestParam String owner,
69+
@RequestParam String repo
70+
) {
71+
int currentYear = LocalDateTime.now().getYear();
72+
LocalDateTime since = LocalDateTime.of(currentYear, 9, 1, 0, 0);
73+
LocalDateTime until = LocalDateTime.of(currentYear, 11, 30, 23, 59, 59);
74+
75+
List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
76+
77+
return ResponseEntity.ok(sinceCommits);
78+
}
79+
80+
// ๊ฒจ์šธ ์‹œ์ฆŒ
81+
@GetMapping("/api/github/commits-winter")
82+
public ResponseEntity<List<SinceCommitResponseDto>> getWinterSeasonCommits(
83+
@RequestParam String owner,
84+
@RequestParam String repo
85+
) {
86+
int currentYear = LocalDateTime.now().getYear();
87+
LocalDateTime since = LocalDateTime.of(currentYear, 12, 1, 0, 0);
88+
LocalDateTime until = LocalDateTime.of(currentYear + 1, 2, 1, 23, 59, 59)
89+
.with(TemporalAdjusters.lastDayOfMonth()); // ์œค๋…„ ๊ณ ๋ ค
90+
91+
List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
92+
93+
return ResponseEntity.ok(sinceCommits);
94+
}
95+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package cmf.commitField.domain.commit.sinceCommit.dto;
2+
3+
import lombok.Getter;
4+
import lombok.NoArgsConstructor;
5+
6+
@Getter
7+
@NoArgsConstructor
8+
public class SinceCommitResponseDto {
9+
private String sha;
10+
private Commit commit;
11+
private Author author;
12+
private String html_url;
13+
14+
15+
@Getter
16+
@NoArgsConstructor
17+
public static class Commit {
18+
private CommitAuthor author; // ์›๋ž˜ ์ฝ”๋“œ ์ž‘์„ฑ์ž
19+
private String message;
20+
21+
@Getter
22+
@NoArgsConstructor
23+
public static class CommitAuthor {
24+
private String name; // ์ปค๋ฐ‹ํ•œ ์‚ฌ๋žŒ์˜ ๊นƒํ—ˆ๋ธŒ ์ด๋ฆ„
25+
private String email;
26+
private String date;
27+
}
28+
}
29+
30+
@Getter
31+
@NoArgsConstructor
32+
public static class Author {
33+
private String login; // ์ปค๋ฐ‹ํ•œ ์‚ฌ๋žŒ์˜ ๊นƒํ—ˆ๋ธŒ id
34+
private String avatar_url;
35+
private String html_url; // ์‚ฌ์šฉ์ž์˜ ๊นƒํ—ˆ๋ธŒ ์ฃผ์†Œ
36+
}
37+
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package cmf.commitField.domain.commit.sinceCommit.service;
2+
3+
import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
4+
import lombok.extern.slf4j.Slf4j;
5+
import org.springframework.beans.factory.annotation.Value;
6+
import org.springframework.core.ParameterizedTypeReference;
7+
import org.springframework.http.HttpHeaders;
8+
import org.springframework.http.MediaType;
9+
import org.springframework.stereotype.Service;
10+
import org.springframework.web.reactive.function.client.WebClient;
11+
12+
import java.time.LocalDateTime;
13+
import java.time.format.DateTimeFormatter;
14+
import java.util.List;
15+
16+
@Slf4j
17+
@Service
18+
public class SinceCommitService {
19+
private static final String BASE_URL = "https://api.github.com";
20+
// ?since=2024-01-01T00:00:00Z&until=2025-02-1T23:59:59Z
21+
22+
@Value("${github.token}")
23+
private String PAT;
24+
25+
private final WebClient webClient = WebClient.builder()
26+
.baseUrl(BASE_URL)
27+
.defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
28+
.build();
29+
30+
public List<SinceCommitResponseDto> getSinceCommits(String owner, String repo, LocalDateTime since, LocalDateTime until) {
31+
try {
32+
return webClient.get()
33+
.uri(uriBuilder -> uriBuilder
34+
.path("/repos/{owner}/{repo}/commits")
35+
.queryParam("since", since.format(DateTimeFormatter.ISO_DATE_TIME))
36+
.queryParam("until", until.format(DateTimeFormatter.ISO_DATE_TIME))
37+
.build(owner, repo))
38+
.header("Authorization", "bearer " + PAT)
39+
.retrieve()
40+
.bodyToMono(new ParameterizedTypeReference<List<SinceCommitResponseDto>>() {})
41+
.block();
42+
} catch (Exception e) {
43+
log.error("GitHub API ํ˜ธ์ถœ ์ค‘ ์˜ค๋ฅ˜ ๋ฐœ์ƒ: {}", e.getMessage());
44+
throw new RuntimeException("GitHub API ํ˜ธ์ถœ ์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค.", e);
45+
}
46+
}
47+
}
48+
/*
49+
ParameterizedTypeReference๋ฅผ ์‚ฌ์šฉํ•˜๋Š” ์ฃผ์š” ์ด์œ 
50+
1. ์ œ๋„ค๋ฆญ ํƒ€์ž… ์ •๋ณด ๋ณด์กด
51+
2. ๋ณต์žกํ•œ ํƒ€์ž… ๊ตฌ์กฐ ์ฒ˜๋ฆฌ ๊ฐ€๋Šฅ
52+
3. ํƒ€์ž… ์•ˆ์ „์„ฑ ๋ณด์žฅ
53+
4. ๋Ÿฐํƒ€์ž„์— ์˜ฌ๋ฐ”๋ฅธ ํƒ€์ž…์œผ๋กœ ์—ญ์ง๋ ฌํ™” ๊ฐ€๋Šฅ
54+
55+
ParameterizedTypeReference๋ฅผ ์‚ฌ์šฉํ•˜์ง€ ์•Š์œผ๋ฉด
56+
// ์ž˜๋ชป๋œ ์˜ˆ์‹œ
57+
List<GitHubCommitResponse> commits = webClient.get()
58+
.retrieve()
59+
.bodyToMono(List.class)
60+
.block();
61+
62+
// ๋Ÿฐํƒ€์ž„ ์—๋Ÿฌ ๋ฐœ์ƒ ๊ฐ€๋Šฅ
63+
GitHubCommitResponse commit = commits.get(0); // ClassCastException ๋ฐœ์ƒ ์œ„ํ—˜
64+
*/

โ€Žsrc/main/java/cmf/commitField/domain/totalCommit/config/WebConfig.java renamed to โ€Žsrc/main/java/cmf/commitField/domain/commit/totalCommit/config/WebConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cmf.commitField.domain.totalCommit.config;
1+
package cmf.commitField.domain.commit.totalCommit.config;
22

33
import org.springframework.web.servlet.config.annotation.CorsRegistry;
44
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

โ€Žsrc/main/java/cmf/commitField/domain/totalCommit/controller/TotalCommitController.java renamed to โ€Žsrc/main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cmf.commitField.domain.totalCommit.controller;
1+
package cmf.commitField.domain.commit.totalCommit.controller;
22

3-
import cmf.commitField.domain.totalCommit.dto.TotalCommitResponseDto;
4-
import cmf.commitField.domain.totalCommit.service.TotalCommitService;
3+
import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
4+
import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.PathVariable;

โ€Žsrc/main/java/cmf/commitField/domain/totalCommit/dto/TotalCommitGraphQLResponse.java renamed to โ€Žsrc/main/java/cmf/commitField/domain/commit/totalCommit/dto/TotalCommitGraphQLResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cmf.commitField.domain.totalCommit.dto;
1+
package cmf.commitField.domain.commit.totalCommit.dto;
22

33
import lombok.Getter;
44
import lombok.NoArgsConstructor;

โ€Žsrc/main/java/cmf/commitField/domain/totalCommit/dto/TotalCommitResponseDto.java renamed to โ€Žsrc/main/java/cmf/commitField/domain/commit/totalCommit/dto/TotalCommitResponseDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cmf.commitField.domain.totalCommit.dto;
1+
package cmf.commitField.domain.commit.totalCommit.dto;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Getter;

โ€Žsrc/main/java/cmf/commitField/domain/totalCommit/service/TotalCommitService.java renamed to โ€Žsrc/main/java/cmf/commitField/domain/commit/totalCommit/service/TotalCommitService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cmf.commitField.domain.totalCommit.service;
1+
package cmf.commitField.domain.commit.totalCommit.service;
22

3-
import cmf.commitField.domain.totalCommit.dto.TotalCommitGraphQLResponse;
4-
import cmf.commitField.domain.totalCommit.dto.TotalCommitResponseDto;
3+
import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitGraphQLResponse;
4+
import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.beans.factory.annotation.Value;
77
import org.springframework.http.HttpHeaders;

0 commit comments

Comments
ย (0)