fix: 병합 충돌 해결-2

Author: whale22

…ceCommit/service/CommitCacheService.java …commit/scheduler/CommitCacheService.javasrc/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java renamed to src/main/java/cmf/commitField/domain/commit/scheduler/CommitCacheService.java src/main/java/cmf/commitField/domain/commit/sinceCommit/service/CommitCacheService.java renamed to src/main/java/cmf/commitField/domain/commit/scheduler/CommitCacheService.java

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.commit.sinceCommit.service;
+package cmf.commitField.domain.commit.scheduler;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -0,0 +1,23 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/commit")
+public class CommitController {
+    @GetMapping("/get")
+    public void getUserCommits(){
+        // lastCommitted에서부터 새로 들어온 커밋 수를 검사해 반환한다
+        // commitCount에서 새로 추가된 만큼의 커밋 수를 반환함
+        // get이 실행되면 redis의 Active유저에 상태를 추가한다
+        //
+    }
+
+    public void updateUserCommitStatus(){
+        // 커밋 수에 변화가 있을 때 실행되는 메서드
+        // 연속 커밋 반영, 펫 반영, 랭크 반영
+    }
+
+}

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

@@ -1,6 +1,5 @@
 package cmf.commitField.domain.commit.scheduler;
 
-import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;

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

@@ -4,6 +4,7 @@
 
 @Getter
 public enum PetGrowthLevel {
+    LEVEL_0(0),
     LEVEL_1(150),
     LEVEL_2(300);
 
@@ -19,7 +20,7 @@ public int getRequiredExp() {
 
     // 현재 경험치에 맞는 레벨 찾기
     public static PetGrowthLevel getLevelByExp(int exp) {
-        PetGrowthLevel currentLevel = LEVEL_1;
+        PetGrowthLevel currentLevel = LEVEL_0;
         for (PetGrowthLevel level : values()) {
             if (exp >= level.getRequiredExp()) {
                 currentLevel = level;

src/main/java/cmf/commitField/domain/season/entity/Rank.java

@@ -1,9 +1,33 @@
 package cmf.commitField.domain.season.entity;
 
+import lombok.Getter;
+
+@Getter
 public enum Rank {
-    SEED,      // 씨앗
-    SPROUT,    // 새싹
-    FLOWER,    // 꽃
-    FRUIT,     // 열매
-    TREE       // 나무
-}
+    SEED(94),      // 씨앗
+    SPROUT(188),    // 새싹
+    FLOWER(282),    // 꽃
+    FRUIT(375),     // 열매
+    TREE(376);       // 나무
+
+    private final int requiredExp;
+
+    Rank(int requiredExp) {
+        this.requiredExp = requiredExp;
+    }
+
+    public int getRequiredExp() {
+        return requiredExp;
+    }
+
+    // 현재 경험치에 맞는 레벨 찾기
+    public static Rank getLevelByExp(int exp) {
+        Rank currentLevel = SEED;
+        for (Rank level : values()) {
+            if (exp >= level.getRequiredExp()) {
+                currentLevel = level;
+            }
+        }
+        return currentLevel;
+    }
+}

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

@@ -1,9 +1,10 @@
 package cmf.commitField.domain.user.service;
 
-import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
+import cmf.commitField.domain.commit.scheduler.CommitCacheService;
 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;
@@ -29,6 +30,7 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final CommitCacheService commitCacheService;
     private final TotalCommitService totalCommitService;
 
+
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         OAuth2User oauthUser = super.loadUser(userRequest);
@@ -61,15 +63,20 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             user = new User(username, email, name, avatarUrl,true, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             userRepository.save(user);
 
-            pet = new Pet("알알", user); // 변경 필요
+            pet = new Pet("알알", user); // TODO: 변경 필요
             petRepository.save(pet);
 
-            long commitCount;
+            // 유저 펫, 커밋 카운트, 랭크를 서렂ㅇ
             user.addPets(pet);
             user.setCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
+            user.setRank(Rank.getLevelByExp((int) totalCommitService.getSeasonCommits(
+                    user.getUsername(),
+                    LocalDateTime.of(2025,03,01,00,00),
+                    LocalDateTime.now()).getTotalCommitContributions()
+                )
+            );
 
-
-            // 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
+            // 로그인하거나 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
             commitCacheService.updateCachedCommitCount(user.getUsername(),0);
         }