Merge pull request #55 from CommitField/feat/#43

yoon2000 · web-flow · commit 1844783145e4 · 2025-02-24T11:25:37.000+09:00
Feat/#43
diff --git a/src/main/java/cmf/commitField/domain/season/controller/ApiV1SeasonController.java b/src/main/java/cmf/commitField/domain/season/controller/ApiV1SeasonController.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();
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/season/controller/ApiV1UserSeasonController.java b/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);
+    }
+}
+
diff --git a/src/main/java/cmf/commitField/domain/season/dto/UserSeasonDto.java b/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();
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/season/entity/Rank.java b/src/main/java/cmf/commitField/domain/season/entity/Rank.java
@@ -0,0 +1,10 @@
+package cmf.commitField.domain.season.entity;
+
+public enum Rank {
+    SEED,      // 씨앗
+    SPROUT,    // 새싹
+    STEM,      // 줄기
+    FLOWER,    // 꽃
+    FRUIT,     // 열매
+    TREE       // 나무
+}
diff --git a/src/main/java/cmf/commitField/domain/season/entity/Season.java b/src/main/java/cmf/commitField/domain/season/entity/Season.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
+}
diff --git a/src/main/java/cmf/commitField/domain/season/entity/SeasonStatus.java b/src/main/java/cmf/commitField/domain/season/entity/SeasonStatus.java
@@ -0,0 +1,5 @@
+package cmf.commitField.domain.season.entity;
+
+public enum SeasonStatus {
+    ACTIVE, INACTIVE
+}
diff --git a/src/main/java/cmf/commitField/domain/season/entity/UserSeason.java b/src/main/java/cmf/commitField/domain/season/entity/UserSeason.java
@@ -0,0 +1,31 @@
+package cmf.commitField.domain.season.entity;
+
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "user_season")
+public class UserSeason extends BaseEntity {
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "season_id", nullable = false)
+    private Season season;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "`rank`", nullable = false)  // 백틱(`)을 사용하여 예약어 문제 해결
+    private Rank rank; // 예: SEED, TREE 등등
+}
diff --git a/src/main/java/cmf/commitField/domain/season/repository/SeasonRepository.java b/src/main/java/cmf/commitField/domain/season/repository/SeasonRepository.java
@@ -0,0 +1,11 @@
+package cmf.commitField.domain.season.repository;
+
+import cmf.commitField.domain.season.entity.Season;
+import cmf.commitField.domain.season.entity.SeasonStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SeasonRepository extends JpaRepository<Season, Long> {
+    Season findByStatus(SeasonStatus status);
+}
diff --git a/src/main/java/cmf/commitField/domain/season/repository/UserSeasonRepository.java b/src/main/java/cmf/commitField/domain/season/repository/UserSeasonRepository.java
@@ -0,0 +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);
+}
diff --git a/src/main/java/cmf/commitField/domain/season/service/SeasonService.java b/src/main/java/cmf/commitField/domain/season/service/SeasonService.java
@@ -0,0 +1,29 @@
+package cmf.commitField.domain.season.service;
+
+import cmf.commitField.domain.season.entity.Season;
+import cmf.commitField.domain.season.entity.SeasonStatus;
+import cmf.commitField.domain.season.repository.SeasonRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class SeasonService {
+    private final SeasonRepository seasonRepository;
+
+    public Season createNewSeason(String name, LocalDateTime start, LocalDateTime end) {
+        Season season = Season.builder()
+                .name(name)
+                .startDate(start)
+                .endDate(end)
+                .status(SeasonStatus.ACTIVE)
+                .build();
+        return seasonRepository.save(season);
+    }
+
+    public Season getActiveSeason() {
+        return seasonRepository.findByStatus(SeasonStatus.ACTIVE);
+    }
+}
diff --git a/src/main/java/cmf/commitField/domain/season/service/UserSeasonService.java b/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"));
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/jpa/DataLoader.java b/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();
+        };
+    }
+}
diff --git a/src/main/java/cmf/commitField/global/scheduler/SeasonScheduler.java b/src/main/java/cmf/commitField/global/scheduler/SeasonScheduler.java
