Merge branch 'dev' of https://github.com/CommitField/commitField

Author: skyeong42

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.java

@@ -2,6 +2,7 @@
 
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.Tier;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +23,7 @@ public UserInfoDto updateUserTier(String username){
         User user = userRepository.findByUsername(username).get();
         long seasonCommitCount;
         seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2025,03,01,0,0), LocalDateTime.of(2025,05,31,23,59)).getTotalCommitContributions();
-        user.setTier(User.Tier.getLevelByExp((int)seasonCommitCount));
+        user.setTier(Tier.getLevelByExp((int)seasonCommitCount));
         System.out.println(username+"유저 레벨 업! 현재 티어: "+user.getTier());
         userRepository.save(user);
 

src/main/java/cmf/commitField/domain/pet/entity/PetGrow.java

@@ -4,9 +4,10 @@
 
 @Getter
 public enum PetGrow {
+    //FIXME: 테스트를 위한 수정, 차후 15/30으로 변경 필요
     EGG(0),
-    HATCH(150),
-    GROWN(300);
+    HATCH(20),
+    GROWN(40);
 
     private final int requiredExp;
 

src/main/java/cmf/commitField/domain/user/controller/UserController.java

@@ -3,6 +3,7 @@
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.user.dto.UserChatInfoDto;
 import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.dto.UserRegacyDto;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +13,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/user")
 @RequiredArgsConstructor
@@ -40,4 +43,11 @@ public ResponseEntity<UserInfoDto> getUserInfo(@AuthenticationPrincipal CustomOA
 
         return ResponseEntity.ok(userInfoDto);
     }
+
+    @GetMapping("/tierinfo")
+    public ResponseEntity<List<UserRegacyDto>> getUserTierInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
+        List<UserRegacyDto> tierList = userService.showUserRegacy(username);
+        return ResponseEntity.ok(tierList);
+    }
 }

src/main/java/cmf/commitField/domain/user/dto/UserRegacyDto.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class UserRegacyDto {
+    private long user_id;
+    private String year;
+    private String season;
+    private String tier;
+}

src/main/java/cmf/commitField/domain/user/entity/Tier.java

@@ -0,0 +1,31 @@
+package cmf.commitField.domain.user.entity;
+
+public enum Tier {
+    NONE(0), // 미획득(하나도 Commit하지 않음)
+    SEED(1),      // 씨앗
+    SPROUT(95),    // 새싹
+    FLOWER(189),    // 꽃
+    FRUIT(283),     // 열매
+    TREE(377);       // 나무
+
+    private final long requiredExp;
+
+    Tier(long requiredExp) {
+        this.requiredExp = requiredExp;
+    }
+
+    public long getRequiredExp() {
+        return requiredExp;
+    }
+
+    // 현재 경험치에 맞는 레벨 찾기
+    public static Tier getLevelByExp(long exp) {
+        Tier currentLevel = SEED;
+        for (Tier level : values()) {
+            if (exp >= level.getRequiredExp()) {
+                currentLevel = level;
+            }
+        }
+        return currentLevel;
+    }
+}

src/main/java/cmf/commitField/domain/user/entity/TierRegacy.java

@@ -0,0 +1,34 @@
+package cmf.commitField.domain.user.entity;
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "tierRegacy")
+public class TierRegacy extends BaseEntity {
+    private String year;
+    private String season;
+
+    @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
+    private Tier tier;
+
+    public TierRegacy(User user){
+        this.user=user;
+        this.year="2025";
+    }
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+}

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -44,36 +44,6 @@ public enum Role {
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
     private Tier tier;
 
-    public enum Tier {
-        SEED(0),      // 씨앗
-        SPROUT(95),    // 새싹
-        FLOWER(189),    // 꽃
-        FRUIT(283),     // 열매
-        TREE(377);       // 나무
-
-        private final long requiredExp;
-
-        Tier(long requiredExp) {
-            this.requiredExp = requiredExp;
-        }
-
-        public long getRequiredExp() {
-            return requiredExp;
-        }
-
-        // 현재 경험치에 맞는 레벨 찾기
-        public static Tier getLevelByExp(long exp) {
-            Tier currentLevel = SEED;
-            for (Tier level : values()) {
-                if (exp >= level.getRequiredExp()) {
-                    currentLevel = level;
-                }
-            }
-            return currentLevel;
-        }
-    }
-
-
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     @JsonIgnore
     private List<ChatRoom> chatRooms = new ArrayList<>();
@@ -86,10 +56,14 @@ public static Tier getLevelByExp(long exp) {
     @JsonIgnore
     private List<ChatMsg> chatMsgs = new ArrayList<>();
 
-    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST, orphanRemoval = true)
     @JsonIgnore
     private List<Pet> pets = new ArrayList<>();
 
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST, orphanRemoval = true)
+    @JsonIgnore
+    private List<TierRegacy> tiers = new ArrayList<>();
+
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     @JsonIgnore
     private List<Heart> hearts;

src/main/java/cmf/commitField/domain/user/repository/TierRegacyRepository.java

