Merge pull request #96 from CommitField/feat/#93

feat: 랭킹 기능 수정

Author: whale22

src/main/java/cmf/commitField/CommitFieldApplication.java

@@ -11,7 +11,6 @@
 // 테스트시에만 주석 풀기
 @EnableScheduling
 public class CommitFieldApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(CommitFieldApplication.class, args);
 	}

…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/commit/scheduler/CommitUpdateController.java

@@ -0,0 +1,26 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/commits")
+public class CommitUpdateController {
+    private final CommitUpdateService commitUpdateService;
+    @GetMapping("/tier")
+    public ResponseEntity<UserInfoDto> getUserTier(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
+        System.out.println("/tier, Username: "+username);
+        UserInfoDto userInfoDto = commitUpdateService.updateUserTier(username);
+        return ResponseEntity.ok(userInfoDto);
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package cmf.commitField.domain.commit.scheduler;
+
+import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class CommitUpdateService {
+    private final TotalCommitService totalCommitService;
+    private final UserRepository userRepository;
+    private final PetService petService;
+
+    public UserInfoDto updateUserTier(String username){
+        User user = userRepository.findByUsername(username).get();
+        long seasonCommitCount;
+//        seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2024,12,01,0,0), LocalDateTime.of(2025,2,28,23,59)).getTotalCommitContributions();
+      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));
+        userRepository.save(user);
+
+        return UserInfoDto.builder()
+                .userId(user.getId())
+                .username(user.getUsername())
+                .email(user.getEmail())
+                .avatarUrl(user.getAvatarUrl())
+                .createdAt(user.getCreatedAt())
+                .lastCommitted(user.getLastCommitted())
+                .commitCount(user.getCommitCount())
+                .tier(user.getTier().name())
+                .build();
+    }
+
+    public User updateUserPet(String username){
+        User user = userRepository.findByUsername(username).get();
+
+        //추가된 펫 경험치
+        long totalcommits;
+        totalcommits = totalCommitService.getUpdateCommits(user.getUsername(), user.getCreatedAt(), LocalDateTime.now()).getTotalCommitContributions();
+
+        petService.getExpPet(user, (int)totalcommits);
+        return user;
+    }
+}

src/main/java/cmf/commitField/domain/commit/sinceCommit/controller/SinceCommitController.java

@@ -51,8 +51,8 @@ public ResponseEntity<CommitAnalysisResponseDto> getSpringSeasonCommits(
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
-        LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
+        LocalDateTime since = LocalDateTime.of(2025, 3, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2025, 5, 31, 23, 59, 59);
 
         CommitAnalysisResponseDto analysis = sinceCommitService.getCommitAnalysis(owner, repo, since, until);
         return ResponseEntity.ok(analysis);
@@ -93,7 +93,7 @@ public ResponseEntity<CommitAnalysisResponseDto> getWinterSeasonCommits(
             @RequestParam String repo
     ) {
         int currentYear = LocalDateTime.now().getYear();
-        LocalDateTime since = LocalDateTime.of(2023, 12, 1, 0, 0);
+        LocalDateTime since = LocalDateTime.of(2024, 12, 1, 0, 0);
         LocalDateTime until = LocalDateTime.of(2024 + 1, 2, 1, 23, 59, 59)
                 .with(TemporalAdjusters.lastDayOfMonth());
 

src/main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java

@@ -25,7 +25,6 @@ public class TotalCommitController {
     @GetMapping("/api/commits")
     public TotalCommitResponseDto getTotalCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
         String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
-
         return totalCommitService.getTotalCommitCount(username);
     }
 
@@ -42,9 +41,9 @@ public TotalCommitResponseDto getTotalCommits(@AuthenticationPrincipal CustomOAu
     @GetMapping("/api/commits/spring")
     public TotalCommitResponseDto getSpringSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
         String username = oAuth2User.getName();
-        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
-        LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
+        int currentYear = LocalDateTime.now().getYear();  // 올해 대입
+        LocalDateTime since = LocalDateTime.of(2025, 3, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2025, 5, 31, 23, 59, 59);
         return totalCommitService.getSeasonCommits(username, since, until);
     }
 
@@ -72,9 +71,9 @@ public TotalCommitResponseDto getFallSeasonCommits(@AuthenticationPrincipal Cust
     @GetMapping("/api/commits/winter")
     public TotalCommitResponseDto getWinterSeasonCommits(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
         String username = oAuth2User.getName();
-        int currentYear = LocalDateTime.now().getYear();  // 현재는 테스트용으로 2024 대입
-        LocalDateTime since = LocalDateTime.of(2024 - 1, 12, 1, 0, 0);
-        LocalDateTime until = LocalDateTime.of(2024, 2, 1, 23, 59, 59)
+        int currentYear = LocalDateTime.now().getYear();  // 2024.12 ~ 2025.2 대입
+        LocalDateTime since = LocalDateTime.of(2025 - 1, 12, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2025, 2, 1, 23, 59, 59)
                 .with(TemporalAdjusters.lastDayOfMonth());
         return totalCommitService.getSeasonCommits(username, since, until);
     }

src/main/java/cmf/commitField/domain/pet/controller/PetController.java

@@ -1,11 +1,16 @@
 package cmf.commitField.domain.pet.controller;
 
+import cmf.commitField.domain.pet.dto.UserPetDto;
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,6 +23,20 @@ public class PetController {
     private final CustomOAuth2UserService userService;
     private final PetService petService;
 
+    // 현재 펫 경험치 상승 및 상승 시 레벨업 처리
+    @GetMapping("/exp")
+    public ResponseEntity<UserPetDto> getUserTier(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();  // CustomOAuth2User의 getName()은 user.getUsername()을 반환
+
+        System.out.println("/pet/exp, Username: "+username);
+        UserPetDto userPetDto = petService.getExpPet(username);
+        return ResponseEntity.ok(userPetDto);
+    }
+
+    // *************************************
+    // TODO : 아래는 확장 기능, 추가 시 개선 필요
+    // *************************************
+
     // 새로운 펫 추가
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public Pet createPet(

src/main/java/cmf/commitField/domain/pet/dto/UserPetDto.java

@@ -1,18 +1,19 @@
 package cmf.commitField.domain.pet.dto;
 
 import cmf.commitField.domain.pet.entity.UserPet;
+import lombok.Builder;
 import lombok.Getter;
 
+@Builder
 @Getter
 public class UserPetDto {
-    private Long userId;
     private String username;
     private Long petId;
     private String petName;
-    private boolean isHatched;
+    private String grow;
+    private long exp;
 
     public UserPetDto(UserPet userPet) {
-        this.userId = userPet.getUser().getId();
         this.username = userPet.getUser().getUsername();
         this.petId = userPet.getPet().getId();
         this.petName = userPet.getPet().getName();