feat: DataLoader,AutoCreateSeason

Author: yoon2000

src/main/java/cmf/commitField/domain/season/controller/ApiV1SeasonController.java

@@ -30,10 +30,4 @@ public Season createSeason() {
     public Season getActiveSeason() {
         return seasonService.getActiveSeason();
     }
-
-    //Season scheduler 테스트 코드
-    @GetMapping("/scheduler")
-    public void testResetSeason() {
-        seasonScheduler.resetSeason();
-    }
 }

src/main/java/cmf/commitField/domain/season/controller/ApiV1UserSeasonController.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/season/dto/UserSeasonDto.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/season/entity/UserSeason.java

@@ -18,14 +18,14 @@
 public class UserSeason extends BaseEntity {
 
     @ManyToOne
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
     @ManyToOne
-    @JoinColumn(name = "season_id")
+    @JoinColumn(name = "season_id", nullable = false)
     private Season season;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "`rank`")  // 백틱(`)을 사용하여 예약어 문제 해결
+    @Column(name = "`rank`", nullable = false)  // 백틱(`)을 사용하여 예약어 문제 해결
     private Rank rank; // 예: SEED, TREE 등등
 }

src/main/java/cmf/commitField/domain/season/repository/UserSeasonRepository.java

@@ -1,13 +1,16 @@
 package cmf.commitField.domain.season.repository;
 
+import cmf.commitField.domain.season.entity.Season;
 import cmf.commitField.domain.season.entity.UserSeason;
 import cmf.commitField.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface UserSeasonRepository extends JpaRepository<UserSeason, Long> {
     List<UserSeason> findByUser(User user);
+    Optional<UserSeason> findByUserAndSeason(User user, Season season);
 }

src/main/java/cmf/commitField/domain/season/service/UserSeasonService.java

@@ -0,0 +1,54 @@
+package cmf.commitField.domain.season.service;
+
+import cmf.commitField.domain.season.entity.Rank;
+import cmf.commitField.domain.season.entity.Season;
+import cmf.commitField.domain.season.entity.UserSeason;
+import cmf.commitField.domain.season.repository.SeasonRepository;
+import cmf.commitField.domain.season.repository.UserSeasonRepository;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class UserSeasonService {
+    private final UserSeasonRepository userSeasonRepository;
+    private final UserRepository userRepository;
+    private final SeasonRepository seasonRepository;
+    private final SeasonService seasonService;
+
+    // 현재 시즌에 유저 랭크 추가하기 (SEED 등급)
+    public UserSeason addUserRank(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new RuntimeException("User not found"));
+
+        Season season = seasonService.getActiveSeason();
+
+        UserSeason userSeason = new UserSeason();
+        userSeason.setUser(user);
+        userSeason.setSeason(season);
+        userSeason.setRank(Rank.SEED);
+
+        return userSeasonRepository.save(userSeason);
+    }
+
+    // 유저의 모든 시즌 랭크 조회
+    public List<UserSeason> getUserRanks(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new RuntimeException("User not found"));
+        return userSeasonRepository.findByUser(user);
+    }
+
+    // 특정 시즌의 유저 랭크 조회
+    public UserSeason getUserRankBySeason(Long userId, Long seasonId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new RuntimeException("User not found"));
+        Season season = seasonRepository.findById(seasonId)
+                .orElseThrow(() -> new RuntimeException("Season not found"));
+        return userSeasonRepository.findByUserAndSeason(user, season)
+                .orElseThrow(() -> new RuntimeException("Rank not found for this season"));
+    }
+}

src/main/java/cmf/commitField/global/jpa/DataLoader.java

@@ -0,0 +1,23 @@
+package cmf.commitField.global.jpa;
+
+import cmf.commitField.global.scheduler.SeasonScheduler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class DataLoader {
+
+    private final SeasonScheduler seasonScheduler;
+
+    // 애플리케이션 시작 시 자동 실행되는 메서드
+    @Bean
+    public ApplicationRunner loadInitialData() {
+        return args -> {
+            // DataLoader에서 바로 SeasonScheduler의 메서드를 호출
+            seasonScheduler.checkAndCreateNewSeason();
+        };
+    }
+}

src/main/java/cmf/commitField/global/scheduler/SeasonScheduler.java

@@ -6,15 +6,17 @@
 import cmf.commitField.domain.season.entity.UserSeason;
 import cmf.commitField.domain.season.repository.SeasonRepository;
 import cmf.commitField.domain.season.repository.UserSeasonRepository;
