fix: 펫 및 랭크 경험치값 수정

Author: whale22

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

@@ -25,7 +25,7 @@ public class Pet extends BaseEntity {
     private int exp; // 펫 경험치
 
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
-    private Grow grow; // 성장 정도
+    private PetGrow grow; // 성장 정도
 
     public Pet(String name, User user){
         Random random = new Random();
@@ -40,18 +40,14 @@ public Pet(String name, User user){
         }
         this.name = name;
         this.exp = 0;
-        this.grow = Grow.EGG;
+        this.grow = PetGrow.EGG;
         this.user = user;
     }
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
     private User user;
 
-    public enum Grow {
-        EGG, HATCH, GROWN
-    }
-
     public int addExp(int commit){
         exp+=commit;
 

…ld/domain/pet/entity/PetGrowthLevel.java …mmitField/domain/pet/entity/PetGrow.javasrc/main/java/cmf/commitField/domain/pet/entity/PetGrowthLevel.java renamed to src/main/java/cmf/commitField/domain/pet/entity/PetGrow.java src/main/java/cmf/commitField/domain/pet/entity/PetGrowthLevel.java renamed to src/main/java/cmf/commitField/domain/pet/entity/PetGrow.java

@@ -3,14 +3,14 @@
 import lombok.Getter;
 
 @Getter
-public enum PetGrowthLevel {
-    LEVEL_0(0),
-    LEVEL_1(150),
-    LEVEL_2(300);
+public enum PetGrow {
+    EGG(0),
+    HATCH(150),
+    GROWN(300);
 
     private final int requiredExp;
 
-    PetGrowthLevel(int requiredExp) {
+    PetGrow(int requiredExp) {
         this.requiredExp = requiredExp;
     }
 
@@ -19,9 +19,9 @@ public int getRequiredExp() {
     }
 
     // 현재 경험치에 맞는 레벨 찾기
-    public static PetGrowthLevel getLevelByExp(int exp) {
-        PetGrowthLevel currentLevel = LEVEL_0;
-        for (PetGrowthLevel level : values()) {
+    public static PetGrow getLevelByExp(int exp) {
+        PetGrow currentLevel = EGG;
+        for (PetGrow level : values()) {
             if (exp >= level.getRequiredExp()) {
                 currentLevel = level;
             }

src/main/java/cmf/commitField/domain/pet/service/PetService.java

@@ -1,7 +1,7 @@
 package cmf.commitField.domain.pet.service;
 
 import cmf.commitField.domain.pet.entity.Pet;
-import cmf.commitField.domain.pet.entity.PetGrowthLevel;
+import cmf.commitField.domain.pet.entity.PetGrow;
 import cmf.commitField.domain.pet.repository.PetRepository;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.aws.s3.S3Service;
@@ -56,8 +56,8 @@ public Pet getExpPet(User user, int commitCount) {
         pet.addExp(commitCount); // 경험치 증가
 
         // 경험치 증가 후, 만약 레벨업한다면 레벨업 시킨다.
-        if( (pet.getGrow()== Pet.Grow.EGG && pet.getExp()>= PetGrowthLevel.LEVEL_1.getRequiredExp()) ||
-                (pet.getGrow()== Pet.Grow.HATCH && pet.getExp()>=PetGrowthLevel.LEVEL_2.getRequiredExp()))
+        if( (pet.getGrow()== PetGrow.EGG && pet.getExp()>= PetGrow.EGG.getRequiredExp()) ||
+                (pet.getGrow()== PetGrow.HATCH && pet.getExp()>= PetGrow.HATCH.getRequiredExp()))
             levelUp(pet);
 
         return petRepository.save(pet);
@@ -67,10 +67,10 @@ public Pet getExpPet(User user, int commitCount) {
     public void levelUp(Pet pet){
         switch (pet.getGrow()){
             case EGG :
-                pet.setGrow(Pet.Grow.HATCH);
+                pet.setGrow(PetGrow.HATCH);
                 break;
             case HATCH :
-                pet.setGrow(Pet.Grow.GROWN);
+                pet.setGrow(PetGrow.GROWN);
                 break;
         }
     }

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

@@ -43,10 +43,10 @@ public enum Role {
     private Tier tier;
 
     public enum Tier {
-        SEED(94),      // 씨앗
-        SPROUT(188),    // 새싹
-        FLOWER(282),    // 꽃
-        FRUIT(376),     // 열매
+        SEED(0),      // 씨앗
+        SPROUT(95),    // 새싹
+        FLOWER(189),    // 꽃
+        FRUIT(283),     // 열매
         TREE(377);       // 나무
 
         private final int requiredExp;

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

@@ -4,7 +4,6 @@
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.repository.PetRepository;
-import cmf.commitField.domain.season.entity.Rank;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
@@ -69,7 +68,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             // 유저 펫, 커밋 카운트, 랭크를 서렂ㅇ
             user.addPets(pet);
             user.setCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
-            user.setRank(Rank.getLevelByExp((int) totalCommitService.getSeasonCommits(
+            user.setTier(User.Tier.getLevelByExp((int) totalCommitService.getSeasonCommits(
                     user.getUsername(),
                     LocalDateTime.of(2025,03,01,00,00),
                     LocalDateTime.now()).getTotalCommitContributions()