feat: 랭크 관련 수정

Author: whale22

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

@@ -1,27 +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.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import java.time.LocalDateTime;
 
 @Service
 @RequiredArgsConstructor
 public class CommitUpdateService {
-    TotalCommitService totalCommitService;
-    UserRepository userRepository;
-    @GetMapping("commit/tier")
-    public User updateUserTier(OAuth2User oAuth2User){
-        User user = userRepository.findByEmail(oAuth2User.getName()).get();
+    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();
+//        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/user/dto/UserInfoDto.java

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Builder
+@Getter
+public class UserInfoDto {
+
+    private Long userId;
+    private String username;
+    private String email;
+    private String avatarUrl;
+    private LocalDateTime createdAt;
+    private LocalDateTime lastCommitted;
+    private long commitCount;
+    private String tier;
+
+    // 펫 생략, 차후 필요시 추가
+}

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

@@ -5,9 +5,11 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
+@Repository
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
     Optional<User> findById(Long id);

src/main/java/cmf/commitField/global/security/SecurityConfig.java

@@ -29,6 +29,10 @@ public SecurityConfig(CustomOAuth2UserService customOAuth2UserService) {
     @Bean
     protected SecurityFilterChain config(HttpSecurity http) throws Exception {
         http
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("**").permitAll()  // TODO: 차후 인증 관련 추가 필요 
+                )
+
                 .cors(cors -> cors.configurationSource(corsConfigurationSource())) // CORS 설정 추가
                 .csrf(AbstractHttpConfigurer::disable) // CSRF 보호 비활성화
                 .sessionManagement(session -> session
@@ -47,7 +51,6 @@ protected SecurityFilterChain config(HttpSecurity http) throws Exception {
 
                             // 디버깅 로그
                             System.out.println("OAuth2 로그인 성공: " + username);
-
                             response.sendRedirect("http://localhost:5173/home");  // 로그인 성공 후 리다이렉트
                         })
                 )