@@ -0,0 +1,16 @@
+package cmf.commitField.domain.user.repository;
+
+import cmf.commitField.domain.user.entity.TierRegacy;
+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 TierRegacyRepository extends JpaRepository<TierRegacy, Long>{
+    Optional<TierRegacy> findById(Long id);
+    List<TierRegacy> findByUserUsername(String username);
+    List<TierRegacy> findByUser(User user);
+}

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -8,7 +8,10 @@
 import cmf.commitField.domain.season.entity.Season;
 import cmf.commitField.domain.season.service.SeasonService;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.domain.user.entity.Tier;
+import cmf.commitField.domain.user.entity.TierRegacy;
 import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.TierRegacyRepository;
 import cmf.commitField.domain.user.repository.UserRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
@@ -32,6 +35,7 @@
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final UserRepository userRepository;
     private final PetRepository petRepository;
+    private final TierRegacyRepository tierRegacyRepository;
     private final HttpServletRequest request;  // HttpServletRequest를 주입 받음.
     private final CommitCacheService commitCacheService;
     private final TotalCommitService totalCommitService;
@@ -59,6 +63,8 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
 
         User user;
         Pet pet;
+        TierRegacy tierRegacy;
+
         if (existingUser.isPresent()) {
             //유저 정보가 있다면 유저 정보를 얻어온다.
             user = existingUser.get();
@@ -75,7 +81,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             pet = new Pet("알알", user); // TODO: 변경 필요
             petRepository.save(pet);
 
-            // 유저 펫, 커밋 카운트, 랭크를 설정
+            tierRegacy = new TierRegacy(user);
+            tierRegacy.setSeason("winter");
+
+            // 유저 펫, 커밋 카운트, 랭크, 직전 시즌 랭크를 설정
             user.addPets(pet);
             user.setCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
 
@@ -85,9 +94,17 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
                     LocalDateTime.of(2025,05,31,23,59)
             ).getTotalCommitContributions();
 
+            long prevSeasonCommitCount = totalCommitService.getSeasonCommits(
+                    user.getUsername(),
+                    LocalDateTime.of(2024,12,01,00,00),
+                    LocalDateTime.of(2025,02,28,23,59)
+            ).getTotalCommitContributions();
+
             user.setSeasonCommitCount(seasonCommitCount);
+            tierRegacy.setTier(Tier.getLevelByExp(prevSeasonCommitCount));
+            tierRegacyRepository.save(tierRegacy);
 
-            user.setTier(User.Tier.getLevelByExp(seasonCommitCount));
+            user.setTier(Tier.getLevelByExp(seasonCommitCount));
             userRepository.save(user);
             // 로그인하거나 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
             commitCacheService.updateCachedCommitCount(user.getUsername(),0);

src/main/java/cmf/commitField/domain/user/service/UserService.java

@@ -7,14 +7,20 @@
 import cmf.commitField.domain.pet.service.PetService;
 import cmf.commitField.domain.user.dto.UserChatInfoDto;
 import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.dto.UserRegacyDto;
+import cmf.commitField.domain.user.entity.Tier;
+import cmf.commitField.domain.user.entity.TierRegacy;
 import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.TierRegacyRepository;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -23,6 +29,7 @@ public class UserService {
     private final StringRedisTemplate redisTemplate;
     private final UserRepository userRepository;
     private final PetRepository petRepository;
+    private final TierRegacyRepository tierRegacyRepository;
     // FIXME: 수정 필요
     private final TotalCommitService totalCommitService;
     private final CommitUpdateService commitUpdateService;
@@ -45,6 +52,22 @@ public UserChatInfoDto showUserChatInfo(String username) {
                 .build();
     }
 
+    public List<UserRegacyDto> showUserRegacy(String username) {
+        User user = userRepository.findByUsername(username).get();
+        List<UserRegacyDto> userRegacyDtos = new ArrayList<>();
+        for(TierRegacy tierRegacy : tierRegacyRepository.findByUser(user)){
+            userRegacyDtos.add(
+                UserRegacyDto.builder()
+                    .user_id(user.getId())
+                    .year(tierRegacy.getYear())
+                    .season(tierRegacy.getSeason())
+                    .tier(tierRegacy.getTier().toString())
+                    .build()
+            );
+        }
+        return userRegacyDtos;
+    }
+
         @Transactional
     public UserInfoDto showUserInfo(String username) {
         User user = userRepository.findByUsername(username).get();
@@ -89,7 +112,7 @@ public boolean getExpUser(String username, long commitCount) {
         // 경험치 증가 후, 만약 레벨업한다면 레벨업 시킨다.
         user.addExp(commitCount);
         userRepository.save(user);
-        return !(user.getTier().equals(User.Tier.getLevelByExp(user.getSeasonCommitCount())));
+        return !(user.getTier().equals(Tier.getLevelByExp(user.getSeasonCommitCount())));
     }
 
     public void updateUserCommitCount(String username, long count){

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
   jpa:
     open-in-view: false
     hibernate:
-      ddl-auto: update
+      ddl-auto: create
   autoconfigure: # 로컬에서 실행할 때는 Redis와 Session 설정을 제외
     exclude:
       - org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration

src/main/resources/application.yml

@@ -18,7 +18,7 @@ spring:
   jpa:
     open-in-view: false
     hibernate:
-      ddl-auto: update
+      ddl-auto: create
     properties:
       hibernate:
         default_batch_fetch_size: 100