+import cmf.commitField.domain.season.service.SeasonService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.List;
 
 @Component
@@ -25,37 +27,38 @@ public class SeasonScheduler {
     private final SeasonRepository seasonRepository;
     private final UserSeasonRepository userSeasonRepository;
     private final UserRepository userRepository;
+    private final SeasonService seasonService;
 
-    @Scheduled(cron = "0 0 0 1 1,4,7,10 *")  // 1월, 4월, 7월, 10월 1일 00:00:00에 실행
-    @Transactional
-    public void resetSeason() {
-        log.info("🕒 시즌 초기화 스케줄러 실행");
+    // 매일 자정마다 시즌 확인 및 생성
+    @Scheduled(cron = "0 0 0 * * *")
+    public void checkAndCreateNewSeason() {
+        LocalDate today = LocalDate.now();
+        String seasonName = today.getYear() + " " + getSeasonName(today.getMonthValue());
 
-        // 현재 활성화된 시즌 종료
-        Season currentSeason = seasonRepository.findByStatus(SeasonStatus.ACTIVE);
-        if (currentSeason != null) {
-            currentSeason.setStatus(SeasonStatus.INACTIVE);
-            seasonRepository.save(currentSeason);
-            log.info("✅ 기존 시즌 '{}' 종료됨", currentSeason.getName());
-        }
+        // 현재 활성 시즌 조회
+        Season activeSeason = seasonService.getActiveSeason();
+
+        // 현재 활성 시즌이 없거나, 현재 시즌과 다르면 새로운 시즌 생성
+        if (activeSeason == null || !activeSeason.getName().equals(seasonName)) {
+            LocalDateTime startDate = getSeasonStartDate(today.getYear(), today.getMonth());
+            LocalDateTime endDate = startDate.plusMonths(3).minusSeconds(1);
 
-        // 새로운 시즌 생성
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime start = now.withDayOfMonth(1);
-        LocalDateTime end = start.plusMonths(3).minusSeconds(1);
+            //현재 활성 시즌 종료
+            if (activeSeason != null) {
+                activeSeason.setStatus(SeasonStatus.INACTIVE);
+                seasonRepository.save(activeSeason);
+                log.info("✅ 기존 시즌 '{}' 종료됨", activeSeason.getName());
+            }
 
-        Season newSeason = Season.builder()
-                .name("Season " + start.getYear() + " Q" + ((start.getMonthValue() - 1) / 3 + 1))
-                .startDate(start)
-                .endDate(end)
-                .status(SeasonStatus.ACTIVE)
-                .build();
+            Season newSeason = seasonService.createNewSeason(seasonName, startDate, endDate);
 
-        seasonRepository.save(newSeason);
-        log.info("🌟 새로운 시즌 '{}' 생성됨 (기간: {} ~ {})", newSeason.getName(), start, end);
+            // 모든 유저의 랭크 초기화
+            resetUserRanks(newSeason);
 
-        // 모든 유저의 랭크 초기화
-        resetUserRanks(newSeason);
+            System.out.println("새 시즌 생성: " + newSeason.getName());
+        } else {
+            System.out.println("이미 활성화된 시즌: " + activeSeason.getName());
+        }
     }
 
     private void resetUserRanks(Season newSeason) {
@@ -71,4 +74,28 @@ private void resetUserRanks(Season newSeason) {
             log.info("🔄 유저 '{}'의 시즌 랭크 초기화 ({} -> 씨앗)", user.getNickname(), newSeason.getName());
         }
     }
+
+    // 월을 기준으로 시즌 이름 정하기 (예: 2025 Spring, 2025 Summer)
+    private String getSeasonName(int month) {
+        if (month >= 3 && month <= 5) {
+            return "Spring"; // 봄
+        } else if (month >= 6 && month <= 8) {
+            return "Summer"; // 여름
+        } else if (month >= 9 && month <= 11) {
+            return "Fall"; // 가을
+        } else {
+            return "Winter"; // 겨울
+        }
+    }
+
+    // 해당 시즌의 시작 날짜 반환
+    private LocalDateTime getSeasonStartDate(int year, Month month) {
+        int startMonth = switch (month) {
+            case MARCH, APRIL, MAY -> 3;  // 봄
+            case JUNE, JULY, AUGUST -> 6; // 여름
+            case SEPTEMBER, OCTOBER, NOVEMBER -> 9; // 가을
+            default -> 12; // 겨울 (12월부터 시작)
+        };
+        return LocalDateTime.of(year, startMonth, 1, 0, 0);
+    }
 }