Merge pull request #57 from CommitField/dev

fix : local redis 비활성화, 시큐리티 주석처리

Author: seoyeonson

.DS_Store

@@ -0,0 +1,95 @@
+package cmf.commitField.domain.commit.sinceCommit.controller;
+
+import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class SinceCommitController {
+    private final SinceCommitService sinceCommitService;
+
+    @GetMapping("/api/github/commits-since")
+    public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
+            @RequestParam String owner,
+            @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-spring")
+    public ResponseEntity<List<SinceCommitResponseDto>> 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);
+    }
+
+    // 여름 시즌
+    @GetMapping("/api/github/commits-summer")
+    public ResponseEntity<List<SinceCommitResponseDto>> 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);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 가을 시즌
+    @GetMapping("/api/github/commits-fall")
+    public ResponseEntity<List<SinceCommitResponseDto>> 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);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 겨울 시즌
+    @GetMapping("/api/github/commits-winter")
+    public ResponseEntity<List<SinceCommitResponseDto>> 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()); // 윤년 고려
+
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+}

src/.DS_Store

@@ -0,0 +1,37 @@
+package cmf.commitField.domain.commit.sinceCommit.dto;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class SinceCommitResponseDto {
+    private String sha;
+    private Commit commit;
+    private Author author;
+    private String html_url;
+
+
+    @Getter
+    @NoArgsConstructor
+    public static class Commit {
+        private CommitAuthor author;  // 원래 코드 작성자
+        private String message;
+
+        @Getter
+        @NoArgsConstructor
+        public static class CommitAuthor {
+            private String name;  // 커밋한 사람의 깃허브 이름
+            private String email;
+            private String date;
+        }
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class Author {
+        private String login;  // 커밋한 사람의 깃허브 id
+        private String avatar_url;
+        private String html_url;  // 사용자의 깃허브 주소
+    }
+}

src/main/.DS_Store

@@ -0,0 +1,64 @@
+package cmf.commitField.domain.commit.sinceCommit.service;
+
+import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Slf4j
+@Service
+public class SinceCommitService {
+    private static final String BASE_URL = "https://api.github.com";
+    // ?since=2024-01-01T00:00:00Z&until=2025-02-1T23:59:59Z
+
+    @Value("${github.token}")
+    private String PAT;
+
+    private final WebClient webClient = WebClient.builder()
+            .baseUrl(BASE_URL)
+            .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+            .build();
+
+    public List<SinceCommitResponseDto> getSinceCommits(String owner, String repo, LocalDateTime since, LocalDateTime until) {
+        try {
+            return webClient.get()
+                    .uri(uriBuilder -> uriBuilder
+                            .path("/repos/{owner}/{repo}/commits")
+                            .queryParam("since", since.format(DateTimeFormatter.ISO_DATE_TIME))
+                            .queryParam("until", until.format(DateTimeFormatter.ISO_DATE_TIME))
+                            .build(owner, repo))
+                    .header("Authorization", "bearer " + PAT)
+                    .retrieve()
+                    .bodyToMono(new ParameterizedTypeReference<List<SinceCommitResponseDto>>() {})
+                    .block();
+        } catch (Exception e) {
+            log.error("GitHub API 호출 중 오류 발생: {}", e.getMessage());
+            throw new RuntimeException("GitHub API 호출 중 오류가 발생했습니다.", e);
+        }
+    }
+}
+    /*
+        ParameterizedTypeReference를 사용하는 주요 이유
+        1. 제네릭 타입 정보 보존
+        2. 복잡한 타입 구조 처리 가능
+        3. 타입 안전성 보장
+        4. 런타임에 올바른 타입으로 역직렬화 가능
+
+        ParameterizedTypeReference를 사용하지 않으면
+        // 잘못된 예시
+        List<GitHubCommitResponse> commits = webClient.get()
+            .retrieve()
+            .bodyToMono(List.class)
+            .block();
+
+        // 런타임 에러 발생 가능
+        GitHubCommitResponse commit = commits.get(0); // ClassCastException 발생 위험
+    */

src/main/java/.DS_Store

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.totalCommit.config;
+package cmf.commitField.domain.commit.totalCommit.config;
 
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/cmf/.DS_Store

@@ -1,7 +1,7 @@
-package cmf.commitField.domain.totalCommit.controller;
+package cmf.commitField.domain.commit.totalCommit.controller;
 
-import cmf.commitField.domain.totalCommit.dto.TotalCommitResponseDto;
-import cmf.commitField.domain.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
+import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/cmf/commitField/.DS_Store

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.totalCommit.dto;
+package cmf.commitField.domain.commit.totalCommit.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cmf/commitField/domain/.DS_Store

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.totalCommit.dto;
+package cmf.commitField.domain.commit.totalCommit.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,7 +1,7 @@
-package cmf.commitField.domain.totalCommit.service;
+package cmf.commitField.domain.commit.totalCommit.service;
 
-import cmf.commitField.domain.totalCommit.dto.TotalCommitGraphQLResponse;
-import cmf.commitField.domain.totalCommit.dto.TotalCommitResponseDto;
+import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitGraphQLResponse;
+import cmf.commitField.domain.commit.totalCommit.dto.TotalCommitResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;

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

@@ -0,0 +1,33 @@
+package cmf.commitField.domain.season.controller;
+
+import cmf.commitField.domain.season.entity.Season;
+import cmf.commitField.domain.season.service.SeasonService;
+import cmf.commitField.global.scheduler.SeasonScheduler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.swing.*;
+import java.time.LocalDateTime;
+
+@RestController
+@RequestMapping("/api/seasons")
+@RequiredArgsConstructor
+public class ApiV1SeasonController {
+    private final SeasonService seasonService;
+    private final SeasonScheduler seasonScheduler;
+
+    // 예시로 Season 데이터 입력 해보기
+    @PostMapping
+    public Season createSeason() {
+        String name = "2025 1분기";
+        LocalDateTime start = LocalDateTime.of(2025, 1, 1, 0, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2025, 2, 28, 23, 59, 59);
+
+        return seasonService.createNewSeason(name, start, end);
+    }
+
+    @GetMapping("/active")
+    public Season getActiveSeason() {
+        return seasonService.getActiveSeason();
+    }
+}

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

@@ -0,0 +1,56 @@
+package cmf.commitField.domain.season.controller;
+
+import cmf.commitField.domain.season.dto.UserSeasonDto;
+import cmf.commitField.domain.season.entity.UserSeason;
+import cmf.commitField.domain.season.service.UserSeasonService;
+import cmf.commitField.global.globalDto.GlobalResponse;
+import cmf.commitField.global.globalDto.GlobalResponseCode;
+import lombok.RequiredArgsConstructor;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/user-season")
+@RequiredArgsConstructor
+public class ApiV1UserSeasonController {
+    private final UserSeasonService userSeasonService;
+
+    // 현재 시즌에 유저 랭크 추가하기 (SEED 등급)
+    @GetMapping("/{userId}")
+    public GlobalResponse<UserSeasonDto> addUserRank(@PathVariable Long userId) {
+        UserSeason userSeason = userSeasonService.addUserRank(userId);
+        UserSeasonDto userSeasonDto = new UserSeasonDto(userSeason);
+        return GlobalResponse.success(userSeasonDto);
+    }
+
+    // 유저의 모든 시즌 랭크 조회
+    @GetMapping("/{userId}/ranks")
+    public GlobalResponse<List<UserSeasonDto>> getUserRanks(@PathVariable Long userId) {
+        List<UserSeason> userSeasons = userSeasonService.getUserRanks(userId);
+
+        // UserSeason -> UserSeasonDto 변환
+        List<UserSeasonDto> userSeasonDtos = userSeasons.stream()
+                .map(UserSeasonDto::new)
+                .collect(Collectors.toList());
+
+        return GlobalResponse.success(userSeasonDtos);
+    }
+
+    // 특정 시즌의 유저 랭크 조회
+    @GetMapping("/{userId}/season/{seasonId}")
+    public GlobalResponse<UserSeasonDto> getUserRankBySeason(
+            @PathVariable Long userId,
+            @PathVariable Long seasonId
+    ) {
+        UserSeason userSeason = userSeasonService.getUserRankBySeason(userId, seasonId);
+        UserSeasonDto userSeasonDto = new UserSeasonDto(userSeason);
+        return GlobalResponse.success(userSeasonDto);
+    }
+}
+

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

@@ -0,0 +1,20 @@
+package cmf.commitField.domain.season.dto;
+
+import cmf.commitField.domain.season.entity.Rank;
+import cmf.commitField.domain.season.entity.UserSeason;
+import lombok.Getter;
+
+@Getter
+public class UserSeasonDto {
+    private Long userId;
+    private String username;
+    private String seasonName;
+    private Rank rank;
+
+    public UserSeasonDto(UserSeason userSeason) {
+        this.userId = userSeason.getUser().getId();
+        this.username = userSeason.getUser().getUsername();
+        this.seasonName = userSeason.getSeason().getName();
+        this.rank = userSeason.getRank();
+    }
+}

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

@@ -0,0 +1,10 @@
+package cmf.commitField.domain.season.entity;
+
+public enum Rank {
+    SEED,      // 씨앗
+    SPROUT,    // 새싹
+    STEM,      // 줄기
+    FLOWER,    // 꽃
+    FRUIT,     // 열매
+    TREE       // 나무
+}

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

@@ -0,0 +1,28 @@
+package cmf.commitField.domain.season.entity;
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "season")
+public class Season extends BaseEntity {
+    private String name;
+
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
+
+    @Enumerated(EnumType.STRING)
+    private SeasonStatus status; // ACTIVE, INACTIVE
+}

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

@@ -0,0 +1,5 @@
+package cmf.commitField.domain.season.entity;
+
+public enum SeasonStatus {
+    ACTIVE, INACTIVE
+}